Commit Graph

158 Commits

Author SHA1 Message Date
Wyatt Johnson 8164fa7813 Merge branch 'master' into docs-update 2017-04-14 15:07:02 -06:00
Wyatt Johnson d4fc8a474d Should resolve bug relating to usernames being set as "undefined" 2017-04-14 14:57:13 -06:00
Wyatt Johnson cb652dbb86 Merge branch 'master' into docs-update 2017-04-14 12:23:43 -06:00
Benjamin Goering 118da885fd Merge branch 'master' of github.com:coralproject/talk into ignore_rb2 2017-04-13 12:12:10 -05:00
Wyatt Johnson d5016dff58 Updates to metadata service docs 2017-04-12 16:37:56 -06:00
Wyatt Johnson 191026ecf2 Merge branch 'master' into metadata 2017-04-12 10:37:12 -06:00
Benjamin Goering 7dfe12b874 Users cannot ignore themselves at service layer 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
gaba c5520e3fb6 Adds missing template. 2017-04-11 12:22:05 -07:00
David Erwin 2c8d03bd8d Temporarily disable username profanity check 2017-04-11 11:05:55 -04:00
Wyatt Johnson 8e33d25a28 Some bug fixes + validation updates 2017-04-10 12:12:07 -06:00
Wyatt Johnson 735aa6fbd3 Added new Metadata Service and models 2017-04-07 16:40:30 -06:00
Wyatt Johnson 8a06118d94 Added coral facebook auth plugin, some circ dep fixes 2017-04-05 11:39:54 -06:00
Wyatt Johnson c1dac11a2b Updated docs, hook names 2017-04-03 16:11:34 -06:00
Wyatt Johnson 8d3524dd61 Added support for auth based plugins 2017-04-03 16:06:38 -06:00
Wyatt Johnson 1b8489165b Merge branch 'master' into docker-plugins 2017-03-31 16:41:34 -06:00
Wyatt Johnson 0108673566 Added remote plugin reconciliation 2017-03-31 15:54:39 -06:00
Wyatt Johnson ebcb3b4b02 Merge branch 'master' into dynamic-email-templates 2017-03-29 13:09:31 -06:00
Wyatt Johnson 8680d6cab8 Fixes issues with wordlist and usernames
- Ensure that the wordlist can't contain emoji's
- Ensure that username checks user the correct tokenizer
2017-03-29 10:57:12 -06:00
Wyatt Johnson e7c0c5b638 adjusted path 2017-03-28 09:54:27 -06:00
Belén Curcio 4ff683b3af Merge branch 'master' into dynamic-email-templates 2017-03-28 11:20:22 -03:00
Gabriela Rodríguez Berón 155be523ff Merge branch 'master' into community-flags 2017-03-28 07:14:30 -07:00
Riley Davis 2ec5b243fb hot-load email templates during development 2017-03-27 12:43:03 -06:00
gaba b5d86a3380 Merge branch 'master' into community-flags 2017-03-24 11:19:30 -07:00
gaba 9eaed90318 Revert "Revert "Story 138187767 - Moderate Flag User Names""
This reverts commit 903aa23f19.
2017-03-24 11:15:42 -07:00
Riley Davis 8114608626 put the mongoose update opts in the right place 2017-03-24 11:33:06 -06:00
riley 5d5ad2585d autoclose an article toggle 2017-03-24 10:40:12 -06:00
gaba 84f1d3ece2 Use findONeAndUpdate and the moderation queue for account flags should only give back pending accounts. 2017-03-23 16:02:25 -07:00
Riley Davis 984514d7eb check whitelist before redirecting 2017-03-23 12:46:20 -06:00
Riley Davis 67e04bf156 Merge branch 'master' into reset-password-redirect 2017-03-23 10:29:05 -06:00
David Erwin 903aa23f19 Revert "Story 138187767 - Moderate Flag User Names" 2017-03-23 11:18:55 -04:00
Riley Davis fb2f8ef074 redirect to the parent url when resetting your password 2017-03-22 16:49:34 -06:00
gaba d9af09d2a3 Email templates 2017-03-22 11:43:03 -07:00
gaba 046cea5043 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-22 11:33:25 -07:00
gaba ac6a116896 Only the name for the template. 2017-03-22 11:21:41 -07:00
Riley Davis 555b4517d8 move email templates into services/mailer. remove express app dep to render files 2017-03-22 12:00:30 -06:00
gaba 9782cf0b9d Mail SendSimple will not use app in the future but render from ejs. 2017-03-22 10:02:59 -07:00
Riley Davis b51cbebe1d Merge branch 'master' into story-138187767-mod-flag-names 2017-03-22 09:57:29 -06:00
gaba 7522bd9cd6 Sends a mail to the suspended user. 2017-03-21 15:08:46 -07:00
Wyatt Johnson eceddf109a Added reCAPTCHA docs 2017-03-20 12:35:22 -06:00
riley ca07406b1a Merge branch 'master' into recaptcha-support 2017-03-20 07:36:20 -07:00
Wyatt Johnson fcc93963c4 Added support for total comment count 2017-03-20 07:29:08 -07:00
riley b1f426e70d Merge branch 'master' into recaptcha-support 2017-03-13 12:27:19 -06:00
Wyatt Johnson 93221de563 Added support for total comment count 2017-03-09 17:07:07 -07:00
gaba 564b8d8eaa Merge branch 'master' into story-138187767-mod-flag-names 2017-03-07 13:04:28 +01:00
Wyatt Johnson d82f3d0f0d Added initial recaptcha + RL support 2017-03-06 15:26:44 -07:00
gaba 2fa832a3f4 adds suspendUser func and mutation. 2017-03-02 15:54:50 -08:00
Benjamin Goering b0036ef778 Remove findById in error conditions of CommentsService@addTag,removeTag 2017-03-01 14:09:03 +08:00
Benjamin Goering 4b2cc72e1a Remove unnecessary defensive code in CommentsService 2017-03-01 14:01:12 +08:00