Commit Graph

1423 Commits

Author SHA1 Message Date
Wyatt Johnson da0ca97483 Added comment for SIGUSR2 2017-01-13 16:02:49 -07:00
Gabriela Rodríguez Berón 53a403cddb Merge branch 'master' into preserve-comment-view-state 2017-01-13 14:29:50 -08:00
Gabriela Rodríguez Berón 06812edcd2 Merge pull request #218 from coralproject/unique-username
Unique username
2017-01-13 14:29:36 -08:00
Gabriela Rodríguez Berón 1accc54238 Merge branch 'master' into unique-username 2017-01-13 14:21:42 -08:00
Wyatt Johnson 05c055c3d2 Merge branch 'master' into preserve-comment-view-state 2017-01-13 15:20:49 -07:00
gaba 06ab33343f Errors needs to use APIError. 2017-01-13 14:15:31 -08:00
David Jay 3cc120cd25 Merge pull request #237 from coralproject/bizarro-world
do not render tab content unless they're active
2017-01-13 17:05:36 -05:00
Riley Davis 44a06aef46 do not render tab content unless they're active 2017-01-13 14:33:01 -07:00
David Jay 8632cd9b67 Merge pull request #233 from coralproject/my-comments-part-deux-the-commenting
don't show unpublished comments in My Comments
2017-01-13 16:15:50 -05:00
David Jay 5f58ca6b5d Merge branch 'master' into my-comments-part-deux-the-commenting 2017-01-13 16:08:39 -05:00
Wyatt Johnson 041241d6b0 Merge branch 'master' into preserve-comment-view-state 2017-01-13 10:33:17 -07:00
Wyatt Johnson 9e5dbfd9cf Merge pull request #235 from coralproject/dev-env-docs
Updating docs for .env functionality
2017-01-13 08:29:50 -07:00
Wyatt Johnson 39a4d031c7 Adjusted for new wiki page 2017-01-13 08:24:12 -07:00
David Erwin 7c95781072 Update README.md 2017-01-13 10:21:12 -05:00
David Erwin f56e30c1a1 Updating docs for .env functionality 2017-01-13 10:08:35 -05:00
Wyatt Johnson c90230c115 Adjusted stream to preserve comment view state 2017-01-12 17:55:08 -07:00
Riley Davis ad0f530fd3 don't return unpublished comments in My Comments section. add tests 2017-01-12 17:07:35 -07:00
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