Commit Graph

65 Commits

Author SHA1 Message Date
David Erwin 903aa23f19 Revert "Story 138187767 - Moderate Flag User Names" 2017-03-23 11:18:55 -04:00
gaba 7522bd9cd6 Sends a mail to the suspended user. 2017-03-21 15:08:46 -07:00
gaba be2ecf0838 Adds user and message to flagaction to display in FE. 2017-03-20 13:38:11 -07:00
gaba 6f3cb34817 Merge branch 'master' into asset-comment-metrics 2017-03-20 07:39:00 -07:00
riley 8348e1e462 Merge branch 'master' into asset-comment-metrics 2017-03-20 07:36:22 -07:00
Wyatt Johnson fcc93963c4 Added support for total comment count 2017-03-20 07:29:08 -07:00
Wyatt Johnson 63220cb6a7 Some fixes to make it work 2017-03-08 19:14:02 -07:00
Wyatt Johnson feaad2d6ca Added loader, graphql 2017-03-08 19:01:08 -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
gaba d06a5d37f0 Moves to the loader and work on the user query to add pagination and action type. 2017-03-07 07:29:32 +01: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
Wyatt Johnson a1e2077ef1 Merge branch 'master' into 138617379_best_comments 2017-03-01 09:43:44 -07:00
Benjamin Goering 5cb522c419 Merge branch 'master' into 138617379_best_comments 2017-03-01 20:49:04 +08:00
gaba da3c812dc1 Adds graphql for users flagged in the server and client. 2017-02-28 21:33:01 -08: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
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
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
Riley Davis 5d1139dbdd Merge branch 'master'
Conflicts:
	client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
2017-02-24 08:49:30 -07:00
David Jay f795a96f46 Returning dontagree id on post. 2017-02-23 13:19:09 -05:00
David Jay 096bd12df6 Loading new comments. 2017-02-22 13:45:02 -05: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
David Jay d10936749d Adding DontAgreeActionSummaries 2017-02-17 11:14:42 -05: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 5467d980df Merge branch 'master' into sory-139595043-qbox 2017-02-16 11:26:22 -05: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 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