231 Commits

Author	SHA1	Message	Date
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	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
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
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
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
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
Belen Curcio	f3980a03b2	Removing like from core action summary	2017-05-01 11:44:24 -03:00
Belen Curcio	9ee749edb2	Removing LIKE from the core graph	2017-05-01 11:00:37 -03:00
Belen Curcio	e1929f148a	Removing likes from the core graph	2017-05-01 10:58:14 -03:00
Kim Gardner	058aa3f907	Merge branch 'master' into 142993479-tags	2017-04-27 11:59:48 -04:00
Belén Curcio	7d56404e84	Merge branch 'master' into subscriptions	2017-04-24 18:09:34 -03:00
Gabriela Rodríguez Berón	e337a0d18b	Merge branch 'master' into subscriptions	2017-04-21 14:35:21 -07:00
gaba	c4ffe58f58	Adds privacy type to the methods to add tags.	2017-04-21 14:30:41 -07:00
gaba	0a4fd15fa2	Merge branch 'master' into 142993479-tags	2017-04-21 12:51:05 -07:00
Gabriela Rodríguez Berón	c68afe9819	Merge branch 'master' into status-fix	2017-04-21 11:56:44 -07:00
Wyatt Johnson	5048fbb7f0	Added fix for flag actions	2017-04-21 12:47:21 -06:00
Wyatt Johnson	4e060b884b	Fixed bug with status changes in the graph	2017-04-21 12:12:29 -06:00
gaba	b52325f8e9	Merge branch 'master' into 142993479-tags	2017-04-21 10:36:28 -07:00
gaba	91af8c2ece	Index on Tag for name, item id, item type.	2017-04-21 10:34:57 -07:00
Wyatt Johnson	1f562c8fad	Merge branch 'master' into subscriptions	2017-04-20 15:17:44 -06:00
David Erwin	7c38b9b54f	Merge branch 'master' into default-resolve-type	2017-04-20 16:03:38 -04:00
gaba	183dab9826	Merge branch 'master' into 142993479-tags	2017-04-20 12:34:32 -07:00
gaba	8458a9aecc	fixed lint error.	2017-04-20 12:29:21 -07:00
gaba	bd72bfc6ec	Fix tests related to tags on comments.	2017-04-20 12:24:08 -07:00
David Erwin	85e552cf04	Merge branch 'master' into action-summary-fix	2017-04-20 14:40:16 -04:00
Chi Vinh Le	3ff9313b03	Fix ignored users when not logged in	2017-04-21 01:18:51 +07: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
gaba	1137fca3b4	Adds Tag Model that will be apply to different models.	2017-04-18 14:03:26 -07:00
Wyatt Johnson	2eda1cb1e4	Added defaultResolveType	2017-04-18 14:50:57 -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
gaba	fa944927e4	A note on the from/to parameters.	2017-04-14 10:41:46 -07:00