204 Commits

Author	SHA1	Message	Date
Benjamin Goering	fb33eefe8e	trivial changes requested by review	2017-05-18 08:19:52 -07:00
Benjamin Goering	cb1a4ee1cc	remove extraneous console.log	2017-05-17 15:40:32 -07:00
Benjamin Goering	d93ad38dd1	Admins can change Edit Comment Window length in Moderation Settings	2017-05-17 15:39:19 -07:00
Wyatt Johnson	50db2d1dda	Initial merge of trust functionality	2017-05-15 15:28:57 -06:00
Belen Curcio	b2e5c0452a	The merge conficts	2017-05-15 17:13:48 -03:00
Wyatt Johnson	9bee31198e	Added logout routes	2017-05-15 10:03:09 -06:00
Belen Curcio	8754ade5a4	merge	2017-05-12 21:52:29 -03:00
Wyatt Johnson	ed27209de9	More edit changes	2017-05-12 10:09:25 -06:00
Wyatt Johnson	ae5da93730	linting fixes	2017-05-11 17:44:51 -06:00
Wyatt Johnson	d497ad3369	initial pagination rewrite, cleanups to comment edit	2017-05-11 17:27:02 -06:00
Kim Gardner	1314f1972a	Merge branch 'master' into edit-comment	2017-05-10 15:25:27 -04:00
Wyatt Johnson	a3a8d23797	patched bug with adding action	2017-05-10 12:18:42 -06:00
Wyatt Johnson	f8b207e563	Return a meaningful error	2017-05-10 10:29:20 -06:00
Wyatt Johnson	785e5a4ac8	Collected config	2017-05-09 16:49:11 -06:00
Benjamin Goering	f37a210479	Only use errors from errors.js for EditWindowHasEnded	2017-05-09 15:02:26 -07:00
Wyatt Johnson	76d0fdfd67	Added docs	2017-05-09 15:32:19 -06:00
Benjamin Goering	096025b72a	Add asset_id to editComment mutation to allow mongo query happy path to be atomic	2017-05-08 09:57:52 -07:00
Wyatt Johnson	95f9bac254	Initial migration to JWT	2017-05-05 15:42:34 -06:00
Benjamin Goering	b97fa228b1	merge with master after huge coral-embed-stream refactor	2017-05-03 19:19:03 -07:00
Benjamin Goering	c3f3ed8a50	Comment edit is no longer extended one ach edit	2017-05-03 14:17:36 -07:00
Benjamin Goering	818c09a9b8	Edit window is now 30s instead of 5min	2017-05-03 14:06:07 -07:00
Benjamin Goering	ae3cbe990b	Edit Comment UI reflects expired edit comment window	2017-05-03 12:34:22 -07:00
Benjamin Goering	b9a3466e2e	Edit UI sends editComment mutation, handles errors	2017-05-02 22:07:23 -05:00
Benjamin Goering	aa18a433f8	Can't edit comment outside of edit window	2017-05-02 16:47:00 -05:00
Benjamin Goering	a46773887f	Initial working editComment mutation	2017-05-02 14:27:16 -05:00
Belén Curcio	7d56404e84	Merge branch 'master' into subscriptions	2017-04-24 18:09:34 -03:00
Wyatt Johnson	4e060b884b	Fixed bug with status changes in the graph	2017-04-21 12:12:29 -06:00
Wyatt Johnson	1f562c8fad	Merge branch 'master' into subscriptions	2017-04-20 15:17:44 -06:00
Riley Davis	eda15538fe	add kiwi's and wyatt's changes	2017-04-20 10:02:09 -06:00
Wyatt Johnson	e1c8e75405	Merge branch 'master' into subscriptions	2017-04-18 15:43:25 -06:00
Belen Curcio	e729a673a3	Merge branch 'master' of github.com:coralproject/talk into plugin_examples	2017-04-17 14:17:42 -03:00
Wyatt Johnson	7fac8ef073	Merge branch 'master' into subscriptions	2017-04-17 08:03:14 -06:00
Wyatt Johnson	8164fa7813	Merge branch 'master' into docs-update	2017-04-14 15:07:02 -06:00
Wyatt Johnson	d4fc8a474d	Should resolve bug relating to usernames being set as "undefined"	2017-04-14 14:57:13 -06:00
Wyatt Johnson	cb652dbb86	Merge branch 'master' into docs-update	2017-04-14 12:23:43 -06:00
Benjamin Goering	118da885fd	Merge branch 'master' of github.com:coralproject/talk into ignore_rb2	2017-04-13 12:12:10 -05:00
Belen Curcio	7969985f59	Merge branch 'master' of github.com:coralproject/talk into plugin_examples	2017-04-12 22:27:46 -03:00
Wyatt Johnson	d5016dff58	Updates to metadata service docs	2017-04-12 16:37:56 -06:00
Wyatt Johnson	9f8c9c7eb1	Merge branch 'master' into subscriptions	2017-04-12 10:37:15 -06:00
Wyatt Johnson	191026ecf2	Merge branch 'master' into metadata	2017-04-12 10:37:12 -06:00
Belén Curcio	2ecf64ae3e	Merge branch 'master' into plugin_examples	2017-04-12 08:09:49 -03:00
Benjamin Goering	7dfe12b874	Users cannot ignore themselves at service layer	2017-04-11 14:20:37 -07:00
Benjamin Goering	2656141d59	Add stopIgnoringUser mutation and Embed uses it	2017-04-11 14:19:34 -07:00
Benjamin Goering	545f176bb8	Add ignoreUser mutation and myIgnoredUsers root query	2017-04-11 14:19:32 -07:00
gaba	c5520e3fb6	Adds missing template.	2017-04-11 12:22:05 -07:00
Belén Curcio	a77a623e94	Merge branch 'master' into plugin_examples	2017-04-11 15:13:51 -03:00
Belen Curcio	536b2ed371	Liniting	2017-04-11 13:46:27 -03:00
David Erwin	ab74ebdc52	Merge branch 'master' into subscriptions	2017-04-11 11:58:55 -04:00
David Erwin	2c8d03bd8d	Temporarily disable username profanity check	2017-04-11 11:05:55 -04:00
Wyatt Johnson	8e33d25a28	Some bug fixes + validation updates	2017-04-10 12:12:07 -06:00