Commit Graph

245 Commits

Author SHA1 Message Date
Wyatt Johnson 797cea4f63 added user query by value to graph 2018-01-03 14:01:51 -07:00
Wyatt Johnson fadf3b5106 Fixed import error 2017-12-11 15:32:00 -06:00
Wyatt Johnson 2d70caf03d Merge branch 'next' into user-status-refactor 2017-12-04 15:42:57 -07:00
Wyatt Johnson 419784f6d1 Merge branch 'master' into next 2017-12-04 15:28:41 -07:00
Wyatt Johnson ef200a85cb removed backend for metrics 2017-11-30 17:16:32 -07:00
Wyatt Johnson 13865ff29e roles -> role, null -> COMMENTER for user roles 2017-11-27 11:53:40 -07:00
Belen Curcio e2af3470dc Adding diff and fix to utils 2017-11-24 13:09:30 -03:00
Wyatt Johnson d8d15f27ab added role management to graph 2017-11-23 11:20:55 -07:00
Wyatt Johnson 6119503057 added support for user assigned_by fields to get resolved 2017-11-23 10:53:20 -07:00
Wyatt Johnson a537d9ac17 added message to ban/suspend workflows 2017-11-22 14:08:18 -07:00
Wyatt Johnson debda80db1 fixed query issues 2017-11-20 10:32:46 -07:00
Wyatt Johnson e17b15ec2c Merge branch 'next' into user-status-refactor 2017-11-17 09:43:59 -07:00
Wyatt Johnson c98c9b3369 Merge branch 'master' into next 2017-11-17 09:29:31 -07:00
Chi Vinh Le 5a71db2568 Undo to previous status + Live updates 2017-11-14 13:58:18 +01:00
Wyatt Johnson 0257e09a40 Merge branch 'next' into user-status-refactor 2017-11-08 13:52:48 -07:00
Wyatt Johnson 61df0e1eeb Merge branch 'master' into next 2017-11-08 13:49:21 -07:00
Wyatt Johnson 9e84c72148 added more mutations 2017-11-08 09:41:38 -07:00
Wyatt Johnson 76a255fb7b initial pass at status support 2017-11-02 17:16:57 -06:00
Chi Vinh Le 3d3e0491a4 Remove updateWordlist and add test 2017-10-09 21:13:47 +07:00
Wyatt Johnson 00de72a6eb Initial work for locking flag type and providing translations 2017-10-03 17:20:40 -06:00
Wyatt Johnson 4913eda974 Merge branch 'master' into new-flags 2017-09-19 17:12:56 -06:00
Chi Vinh Le c3e24a0451 Apply suggenstions 2017-09-20 04:30:29 +07:00
Chi Vinh Le 42954fb84a Return all actions in CreateCommentResponse 2017-09-20 04:17:15 +07:00
Chi Vinh Le 5f7c4f82e7 Return flags when creating comment, restrict access to actions in comment resolver 2017-09-20 02:50:43 +07:00
Chi Vinh Le b482976c58 Allow querying for all statuses 2017-09-20 02:39:31 +07:00
Belen Curcio 818ad07eac lint fixes 2017-09-19 11:43:10 -03:00
Belen Curcio 24391de61d userCount 2017-09-18 11:06:31 -03: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 43b7326db4 Cleanup and apply pr suggestions 2017-09-07 15:38:39 +07:00
Chi Vinh Le 6f82fd76f5 First draft of toxic-comments 2017-09-06 22:11:48 +07:00
Wyatt Johnson 997a336483 Merge branch 'master' into asset-graph-api 2017-09-05 08:56:49 -06:00
Wyatt Johnson dfd77dbf63 updated based on cvle's feedback 2017-08-31 11:48:38 -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 ffab9ca8d5 Refactor users query 2017-08-30 18:48:20 +07:00
Wyatt Johnson 173c257126 Added Graph API for Settings 2017-08-29 13:43:48 -06: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 8cfccb7b00 fixed query 2017-08-28 09:42:37 -06: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
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
Wyatt Johnson 60677e3d2a cleaned up user query logic 2017-08-24 13:07:44 -06:00
Wyatt Johnson 9a1374070f small fixes 2017-08-24 09:47:27 -06:00
Chi Vinh Le df60ac4714 Merge branch 'master' into user-sort 2017-08-24 20:09:44 +07:00
Wyatt Johnson acf792089d added more db optims 2017-08-23 15:42:30 -06:00
Chi Vinh Le 4dd20260a8 Unprotect User.created_at 2017-08-23 17:32:29 +07:00
Wyatt Johnson f85480c0ae Merge branch 'master' into user-sort 2017-08-22 13:04:32 -06:00