523 Commits

Author	SHA1	Message	Date
Chi Vinh Le	f641a3ec40	Complete suspend user implementation	2017-05-19 01:52:03 +07:00
riley	ff75b9474a	merge master	2017-05-18 12:18:00 -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	76e87f4c34	Move previous suspendUser feature to rejectUsername	2017-05-18 02:28:01 +07:00
Riley Davis	c66e3141e0	actually check permissions	2017-05-17 11:38:43 -06:00
Wyatt Johnson	7a256bdd2b	Merge branch 'master' into 142993479-tags	2017-05-17 10:01:58 -06:00
Chi Vinh Le	056ff427a5	Merge branch 'master' into suspend-user	2017-05-17 21:50:28 +07:00
Chi Vinh Le	71c743dda7	Extend backend to support new suspend feature	2017-05-17 20:05:18 +07:00
Belen Curcio	9dc0693530	Linting	2017-05-17 09:43:04 -03:00
Belen Curcio	54eb078a13	Working offtopic tag	2017-05-17 09:37:26 -03:00
Wyatt Johnson	fde4dee52f	Resolver cleanup	2017-05-16 17:26:34 -06:00
riley	b49ace99eb	add permission for EDIT_COMMENT	2017-05-16 16:38:30 -06: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
Wyatt Johnson	f4b9191476	Added author_id to comment count query	2017-05-16 14:20:20 -06:00
Riley Davis	4ca5c4bc09	Merge branch 'master' into user-detail-ui	2017-05-16 13:54:13 -06:00
Chi Vinh Le	7d858c7b3f	Readd lastComment field to asset resolver	2017-05-17 01:25:06 +07:00
riley	c7e9fe3f5f	update backend with the can() method	2017-05-16 10:50:09 -06:00
Wyatt Johnson	e90ce7f4c3	fixed merge issue	2017-05-16 10:20:16 -06:00
Wyatt Johnson	3e2ed222ed	Merge branch 'trust-merge' into user-detail-ui	2017-05-16 09:53:35 -06:00
riley	7896b3f33b	merge master	2017-05-16 09:43:49 -06:00
riley	4d3788e4c9	saving my place so i dont have too many threads	2017-05-15 16:25:32 -06:00
Wyatt Johnson	50db2d1dda	Initial merge of trust functionality	2017-05-15 15:28:57 -06:00
Belen Curcio	c59346eb0a	tags, and assignedby nul	2017-05-15 18:13:45 -03:00
Belen Curcio	c3d02a14a0	Updated queries and hasRoles	2017-05-15 18:11:14 -03:00
Wyatt Johnson	a5c9a8e4b0	cleaned up graph, standardised mutation	2017-05-12 14:04:09 -06:00
David Erwin	b60ed166d0	Allow MODERATORs to access tags	2017-05-12 15:38:38 -04:00
Wyatt Johnson	ffd96f57e9	Comment too short fixes	2017-05-12 11:16:52 -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	f4dfb21e15	reverted pagination work	2017-05-12 09:14:25 -06:00
Wyatt Johnson	e6b2ff19b8	fixing graph merge error	2017-05-12 07:51:53 -06:00
Wyatt Johnson	e2f6d5989a	Merge branch 'master' into 142993479-tags	2017-05-12 07:49:02 -06:00
Wyatt Johnson	47186c4eac	some changes to loaders	2017-05-11 17:52: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	08e7a90d69	lint fixes	2017-05-11 17:34:47 -06:00
Wyatt Johnson	547ba126be	cleanup to mutators	2017-05-11 17:31:22 -06:00
Wyatt Johnson	d497ad3369	initial pagination rewrite, cleanups to comment edit	2017-05-11 17:27:02 -06:00
Wyatt Johnson	aeaf809a0f	Made queries more generic related to tags	2017-05-11 14:42:06 -06:00
Benjamin Goering	650e8e205e	Merge branch 'edit-comment' of github.com:gobengo/talk into edit-comment	2017-05-09 15:03:19 -07:00
Benjamin Goering	f37a210479	Only use errors from errors.js for EditWindowHasEnded	2017-05-09 15:02:26 -07:00
Wyatt Johnson	2e1bc8d75a	Adjusted query/tag flow	2017-05-09 15:01:01 -06:00
Riley Davis	084f6b28ed	merge master	2017-05-09 10:06:41 -06:00
Gabriela Rodríguez Berón	b8e530ca1f	Merge branch 'master' into 142993479-tags	2017-05-08 21:08:28 -07:00
Benjamin Goering	8af7168f4f	Merge branch 'master' into edit-comment	2017-05-08 19:26:38 -07:00
gaba	7c09902294	The name for the tag is called ID.	2017-05-08 16:55:11 -07:00
gaba	c4c0ee79cd	Fix tests.	2017-05-08 13:12:24 -07:00
gaba	d7e72bb138	Fix tests.	2017-05-08 13:12:18 -07:00
gaba	cb09c50820	Error on duplicate.	2017-05-08 13:11:48 -07:00