Commit Graph

22 Commits

Author SHA1 Message Date
Wyatt Johnson f40f209395 cleaned up routes 2018-02-13 12:12:03 -07:00
Wyatt Johnson 0abc2ca243 replaced eslint:recommended with prettier 2018-01-11 20:00:34 -07:00
Wyatt Johnson 9c595b7f84 Merge branch 'master' into next 2018-01-05 11:10:32 -07:00
Wyatt Johnson 20878ba040 css and standardization on all admin pages 2017-12-21 23:27:37 -07:00
Wyatt Johnson 13865ff29e roles -> role, null -> COMMENTER for user roles 2017-11-27 11:53:40 -07:00
Wyatt Johnson 76a255fb7b initial pass at status support 2017-11-02 17:16:57 -06:00
Kim Gardner b43b84acff Merge branch 'master' into community-pagination- 2017-10-24 18:05:53 +01:00
Belen Curcio a0929fd773 Updated tests 2017-10-24 12:30:07 -03:00
Wyatt Johnson 9d5739b396 better support for email verification 2017-10-12 15:27:57 -06:00
Chi Vinh Le c41ab58109 Allow Moderator to have read access on assets and settings 2017-09-14 21:11:40 +07:00
Wyatt Johnson e96e9c0d5c Fixed old story search query 2017-09-06 09:18:22 -06:00
Wyatt Johnson eb586f217b Upgraded/pruned deps, applied linting fixes 2017-08-28 14:06:54 -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
Wyatt Johnson 6d8185c33e modified middleware to change AND -> OR, added mod to com pages 2017-08-23 11:52:02 -06:00
Wyatt Johnson d38dbc87b6 simplified test layout 2017-08-19 10:22:26 -06:00
Chi Vinh Le b972f4305e Correctly determine the status of the asset 2017-08-02 00:04:11 +07:00
Chi Vinh Le 270491dc0f Allow editing to the same username in the "create username" flow 2017-06-28 16:08:46 +07:00
Chi Vinh Le f709057933 Require username to be different when editing it 2017-06-21 21:18:28 +07:00
Chi Vinh Le b0079c191b Remove non existant 'truthy' tests 2017-06-21 19:31:55 +07:00
Belen Curcio 61591a9716 Removing extra log 2017-06-16 16:24:00 -03:00
Belen Curcio 991bdc6089 Updated BE 2017-06-16 16:18:02 -03:00
Belen Curcio 2e80d2a36e fixing and separating broken tests /client /server 2017-03-23 12:27:30 -03:00