304 Commits

Author	SHA1	Message	Date
riley	2c620c868d	merge master	2017-05-19 11:05:46 -06:00
Kiwi	8cb9945e25	Merge branch 'master' into multiple-roles	2017-05-19 23:26:45 +07:00
Chi Vinh Le	1d6455058e	Apply review suggestions	2017-05-19 17:51:58 +07:00
Chi Vinh Le	1374217680	Merge branch 'master' into suspend-user	2017-05-19 17:46:06 +07:00
riley	6deee7cb80	add a perms utils file	2017-05-18 14:28:43 -06:00
Benjamin Goering	d93ad38dd1	Admins can change Edit Comment Window length in Moderation Settings	2017-05-17 15:39:19 -07:00
Chi Vinh Le	2bdf413b88	Integrate into embed stream	2017-05-18 02:28:01 +07:00
Chi Vinh Le	76e87f4c34	Move previous suspendUser feature to rejectUsername	2017-05-18 02:28:01 +07:00
Chi Vinh Le	71c743dda7	Extend backend to support new suspend feature	2017-05-17 20:05:18 +07:00
riley	d081c0c5b5	remove context	2017-05-16 16:34:04 -06:00
riley	03ce044c53	merge master	2017-05-16 16:33:41 -06:00
riley	31647fb2f0	have function params in the correct order	2017-05-16 15:41:27 -06:00
riley	c7e9fe3f5f	update backend with the can() method	2017-05-16 10:50:09 -06:00
riley	4d3788e4c9	saving my place so i dont have too many threads	2017-05-15 16:25:32 -06:00
Wyatt Johnson	ed27209de9	More edit changes	2017-05-12 10:09:25 -06:00
riley	e32ab99edf	remove hasRoles	2017-05-12 09:57:07 -06:00
Wyatt Johnson	ae5da93730	linting fixes	2017-05-11 17:44:51 -06:00
Wyatt Johnson	a65d045c65	lint fixes	2017-05-11 17:38:49 -06:00
Wyatt Johnson	547ba126be	cleanup to mutators	2017-05-11 17:31:22 -06:00
Riley Davis	fe279587b5	add staff to dropdown	2017-05-10 09:25:39 -06:00
Benjamin Goering	295de61f36	Merge branch 'master' into edit-comment	2017-05-08 10:00:58 -07:00
Wyatt Johnson	7ccf9552c2	Added privacy fix	2017-05-05 13:14: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	a46773887f	Initial working editComment mutation	2017-05-02 14:27:16 -05:00
Wyatt Johnson	441ea12a65	Added user metadata	2017-04-21 15:22:52 -06:00
Benjamin Goering	118da885fd	Merge branch 'master' of github.com:coralproject/talk into ignore_rb2	2017-04-13 12:12:10 -05:00
Benjamin Goering	545f176bb8	Add ignoreUser mutation and myIgnoredUsers root query	2017-04-11 14:19:32 -07:00
Wyatt Johnson	735aa6fbd3	Added new Metadata Service and models	2017-04-07 16:40:30 -06:00
Gabriela Rodríguez Berón	155be523ff	Merge branch 'master' into community-flags	2017-03-28 07:14:30 -07:00
riley	5d5ad2585d	autoclose an article toggle	2017-03-24 10:40:12 -06:00
David Erwin	903aa23f19	Revert "Story 138187767 - Moderate Flag User Names"	2017-03-23 11:18:55 -04:00
riley	ca07406b1a	Merge branch 'master' into recaptcha-support	2017-03-20 07:36:20 -07:00
Riley Davis	162091a6d0	Merge branch 'master' into story-138187767-mod-flag-names	2017-03-07 11:44:10 -07:00
gaba	564b8d8eaa	Merge branch 'master' into story-138187767-mod-flag-names	2017-03-07 13:04:28 +01:00
Wyatt Johnson	d82f3d0f0d	Added initial recaptcha + RL support	2017-03-06 15:26:44 -07:00
David Jay	3280ed9ae5	Merge branch 'master' into premod-links	2017-03-03 16:17:40 -05:00
David Jay	cb88f0a9b7	Flagging links when settings are set appropriately.	2017-03-03 14:32:57 -05:00
gaba	2fa832a3f4	adds suspendUser func and mutation.	2017-03-02 15:54:50 -08:00
Benjamin Goering	98f3033326	Add permission checking to addCommentTag,removeCommentTag	2017-02-28 19:59:33 +08:00
Benjamin Goering	30ee80b12c	basic working removeCommentTag mutation	2017-02-28 19:59:33 +08:00
Benjamin Goering	6e338290a1	addCommentTag mutation works	2017-02-28 19:59:32 +08:00
Wyatt Johnson	a00befafcb	Initial graph tests	2017-02-17 15:48:46 -07:00
David Erwin	8a3309da92	Merge branch 'master' into sory-139595043-qbox	2017-02-15 15:50:42 -05:00
Wyatt Johnson	57d4f9d757	Changed new comment's status from null to NONE.	2017-02-15 13:21:15 -07:00
gaba	52a1ebe82a	Merge branch 'master' into sory-139595043-qbox	2017-02-14 15:35:43 -08:00
gaba	f51c857e8b	Merge branch 'master' into sory-139595043-qbox	2017-02-14 08:51:58 -08:00
Riley Davis	183d2e1ea0	Merged branch master into external-css-file	2017-02-13 16:04:00 -07:00
Riley Davis	0234112ad0	enable configuration for linking override stylesheets	2017-02-13 16:03:49 -07:00
Belen Curcio	8953182329	merge	2017-02-13 19:14:27 -03:00
gaba	f9f32b1ef6	Merge branch 'master' into sory-139595043-qbox	2017-02-13 14:13:28 -08:00