458 Commits

Author	SHA1	Message	Date
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
Wyatt Johnson	bc3c73a992	Fix for incorrect options passed to pubsub	2017-05-08 13:26:07 -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
Gabriela Rodríguez Berón	28920eb357	Merge branch 'master' into 142993479-tags	2017-05-05 08:44:09 -07:00
riley	57b0b5ec67	add a drawer for the user details	2017-05-04 13:58:43 -06:00
Benjamin Goering	b97fa228b1	merge with master after huge coral-embed-stream refactor	2017-05-03 19:19:03 -07:00
Benjamin Goering	0ba973fb44	editComment returns status of comment after edit. UI shows appropriate notifications if PREMOD or REJECTED	2017-05-03 18:05:06 -07:00
riley	26ebdde244	Merge branch 'master' into user-detail-ui	2017-05-03 14:25:40 -06:00
Benjamin Goering	ae3cbe990b	Edit Comment UI reflects expired edit comment window	2017-05-03 12:34:22 -07:00
Wyatt Johnson	d9a4653484	Removed LikeAction from core typeName interface resolver	2017-05-03 13:31:57 -06:00
riley	4a42436b7b	load user via HOC UserDetail	2017-05-03 12:54:02 -06:00
riley	9e1b470cb5	saving my place	2017-05-03 09:32:05 -06: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	756b5f8b45	editComment only allows editing real comments authored by the requesting user	2017-05-02 16:09:09 -05:00
Benjamin Goering	a46773887f	Initial working editComment mutation	2017-05-02 14:27:16 -05:00