Commit Graph

129 Commits

Author SHA1 Message Date
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
Benjamin Goering 388c3182ea Change add,removeTag in CommentsService to use simpler query then elemMatch 2017-03-01 13:08:36 +08:00
Benjamin Goering d6167e10ba Revert ALLOWED_TAGS declaration to be arr of objects, not strings 2017-02-28 23:57:35 +08:00
Benjamin Goering 4ff6bce8ec Add ComentsService#removeTag 2017-02-28 19:59:33 +08:00
Benjamin Goering 6e338290a1 addCommentTag mutation works 2017-02-28 19:59:32 +08:00
gaba 5d0ea6a880 Rmove continue button, fix bug with facebook signup. 2017-02-23 09:48:59 -08:00
Wyatt Johnson d7a6bf9e1f Cleaned up some routes 2017-02-21 15:24:44 -07:00
Wyatt Johnson 3e4dc9c8b2 Merge branch 'master' into graph-tests 2017-02-17 15:50:21 -07:00
Wyatt Johnson a00befafcb Initial graph tests 2017-02-17 15:48:46 -07:00
gaba 3bfac591b3 An N was missing... 2017-02-17 08:20:27 -08:00
gaba 5370a6f81a A few more changes from display to username. 2017-02-17 08:05:32 -08:00
gaba 4765973a58 Other small changes and fix bug because displayname instead displayName... 2017-02-16 16:07:19 -08:00
gaba 3166692d4e Rename everywhere to username. 2017-02-16 15:16:54 -08:00
Gabriela Rodríguez Berón c8870f6097 Merge branch 'master' into story-139830877-bug-local-user 2017-02-16 08:54:58 -08:00
gaba ccb5228a9a Errors when saving the user. 2017-02-15 18:28:49 -08:00
Wyatt Johnson fa152bda3f Added count clearning for status changes 2017-02-15 17:48:40 -07:00
Wyatt Johnson 57d4f9d757 Changed new comment's status from null to NONE. 2017-02-15 13:21:15 -07:00
Belen Curcio 8953182329 merge 2017-02-13 19:14:27 -03:00
Wyatt Johnson b30a5d2184 Removed 3.4 dep 2017-02-13 10:49:47 -07:00
Belen Curcio e2ebac7176 adds new mutations: setCommentStatus 2017-02-13 14:32:48 -03:00
Wyatt Johnson de54433c5c Merge branch 'master' into username-displayname 2017-02-10 16:19:27 -07:00
gaba e2e40ca2b3 Merge branch 'master' into story-137818425-tag-staff 2017-02-10 13:42:50 -08:00
Wyatt Johnson c637be364a Moved tag creation into mutator 2017-02-10 12:00:50 -07:00
Wyatt Johnson 7db3da5fdd Added fix for facebook 2017-02-09 17:03:41 -07:00
Wyatt Johnson 3cd2b28bc2 Inital rename of displayName -> username 2017-02-09 16:48:59 -07:00
gaba f2341ca9d3 Adds tag label plugin. 2017-02-09 09:17:56 -08:00
Wyatt Johnson fb9bedc57b Added new action rep, refactored mutations 2017-02-08 17:41:11 -07:00
gaba 85dabae355 Merge branch 'master' into story-137818425-tag-staff 2017-02-08 12:50:14 -08:00
gaba 075e62581e Tags should be an array 2017-02-08 09:03:21 -08:00
gaba fc880de9bf Backend for the tags staff on staff users. 2017-02-07 16:31:39 -08:00