Commit Graph

160 Commits

Author SHA1 Message Date
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 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 5298efa89f Adjusting based on PR feedback, added public filter to settings object 2016-12-06 11:55:15 -05:00
Wyatt Johnson d2d4640eee Merge branch 'master' into status-history 2016-12-06 11:08:00 -05:00
Belen Curcio 03b6ec4fe4 Lint 2016-12-05 19:18:29 -03:00
Dan Zajdband 62cc489c21 Merge with master 2016-12-05 16:39:00 -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
Dan Zajdband 4be258c63d Added simple open/close flow 2016-12-05 11:02:39 -05:00
David Jay 8dad90104d Returning infobox data in stream. 2016-12-02 12:26:31 -05:00
Belen Curcio c38c556002 merge 2016-11-30 20:11:22 -03:00
David Jay 17b79e1869 Adding user and action data to rejected and flagged comments. 2016-11-30 13:51:43 -05:00
Belen Curcio 6e7926ab30 Working bios 2016-11-30 12:41:50 -03:00
Belen Curcio 2607c608f5 D
ividing userData from userAuth
2016-11-30 10:20:03 -03:00
David Jay b7ffd31ea4 Cleaning up tests after merge. 2016-11-29 16:37:39 -05:00
David Jay 9499e53021 Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix 2016-11-29 16:36:44 -05:00
Riley Davis 9fcd7b8d3a retreiving comments based on settings was backwards 2016-11-29 12:16:51 -07:00
Wyatt Johnson ac17fc2cc6 Added asset settings + improved tests for routes 2016-11-29 10:01:52 -07:00
Wyatt Johnson cf93a48186 Merge branch 'master' into asset-searching 2016-11-28 17:21:06 -07:00
David Jay aa048365bd Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix 2016-11-28 18:43:20 -05:00
Riley Davis 01e7150dd1 Merge branch 'master' into return-all-settings 2016-11-28 16:26:00 -07:00
David Jay c0a9ea9905 Returning all settings from api/v1/settings. 2016-11-28 18:19:07 -05:00
David Jay 461e80e260 Removing switch in steam endpoint. 2016-11-28 17:43:24 -05:00
David Jay 79cda54be2 Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix 2016-11-28 17:28:41 -05:00
David Jay 7cf05bbdca Merge branch 'master' of https://github.com/coralproject/talk into settings-in-stream 2016-11-28 17:25:07 -05:00
Wyatt Johnson ab46c020d9 Added asset searching 2016-11-28 15:01:13 -07:00
David Jay ca5049feeb Adding settings to stream. 2016-11-28 16:52:00 -05:00
Wyatt Johnson 616dd534d9 Moved kue redis connector 2016-11-28 14:05:06 -07:00
David Jay 8af300a9ec Adding users, comments, and actions to endpoint and moving to store. 2016-11-28 15:51:15 -05:00
Wyatt Johnson b0f01cf00f Initial commit of asset queuing (#97)
* Initial commit of asset queuing

* Addresssing comments
2016-11-28 13:29:39 -05: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
Wyatt Johnson 00a8c59c96 Merge branch 'master' into admin 2016-11-22 08:31:21 -07:00
Belen Curcio 8108ca09ef Permissions, views and somestyling 2016-11-22 11:04:56 -03:00
David Jay 06686105c4 Merge branch 'master' into connect-reset-to-fe 2016-11-21 19:06:04 -05:00
Riley Davis a0469301bb add password reset form 2016-11-21 16:32:07 -07:00
David Jay 2b9caf8daf Updating frontend to utilize new action delete endpoint. 2016-11-21 18:00:50 -05:00
Wyatt Johnson a45a5f7296 Updated test to verify middleware is working 2016-11-21 12:49:04 -07:00
Wyatt Johnson 7893d425ef Updated tests 2016-11-21 12:42:42 -07:00
Wyatt Johnson 7cc311bd81 Added wordlist, cleaned comments api 2016-11-21 11:18:52 -07:00
Riley Davis 506c514799 request pw reset from ui 2016-11-18 15:09:13 -07:00
Belen Curcio 6e75b03d6b Empty states, validation and removing availability 2016-11-18 07:41:46 -03:00
Belen Curcio b1824cdc01 Merge branch 'master' of github.com:coralproject/talk into passport 2016-11-18 06:08:23 -03:00
Wyatt Johnson c4ba18778c Merge branch 'master' into passport 2016-11-17 14:26:52 -07:00
Riley Davis 869d871157 always return 204 for password reset. update swagger file 2016-11-17 11:25:19 -07:00
Riley Davis 04decde9fc throw instead of log errors. rename for clarity 2016-11-17 10:31:46 -07:00