Commit Graph

66 Commits

Author SHA1 Message Date
David Jay 643373e224 Rejecting comments on the server if the character count is too long. 2016-12-13 13:36:54 -05:00
David Jay f5ac576187 Merge branch 'master' of github.com:coralproject/talk into flag-username 2016-12-09 16:33:06 -05:00
David Jay 90ef16e111 Merge branch 'master' of github.com:coralproject/talk into flag-username 2016-12-09 15:51:13 -05:00
Gabriela Rodríguez Berón f29c0a3a09 Merge branch 'master' into ban-user 2016-12-09 10:43:55 -10:00
gaba 15557c16e2 Merge branch 'master' into ban-user 2016-12-09 08:28:46 -10:00
David Jay bf01543a88 Merge branch 'master' of github.com:coralproject/talk into flag-username 2016-12-09 13:26:48 -05:00
David Jay e032a5521e Merge branch 'master' of github.com:coralproject/talk into wordlist 2016-12-09 13:05:11 -05:00
Dan Zajdband 09ba535d68 Merge with master 2016-12-09 10:17:55 -05:00
gaba 1eb204f822 Merge branch 'master' into ban-user 2016-12-08 13:28:12 -10:00
Wyatt Johnson 3d35183e67 Add payload filtering and status_history updates 2016-12-08 15:56:52 -05:00
David Jay 7f24153b4e Revert "Removing extra commas and collapsing actions into an object in the backend."
This reverts commit 9d28577e9b.
2016-12-08 15:47:47 -05:00
David Jay 9d28577e9b Removing extra commas and collapsing actions into an object in the backend. 2016-12-08 15:27:49 -05:00
David Jay 6d701ef49e Updating to detect new status format. 2016-12-08 13:25:18 -05:00
gaba 23c67b4a49 It fix the status change after merging master in. 2016-12-07 16:37:11 -10:00
David Jay 713cc0cda1 Posting actions to comment and user endpoints. 2016-12-07 19:01:02 -05:00
David Jay 507e89a301 Merge branch 'master' of github.com:coralproject/talk into flag-username 2016-12-06 18:19:45 -05:00
David Jay 13d0dec84a Updating postAction to send reasons to backend. 2016-12-06 18:11:44 -05:00
Wyatt Johnson b82f130454 Adds a new closedAt time for assets to prevent new comments from being
created
2016-12-06 14:44:15 -05:00
Wyatt Johnson 5298efa89f Adjusting based on PR feedback, added public filter to settings object 2016-12-06 11:55:15 -05:00
Wyatt Johnson d1cdc48e85 Merge branch 'master' into status-history 2016-12-05 14:20:31 -05:00
Wyatt Johnson 40fd5984a9 Added "assigned_by" to status changes 2016-12-05 13:49:12 -05:00
Wyatt Johnson 2f7f0249b2 Added status changing + history
- Status's for comments is now an array of objects
2016-12-05 11:28:27 -05:00
gaba 2dd3359cb6 Merge branch 'master' into ban-user 2016-11-30 13:31:59 -08:00
David Jay 17b79e1869 Adding user and action data to rejected and flagged comments. 2016-11-30 13:51:43 -05:00
gaba 67d54be0d9 Remove space. 2016-11-28 12:11:05 -08:00
gaba 1ec7435ef4 Merge branch 'master' into ban-user 2016-11-28 11:41:31 -08:00
Wyatt Johnson 9d8968f1ce Corrected action upserting functionality 2016-11-28 10:14:13 -07:00
Wyatt Johnson 325162cb3e Added authorization pieces + test functions 2016-11-22 17:15:14 -07:00
gaba 7dc7df2601 Merge branch 'master' into ban-user 2016-11-22 09:30:52 -08:00
gaba 3337e95a6c Move the change status of the user to a ban the user func. 2016-11-21 12:18:19 -08:00
Wyatt Johnson a45a5f7296 Updated test to verify middleware is working 2016-11-21 12:49:04 -07:00
Wyatt Johnson 7cc311bd81 Added wordlist, cleaned comments api 2016-11-21 11:18:52 -07:00
David Jay d1ea85468e Addressing issue when deleting actions. 2016-11-15 14:46:08 -05:00
David Jay fbf27a9d75 Resolving 500 error when deleting an action. 2016-11-15 14:24:38 -05:00
David Jay 44292a81ad Moving init and responsehandler to shared functions, updating all routes to return valid JSON. 2016-11-14 17:09:20 -05:00
David Jay 8abec63620 Merge branch 'master' of https://github.com/coralproject/talk into like-button 2016-11-11 19:20:37 -05:00
David Jay 4bea5e5914 Adding route to delete actions. 2016-11-11 17:06:29 -05:00
gaba 51b497e991 Merge branch 'master' into moving-to-queue 2016-11-11 12:17:56 -08:00
gaba 7d5b79c6a0 Moved the moderation queue to its own folder and change the route to /queue/comments/pending 2016-11-10 14:59:56 -08:00
David Erwin f7249c4016 More linting and commenting 2016-11-10 15:12:56 -05:00
David Erwin 89398120d5 Remove function keyword 2016-11-10 14:57:57 -05:00
David Erwin d9dc198d46 Moved chained funcitons to multiple lines 2016-11-10 14:52:05 -05:00
David Erwin a234eeb3ba Add json header, update status, and lint 2016-11-10 10:49:55 -05:00
gaba eae2a0285b More tests and move settings stuff to routes and out of models. 2016-11-09 12:35:59 -08:00
gaba 0968b02c3a Moderation queue depending on moderation settings. 2016-11-08 15:26:05 -08:00
gaba c8c82fd03b Move all DB functions into models. Clean up tests. 2016-11-07 18:10:17 -08:00
gaba 0c04e765d6 Moderation queue on flagged comments. 2016-11-07 15:10:56 -08:00
gaba 48e61c2dc1 Merge branch 'master' into mod-queue 2016-11-07 14:28:25 -08:00
gaba 626687f05b Adds moderations queues. 2016-11-07 14:18:43 -08:00
David Jay c8bdecbd1b Merge branch 'master' of https://github.com/coralproject/talk into post-comment 2016-11-07 16:29:06 -05:00