Commit Graph

114 Commits

Author SHA1 Message Date
Wyatt Johnson ef200a85cb removed backend for metrics 2017-11-30 17:16:32 -07:00
Chi Vinh Le 511e71f63a Change default settings=null to settings={} 2017-11-20 20:19:58 +01:00
blackcathacker bfe82218ed Send user an email when they are banned #1050 2017-10-29 18:48:15 -07: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
Kim Gardner 1a31d9eb97 Merge branch 'master' into email-verification 2017-10-19 11:49:10 +01:00
Wyatt Johnson 1dea6267d7 fixes to the toObject, added test 2017-10-18 16:07:20 -06:00
Wyatt Johnson 5f9f712a9b Merge branch 'master' into email-verification 2017-10-18 09:34:32 -06:00
Wyatt Johnson 5e74a044f3 Merge branch 'master' into cannot-ignore-staff 2017-10-12 15:38:18 -06:00
Wyatt Johnson 9d5739b396 better support for email verification 2017-10-12 15:27:57 -06:00
Wyatt Johnson 86f48cea96 Modified user search to include whole word search 2017-10-11 16:41:09 -06:00
Kim Gardner dcfdec4df1 Merge branch 'master' into cannot-ignore-staff 2017-10-11 09:49:06 +01:00
Chi Vinh Le 3d3e0491a4 Remove updateWordlist and add test 2017-10-09 21:13:47 +07:00
Daniel Janeiro 7eaad1541b Implement cannot ignore staff in users service
`UsersService.ignoreUsers` now checks if any user provided is a staff
member. In case it is it throws a ErrCannotIgnoreStaff error.
2017-10-07 23:02:25 +01:00
Wyatt Johnson 825e1b5e5c Fixes to password reset flow 2017-09-25 14:50:33 -06:00
Wyatt Johnson f97094177a revamped configuration for moderation phases 2017-09-15 14:23:18 -06:00
Chi Vinh Le dc7013187d Merge branch 'master' into story/150636425 2017-09-15 19:11:31 +07:00
Wyatt Johnson b3eb3361bb Merge branch 'master' into new-regexp-highlighter 2017-09-14 08:47:40 -06:00
Chi Vinh Le c41ab58109 Allow Moderator to have read access on assets and settings 2017-09-14 21:11:40 +07:00
Chi Vinh Le ad361413c7 Reimplement wordlist on server using same regexp solution 2017-09-14 17:36:04 +07:00
Wyatt Johnson 49f09b87a0 Added new SYSTEM_WITHHELD comment status 2017-09-11 11:09:21 -06:00
Wyatt Johnson d20bd20005 linting 2017-09-08 15:46:04 -06:00
Wyatt Johnson ce3e29813b implemented status switch when mismatched 2017-09-08 15:41:43 -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
Wyatt Johnson e96e9c0d5c Fixed old story search query 2017-09-06 09:18:22 -06: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 f0dcef7b37 finished connection, improved graph 2017-08-30 14:23:47 -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
Wyatt Johnson c8d1871418 Merge branch 'master' into lint-upgrade 2017-08-29 11:56:59 -06:00
Kim Gardner bf7dfefcdf Merge branch 'master' into asset-graph-api 2017-08-29 18:52:17 +01:00
Wyatt Johnson c786805505 small bug fix 2017-08-29 10:28:30 -06:00
Kiwi d4c9749133 Merge branch 'master' into asset-graph-api 2017-08-29 12:59:26 +02:00
Kiwi d82932306d Merge branch 'master' into lint-upgrade 2017-08-29 12:47:47 +02:00
Wyatt Johnson 90a8a87eaf Added graph API for assets 2017-08-28 18:57:32 -06:00
Wyatt Johnson 38f98c7c43 Added duplicated comments tests 2017-08-28 16:41:58 -06:00
Wyatt Johnson eb586f217b Upgraded/pruned deps, applied linting fixes 2017-08-28 14:06:54 -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
Wyatt Johnson 13796fb268 added more test cases 2017-08-24 11:18:17 -06:00
Kim Gardner c733b7760d Merge branch 'master' into banned-words 2017-08-24 17:22:49 +01:00
Chi Vinh Le ddb555e07f Add new sorting variables 2017-08-24 21:30:16 +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 a68513227a adjusted tokenizer to use regex based tokenizer instead 2017-08-23 09:54:00 -06:00
Wyatt Johnson 01ed9880f4 comment count optim, prep for sortBy 2017-08-21 15:26:04 -06:00
Wyatt Johnson 7125250cd6 updated tests 2017-08-20 12:54:46 -06:00
Wyatt Johnson 5036a2665a fixes to tests and impl edit hooks 2017-08-20 12:25:22 -06:00
Wyatt Johnson b2e871f4a6 added event for edit to manage reply count 2017-08-19 10:49:50 -06:00