Commit Graph

3586 Commits

Author SHA1 Message Date
Gabriela Rodríguez Berón 05180394c7 Merge pull request #234 from coralproject/preserve-comment-view-state
Adjusted stream to preserve comment view state
2017-01-13 15:10:01 -08:00
Gabriela Rodríguez Berón 4f013c50e6 Merge branch 'master' into bugfix-flagged-actions 2017-01-13 15:05:54 -08:00
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
David Jay dc63cc6bce Merge branch 'moderate-bio' of github.com:coralproject/talk into moderate-bio 2017-01-13 16:39:17 -05:00
David Jay 0131dd6b13 Merge branch 'master' of github.com:coralproject/talk into moderate-bio 2017-01-13 16:37:31 -05:00
Riley Davis 44a06aef46 do not render tab content unless they're active 2017-01-13 14:33:01 -07:00
Belen Curcio f0cc82cb6d Changes 2017-01-13 18:16:46 -03: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
Belen Curcio cae101627f Merge branch 'master' of github.com:coralproject/talk into design-pass-adm 2017-01-13 17:14:51 -03:00
Belen Curcio e69262c665 Community Section Ready 2017-01-13 17:11:46 -03:00
Riley Davis 7295d78523 typos 2017-01-13 11:13:28 -07:00
Wyatt Johnson 041241d6b0 Merge branch 'master' into preserve-comment-view-state 2017-01-13 10:33:17 -07:00
Belen Curcio 9876e04454 Ban User box 2017-01-13 13:54:45 -03:00
Belen Curcio 712c53389b Banned Words and Suspect 2017-01-13 13:07:45 -03: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
Wyatt Johnson 281a49dc74 Merge branch 'master' into bugfix-flagged-actions 2017-01-12 16:29:32 -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
David Jay f3f5397459 Removing rejected and approved comments from flagged feed. 2017-01-12 17:32:48 -05:00
Riley Davis 0eefd3364b update tests 2017-01-12 15:25:36 -07:00
David Jay 361be84562 Merge branch 'master' into bug-comment-number 2017-01-12 16:49:16 -05:00
David Jay 3e0d56b942 Keeping hydrated comments in assets in COMMENTS_BY_USER_REQUEST. 2017-01-12 16:41:50 -05: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
Belen Curcio ce01389809 Ádding Icon to Coral UI Button 2017-01-12 18:20:42 -03: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
Belen Curcio 87b350e3a9 Missing tab wrapper 2017-01-12 17:56:00 -03:00
David Jay 1432cfba4a Updating signing dialog style to render as intended in Firefox. 2017-01-12 15:49:23 -05:00
Belen Curcio c375d11e32 Coral UI - List and Item 2017-01-12 17:47:45 -03: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