 Wyatt Johnson
|
2c3a52b48c
|
Merge branch 'master' into story/150848457
|
2017-09-15 15:49:30 -06:00 |
|
|
Wyatt Johnson
|
384c126d9e
|
added docs
|
2017-09-15 15:29:20 -06:00 |
|
|
Wyatt Johnson
|
f97094177a
|
revamped configuration for moderation phases
|
2017-09-15 14:23:18 -06:00 |
|
|
Chi Vinh Le
|
e31cdebc12
|
Make it appear in reported queue
|
2017-09-15 22:52:19 +07:00 |
|
|
Chi Vinh Le
|
dc7013187d
|
Merge branch 'master' into story/150636425
|
2017-09-15 19:11:31 +07:00 |
|
|
Kim Gardner
|
26256b979e
|
Merge branch 'master' into story/150848457
|
2017-09-14 16:20:20 +01:00 |
|
|
Chi Vinh Le
|
2a655331fc
|
Use same tlds list on server
|
2017-09-12 21:46:03 +07:00 |
|
|
Wyatt Johnson
|
ca411a3227
|
added support for deep comment counts
|
2017-09-11 18:01:01 -06:00 |
|
|
Wyatt Johnson
|
49f09b87a0
|
Added new SYSTEM_WITHHELD comment status
|
2017-09-11 11:09:21 -06:00 |
|
|
Wyatt Johnson
|
9af21b4226
|
test fixes
|
2017-09-08 16:23:31 -06:00 |
|
|
Wyatt Johnson
|
ce3e29813b
|
implemented status switch when mismatched
|
2017-09-08 15:41:43 -06:00 |
|
|
Kim Gardner
|
299c6f1ffd
|
Merge branch 'master' into feature/talk-plugin-toxic-comments
|
2017-09-08 10:16:40 +01:00 |
|
|
Wyatt Johnson
|
56bd3f23c7
|
fixed broken query
|
2017-09-07 13:53:37 -06:00 |
|
|
Wyatt Johnson
|
2b91bcffda
|
fixes #923
|
2017-09-07 13:49:22 -06:00 |
|
|
Chi Vinh Le
|
f1c5d479ad
|
Merge branch 'master' into feature/talk-plugin-toxic-comments
Conflicts:
graph/resolvers/root_mutation.js
graph/typeDefs.graphql
|
2017-09-07 16:59:46 +07:00 |
|
|
Chi Vinh Le
|
a78be6874b
|
Remove response helpers
|
2017-09-07 15:49:51 +07:00 |
|
|
Chi Vinh Le
|
43b7326db4
|
Cleanup and apply pr suggestions
|
2017-09-07 15:38:39 +07:00 |
|
|
Chi Vinh Le
|
9b0caa42cd
|
Put toxic comment into premod and add flag
|
2017-09-06 22:58:52 +07:00 |
|
|
Chi Vinh Le
|
6f82fd76f5
|
First draft of toxic-comments
|
2017-09-06 22:11:48 +07:00 |
|
|
Wyatt Johnson
|
7b27feee96
|
fixed typo
|
2017-09-05 09:45:31 -06:00 |
|
|
Wyatt Johnson
|
997a336483
|
Merge branch 'master' into asset-graph-api
|
2017-09-05 08:56:49 -06:00 |
|
|
Wyatt Johnson
|
9a549a2b63
|
fixed some bugs from review
|
2017-09-01 11:21:30 -06:00 |
|
|
Wyatt Johnson
|
dfd77dbf63
|
updated based on cvle's feedback
|
2017-08-31 11:48:38 -06:00 |
|
|
Wyatt Johnson
|
7b71511cae
|
removed !
|
2017-08-31 10:37:52 -06:00 |
|
|
Kim Gardner
|
0486d2926d
|
Merge branch 'master' into asset-graph-api
|
2017-08-31 08:51:29 +01:00 |
|
|
Kim Gardner
|
cb655f15b3
|
Merge branch 'master' into settings-graph-api
|
2017-08-31 08:51:16 +01:00 |
|
|
Wyatt Johnson
|
f0dcef7b37
|
finished connection, improved graph
|
2017-08-30 14:23:47 -06:00 |
|
|
Chi Vinh Le
|
4072c39f05
|
Merge branch 'master' into paginate-flagged-users
Conflicts:
client/coral-admin/src/routes/Community/components/FlaggedAccounts.js
client/coral-admin/src/routes/Community/components/User.js
client/coral-admin/src/routes/Community/containers/Community.js
graph/loaders/users.js
|
2017-08-30 22:56:30 +07:00 |
|
|
Chi Vinh Le
|
797f0fd0e3
|
Docs in schema
|
2017-08-30 21:05:03 +07:00 |
|
|
Chi Vinh Le
|
02ec1f69ee
|
More graphql fixes
|
2017-08-30 20:42:13 +07:00 |
|
|
Chi Vinh Le
|
ffab9ca8d5
|
Refactor users query
|
2017-08-30 18:48:20 +07:00 |
|
|
Wyatt Johnson
|
8ca32c5808
|
added missing fields
|
2017-08-29 13:54:14 -06:00 |
|
|
Wyatt Johnson
|
5a48705d49
|
Merge branch 'master' into settings-graph-api
|
2017-08-29 13:44:20 -06:00 |
|
|
Wyatt Johnson
|
173c257126
|
Added Graph API for Settings
|
2017-08-29 13:43:48 -06:00 |
|
|
Kiwi
|
9e65f1b00d
|
Merge branch 'master' into asset-graph-api
|
2017-08-29 21:04:30 +02:00 |
|
|
Chi Vinh Le
|
eb67d86163
|
Implement UserConnection on the graph
|
2017-08-29 18:57:20 +07:00 |
|
|
Wyatt Johnson
|
90a8a87eaf
|
Added graph API for assets
|
2017-08-28 18:57:32 -06:00 |
|
|
Wyatt Johnson
|
eb586f217b
|
Upgraded/pruned deps, applied linting fixes
|
2017-08-28 14:06:54 -06:00 |
|
|
Wyatt Johnson
|
e92f75d4ad
|
Merge branch 'master' into debugging-optim
|
2017-08-28 11:50:02 -06:00 |
|
|
Wyatt Johnson
|
057d8cabd2
|
Increased debugging and optimized a query path
|
2017-08-28 11:47:51 -06:00 |
|
|
Kiwi
|
afd3b1b3fe
|
Merge branch 'master' into fix-action-type-query
|
2017-08-28 19:21:19 +02:00 |
|
|
Chi Vinh Le
|
44c6798959
|
Fix action_type query
|
2017-08-29 00:20:36 +07:00 |
|
|
Wyatt Johnson
|
8cfccb7b00
|
fixed query
|
2017-08-28 09:42:37 -06:00 |
|
|
Chi Vinh Le
|
e4490e20a7
|
Merge branch 'master' into user-sort
Conflicts:
package.json
|
2017-08-28 18:16:18 +07:00 |
|
|
Wyatt Johnson
|
8a5db167ff
|
changed sort -> sortOrder
|
2017-08-25 09:59:37 -06:00 |
|
|
Chi Vinh Le
|
48595a1bbf
|
Merge branch 'master' into user-sort
Conflicts:
client/coral-admin/src/reducers/moderation.js
client/coral-embed-stream/src/actions/stream.js
client/coral-embed-stream/src/components/Stream.js
client/coral-framework/components/Slot.js
plugin-api/beta/client/utils/index.js
test/server/routes/api/account/index.js
|
2017-08-25 21:55:00 +07:00 |
|
|
Belén Curcio
|
ce63942902
|
Merge branch 'master' into questionbox
|
2017-08-25 11:52:11 -03:00 |
|
|
Chi Vinh Le
|
38c290958c
|
Merge branch 'user-sort' of ssh://github.com/coralproject/talk into user-sort
|
2017-08-25 20:22:09 +07:00 |
|
|
Chi Vinh Le
|
f0931b4dc6
|
Fix asset.comment resolver
|
2017-08-25 19:21:14 +07:00 |
|
|
Belen Curcio
|
5cb71eaee8
|
Icon List for Question Box
|
2017-08-24 16:32:07 -03:00 |
|