106 Commits

Author	SHA1	Message	Date
David Jay	d8117494d1	Cleaning up after merge conflict.	2017-02-28 18:18:17 -05:00
David Jay	e68358a211	Merge branch 'master' into fix-permalink	2017-02-28 18:07:31 -05:00
Riley Davis	ac3e6a12bd	Merge branch 'master' into assets-by-like	2017-02-28 09:27:46 -07:00
David Jay	ab16e5bfe7	Retrieving comment y id from backend	2017-02-27 14:26:20 -05:00
David Jay	22793c02e2	Merge branch 'master' into dont-agree	2017-02-27 12:29:19 -05:00
Wyatt Johnson	f5277ce5e3	Patched silly bug	2017-02-24 09:57:24 -07:00
Riley Davis	5d1139dbdd	Merge branch 'master' ... Conflicts: client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js	2017-02-24 08:49:30 -07:00
Wyatt Johnson	30b6259e87	Patched bug with asset metrics	2017-02-23 14:43:25 -07:00
David Jay	761d0aaa3a	Merge branch 'master' into new-comments	2017-02-23 16:21:36 -05:00
David Jay	f795a96f46	Returning dontagree id on post.	2017-02-23 13:19:09 -05:00
Wyatt Johnson	9e759c7667	Adjusted BE beheviour	2017-02-22 13:55:48 -07:00
David Jay	096bd12df6	Loading new comments.	2017-02-22 13:45:02 -05:00
Wyatt Johnson	80706d2fdf	fixed issue related to action create on suspect word match	2017-02-22 10:33:47 -07:00
Wyatt Johnson	6398e2faad	Fixed issue with comment hydration	2017-02-22 09:32:51 -07:00
Wyatt Johnson	2360f280d2	Added commentMetrics edge.	2017-02-21 14:30:52 -07:00
David Jay	0aaa52e01f	Merge branch 'master' into dont-agree	2017-02-21 15:02:33 -05:00
David Jay	1d8ce1ae34	Posting DontAgree actions.	2017-02-21 14:41:33 -05:00
Wyatt Johnson	3e4dc9c8b2	Merge branch 'master' into graph-tests	2017-02-17 15:50:21 -07:00
Wyatt Johnson	a00befafcb	Initial graph tests	2017-02-17 15:48:46 -07:00
David Jay	d10936749d	Adding DontAgreeActionSummaries	2017-02-17 11:14:42 -05:00
Wyatt Johnson	84dcf3b3b6	Added some comments	2017-02-16 16:49:14 -07:00
Wyatt Johnson	1e81ec9f4e	Added new commentCount edge, added more docs	2017-02-16 16:49:14 -07:00
David Jay	e4e7ff27d2	Adding don't agree action to typedefs.	2017-02-16 16:54:05 -05:00
David Erwin	3c28557736	Merge branch 'master' into flags-button	2017-02-16 11:36:57 -05:00
David Erwin	5467d980df	Merge branch 'master' into sory-139595043-qbox	2017-02-16 11:26:22 -05:00
Wyatt Johnson	3be8ae39c4	Removed old TODO's	2017-02-15 17:53:13 -07:00
Wyatt Johnson	fa152bda3f	Added count clearning for status changes	2017-02-15 17:48:40 -07:00
Wyatt Johnson	27819d0d6a	Changed aggregate -> find	2017-02-15 17:42:54 -07:00
Wyatt Johnson	b75aed8bd8	Another optimization pass	2017-02-15 17:28:47 -07:00
Wyatt Johnson	9eefc0299f	Optimization pass	2017-02-15 17:12:17 -07:00
Wyatt Johnson	56fe8ef08e	Merge branch 'master' into flag-widget	2017-02-15 16:17:30 -07:00
Wyatt Johnson	93636aabac	Added like summaries	2017-02-15 16:15:43 -07:00
Riley Davis	f91607cff9	show the author and publication date	2017-02-15 15:36: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
Wyatt Johnson	e640bc2cc0	Added edge for metrics, fixed client linting errors	2017-02-14 17:02:50 -07:00
gaba	f51c857e8b	Merge branch 'master' into sory-139595043-qbox	2017-02-14 08:51:58 -08:00
Wyatt Johnson	d987b33d99	Merge branch 'master' into flag-widget	2017-02-14 09:00:12 -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
gaba	1b788b98c6	Adds questionBox to the gl query	2017-02-13 14:12:32 -08:00
Belen Curcio	51be47b62e	added flag functionality	2017-02-13 19:09:26 -03:00
Belen Curcio	594b87208a	GraphQL Review and Responses	2017-02-13 16:00:55 -03:00
Belen Curcio	e2ebac7176	adds new mutations: setCommentStatus	2017-02-13 14:32:48 -03:00
Belen Curcio	90ed1f1056	Ban user with graphql, 100 refactor	2017-02-13 11:50:16 -03:00
Wyatt Johnson	de54433c5c	Merge branch 'master' into username-displayname	2017-02-10 16:19:27 -07:00
Riley Davis	d4e68de349	setting up dashboard :)	2017-02-10 15:32:30 -07:00
gaba	e2e40ca2b3	Merge branch 'master' into story-137818425-tag-staff	2017-02-10 13:42:50 -08:00
Belen Curcio	894fec9fb6	adding context for moderation	2017-02-10 17:55:51 -03:00
Belen Curcio	bc14b908eb	banUsers and moderate separate streams, not found assets etc	2017-02-10 17:15:26 -03:00