 Chi Vinh Le
|
061c18670b
|
Merge branch 'master' into suspend-user
Conflicts:
client/coral-admin/src/constants/moderation.js
client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
|
2017-05-19 02:19:24 +07:00 |
|
|
Chi Vinh Le
|
859a0b1fbe
|
Make until arg required
|
2017-05-19 02:03:36 +07:00 |
|
|
Chi Vinh Le
|
d995cdde07
|
Make email message required
|
2017-05-19 02:01:47 +07:00 |
|
|
Chi Vinh Le
|
f641a3ec40
|
Complete suspend user implementation
|
2017-05-19 01:52:03 +07:00 |
|
|
Chi Vinh Le
|
76e87f4c34
|
Move previous suspendUser feature to rejectUsername
|
2017-05-18 02:28:01 +07:00 |
|
|
Chi Vinh Le
|
71c743dda7
|
Extend backend to support new suspend feature
|
2017-05-17 20:05:18 +07:00 |
|
|
Wyatt Johnson
|
f4b9191476
|
Added author_id to comment count query
|
2017-05-16 14:20:20 -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 |
|
|
Wyatt Johnson
|
50db2d1dda
|
Initial merge of trust functionality
|
2017-05-15 15:28:57 -06:00 |
|
|
Wyatt Johnson
|
ed27209de9
|
More edit changes
|
2017-05-12 10:09:25 -06:00 |
|
|
Wyatt Johnson
|
f4dfb21e15
|
reverted pagination work
|
2017-05-12 09:14:25 -06:00 |
|
|
Wyatt Johnson
|
47186c4eac
|
some changes to loaders
|
2017-05-11 17:52:07 -06:00 |
|
|
Wyatt Johnson
|
d497ad3369
|
initial pagination rewrite, cleanups to comment edit
|
2017-05-11 17:27:02 -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 |
|
|
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 |
|
|
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
|
a46773887f
|
Initial working editComment mutation
|
2017-05-02 14:27:16 -05:00 |
|
|
Belen Curcio
|
e1929f148a
|
Removing likes from the core graph
|
2017-05-01 10:58:14 -03: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 |
|
|
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 |
|
|
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 |
|
|
Gabriela Rodríguez Berón
|
fb6ba37366
|
Merge branch 'master' into docs-metrics
|
2017-04-14 10:40:28 -07:00 |
|
|
gaba
|
9cf31e0bfa
|
A note on the from/to parameters.
|
2017-04-14 10:37:05 -07:00 |
|
|
Benjamin Goering
|
118da885fd
|
Merge branch 'master' of github.com:coralproject/talk into ignore_rb2
|
2017-04-13 12:12:10 -05:00 |
|
|
Belen Curcio
|
7969985f59
|
Merge branch 'master' of github.com:coralproject/talk into plugin_examples
|
2017-04-12 22:27:46 -03:00 |
|
|
Belen Curcio
|
22fc8555ad
|
Extending typeDefs with Off-Topic Plugin
|
2017-04-12 22:26:30 -03:00 |
|
|
Belen Curcio
|
7424fc9774
|
Create comments with Tags
|
2017-04-12 19:42:39 -03:00 |
|
|
Belen Curcio
|
336dd261ca
|
createCommentInput
|
2017-04-12 16:23:13 -03:00 |
|
|
Chi Vinh Le
|
92205a2c6f
|
Fix load more buttons
|
2017-04-13 01:17:46 +07:00 |
|
|
Benjamin Goering
|
eb1c1db09b
|
Ignore users queries are excludeIgnored: Boolean instead of notIgnoredBy: String
|
2017-04-11 14:20:39 -07:00 |
|
|
Benjamin Goering
|
58736586e4
|
Asset commentCount and totalCommentCount can be personalized by notIgnoredBy
|
2017-04-11 14:20:37 -07:00 |
|
|
Benjamin Goering
|
b561e9f643
|
Comment replyCount edge can now be filtered by notIgnoredBy
|
2017-04-11 14:20:37 -07:00 |
|
|
Benjamin Goering
|
873da1cea9
|
Embed doesn't show comments from ignored users
|
2017-04-11 14:20:37 -07:00 |
|
|
Benjamin Goering
|
2656141d59
|
Add stopIgnoringUser mutation and Embed uses it
|
2017-04-11 14:19:34 -07:00 |
|
|
Benjamin Goering
|
545f176bb8
|
Add ignoreUser mutation and myIgnoredUsers root query
|
2017-04-11 14:19:32 -07:00 |
|
|
Wyatt Johnson
|
07d1f9d3cf
|
Merge branch 'master' into subscriptions
|
2017-04-04 09:58:50 -06:00 |
|
|
Wyatt Johnson
|
63ef49d595
|
Initial subscription impl
|
2017-03-23 11:09:14 -06:00 |
|
|
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 |
|