Commit Graph

148 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 fc96c1ee91 Compressing variables from postAction into single object. 2016-12-08 14:27:31 -05:00
David Jay f8923aa283 Updating tests. 2016-12-07 22:22:23 -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 d2d4640eee Merge branch 'master' into status-history 2016-12-06 11:08:00 -05:00
Wyatt Johnson 91efa60b55 Fixed linting error 2016-12-05 14:20:47 -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
Kim Gardner e528e0678f Merge branch 'master' into stream-e2e 2016-12-04 00:49:27 -05:00
David Jay 8dad90104d Returning infobox data in stream. 2016-12-02 12:26:31 -05:00
David Jay a118d263ea Cleaning url regex in commentstream. 2016-12-01 16:23:33 -05:00
David Jay b2b9b0ec42 Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e 2016-11-30 17:55:39 -05:00
David Jay 3f1f678fb2 Adding comment count test. 2016-11-30 17:49:08 -05:00
David Jay fe4e9c5ea9 All e2e tests passing. 2016-11-30 17:38:23 -05:00
David Jay 7503ba9ab3 Moving settings to mocks. 2016-11-30 16:27:03 -05:00
David Jay 2b0a503c6a Adding mock functions to tests. 2016-11-30 16:18:54 -05:00
David Jay 17b79e1869 Adding user and action data to rejected and flagged comments. 2016-11-30 13:51:43 -05:00
David Jay fb977da01d Adding mocks file. 2016-11-29 17:36:17 -05: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 3c903ddd6d Merge branch 'master' into stream-e2e 2016-11-29 10:41:50 -07:00
Wyatt Johnson fd9636dc9d Merge branch 'master' into asset-settings 2016-11-28 17:16:39 -07:00
Wyatt Johnson 3448752f6f Added asset settings + improved tests for routes 2016-11-28 17:13:11 -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 0e3cd001e9 merge master 2016-11-28 16:38:25 -07:00
Riley Davis d5ff0f8f28 keep it DRY. add getInit all over the place. update tests 2016-11-28 16:18:19 -07: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
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
David Jay 9a98ccc846 Commenting out blocked tests and log statements. 2016-11-22 18:48:45 -05:00
David Jay 5ab3fba818 Setting env variables properly in tests. 2016-11-22 18:45:11 -05:00
David Jay 18bfabfd43 Moving configuration setting to shared function 2016-11-22 16:02:57 -05:00
David Jay 2a19399b81 Moving configuration setting to shared function 2016-11-22 16:01:50 -05:00
David Jay e40d5312da Adding premod off reply test. 2016-11-22 15:36:52 -05:00
David Jay 3030bf4f22 Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e 2016-11-22 15:04:36 -05:00
David Jay 25c40fc212 Applying client.perform consistently. 2016-11-22 14:29:11 -05:00
David Jay 654e3580e7 Adding second test. 2016-11-22 13:49:21 -05:00
David Jay 8507a699e8 Adressing linting errors. 2016-11-21 21:24:34 -05:00
David Jay dd060c5fd1 Signing in via e2e and posting comment. 2016-11-21 21:23:48 -05:00
David Jay 1931c85d67 Merging 2016-11-21 19:23:29 -05:00
David Jay 7aa893ba9e Adding signing flow to tests. 2016-11-21 17:26:04 -05:00
David Jay 357191484d Updating tests. 2016-11-21 17:04:47 -05:00