Commit Graph

1406 Commits

Author SHA1 Message Date
Gabriela Rodríguez Berón 1cc048d46e Merge branch 'master' into unique-username 2017-01-12 14:53:13 -08:00
Riley Davis 20f90572f5 Merge pull request #228 from coralproject/pending-queue-routes
moderation queue routes
2017-01-12 15:49:44 -07:00
gaba 536a2165cc Merge branch 'master' into unique-username 2017-01-12 14:47:45 -08:00
gaba 1027b19a49 Added regex to look for the field that is duplicated. Not sure if there is a better way to do it. 2017-01-12 14:43:36 -08:00
Riley Davis 5136fce4a3 Merge branch 'master' into pending-queue-routes 2017-01-12 15:34:13 -07:00
Riley Davis 0eefd3364b update tests 2017-01-12 15:25:36 -07:00
Wyatt Johnson 31b7dac48a Merge pull request #229 from coralproject/topic-220
Standardizes errors for API error returns
2017-01-12 14:33:58 -07:00
Wyatt Johnson 6e89734e12 Moved errors to errors.js, std error msgs/types 2017-01-12 14:08:52 -07:00
Riley Davis 44b41b031e lint 2017-01-12 14:03:58 -07:00
Riley Davis b66efb7f2a return flagged comments 2017-01-12 13:44:10 -07:00
Riley Davis f1272338cd re-use dispatch function 2017-01-12 13:30:53 -07:00
Riley Davis 3285a5ec29 add status to Comment. /comments/pending and /comments/rejected ONLY return the respective comments 2017-01-12 12:16:13 -07:00
gaba acf3ad5e28 Some conflicts were added. 2017-01-12 11:10:07 -08:00
gaba 15e7ef6368 Adds an error const. 2017-01-12 10:46:18 -08:00
gaba 873ec09f62 Merge branch 'master' into unique-username 2017-01-12 08:46:51 -08:00
Riley Davis 18b35e38a8 Merge pull request #227 from coralproject/flagged-queue-bugfix
Fix flagged comment queue bug
2017-01-11 14:20:03 -07:00
Wyatt Johnson 6ca7e92171 Merge branch 'master' into flagged-queue-bugfix 2017-01-11 13:48:09 -07:00
David Jay 09e3889793 Updating action type from to for consistency. 2017-01-11 15:42:56 -05:00
David Jay 2a1ea01827 Merge pull request #226 from coralproject/dev-start
Added dev-start and --config flag
2017-01-11 15:14:59 -05:00
Wyatt Johnson 10aaa037dc Added dev-start and --config flag 2017-01-11 11:37:06 -07:00
Wyatt Johnson 5f215a95f9 Merge pull request #222 from coralproject/hide-passwords
Cleaned user auth response
2017-01-11 10:22:28 -07:00
Wyatt Johnson 7a21879628 Merge branch 'master' into hide-passwords 2017-01-10 14:53:26 -07:00
Kim Gardner 2e4256bf4a Merge pull request #223 from coralproject/users-bug-fix
Making user action item_type 'users' for consistency.
2017-01-10 16:11:22 -05:00
David Jay 11f18c23cb Merge branch 'master' into users-bug-fix 2017-01-10 14:13:31 -05:00
Wyatt Johnson 8519d07c67 Cleaned user auth response 2017-01-10 12:00:06 -07:00
David Jay d9147da8fc Making user action item_type 'users' for consistency. 2017-01-10 13:59:36 -05:00
Kim Gardner e87a471eb9 Merge pull request #201 from coralproject/frontenddocs
Frontend Docs
2017-01-10 11:44:03 -05:00
Kim Gardner 6cf4011cde Merge branch 'master' into frontenddocs 2017-01-10 11:40:03 -05:00
Riley Davis f76177c1db Merge pull request #214 from coralproject/bad-words
Bad usernames
2017-01-09 18:13:18 -07:00
Wyatt Johnson 7283feab6b Merge branch 'master' into bad-words 2017-01-09 16:44:19 -07:00
David Jay 296b941ee8 Merge pull request #221 from coralproject/email-confirm
Email Confirmation Resend Endpoint + Fixes to mailer
2017-01-09 18:19:53 -05:00
Wyatt Johnson 586ce941e5 Merge branch 'master' into email-confirm 2017-01-09 16:10:46 -07:00
Wyatt Johnson ec3a114e65 Added missing endpoint + fix for mailer 2017-01-09 15:50:46 -07:00
Riley Davis b6eaf210fe don't use regex on existing lists 2017-01-09 15:41:47 -07:00
riley 7bc848b801 make tests pass 2017-01-09 10:47:28 -07:00
gaba 976f0762b3 Password lenght of 8. 2017-01-06 17:42:42 -03:00
Riley Davis bba597f086 even more lint 2017-01-06 13:28:48 -07:00
Riley Davis abd2332745 lint 2017-01-06 13:23:51 -07:00
Riley Davis a3bb8e2f41 remove logs. missed some errors 2017-01-06 13:11:37 -07:00
Riley Davis 01db900c40 move defined errors into top-level errors.js file 2017-01-06 13:00:22 -07:00
gaba 4dbc73f9ab Add a test on already used display name. 2017-01-06 16:57:25 -03:00
Riley Davis 6a61f47ddf Merged branch master into bad-words 2017-01-06 12:45:41 -07:00
gaba 712e436f58 Cleans error on email address or name. We need to go through all the errors and manage them better with translations. 2017-01-06 16:38:44 -03:00
Riley Davis 72cd78da8c use wordlist service 2017-01-06 12:35:08 -07:00
gaba 8a1eedb0b2 Merge branch 'master' into unique-username 2017-01-06 14:12:46 -03:00
Wyatt Johnson bf04034085 Merge pull request #213 from coralproject/issue-191
Banned users should not be able to report/flag anything from the Front End
2017-01-06 10:03:14 -07:00
Gabriela Rodríguez Berón 1e445efaec Merge branch 'master' into issue-191 2017-01-06 13:33:25 -03:00
Gabriela Rodríguez Berón 466cb289c3 Merge pull request #215 from coralproject/email-confirm
Email Confirmation and Fixes
2017-01-06 13:31:40 -03:00
Wyatt Johnson 4c5b85a2ae Fixed session bug 2017-01-05 19:02:06 -07:00
Wyatt Johnson 4eb7c72ae2 Merge branch 'master' into email-confirm 2017-01-05 18:45:06 -07:00