Commit Graph

98 Commits

Author SHA1 Message Date
Wyatt Johnson 3448752f6f Added asset settings + improved tests for routes 2016-11-28 17:13:11 -07:00
Wyatt Johnson ab46c020d9 Added asset searching 2016-11-28 15:01:13 -07: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 1931c85d67 Merging 2016-11-21 19:23:29 -05:00
David Jay 357191484d Updating tests. 2016-11-21 17:04:47 -05:00
David Jay 9afc9640ee Merge branch 'user-integration' of https://github.com/coralproject/talk into notification-room 2016-11-21 16:26:22 -05:00
David Jay 29bf5b9990 Adding author info to comments and author name display. 2016-11-18 14:22:21 -05:00
David Jay 7a6dfbcb4a Returning public user info. 2016-11-18 14:13:42 -05:00
Wyatt Johnson 88f963b564 Removed unneeded lines in test 2016-11-18 10:18:44 -07:00
David Jay 95cd83c09e Merge branch 'master' of https://github.com/coralproject/talk into notification-room 2016-11-18 11:55:47 -05:00
David Jay 2e6700e490 Addressing but where flag increases like count. 2016-11-18 11:50:12 -05:00
Belen Curcio f1320c7f04 Merge branch 'master' of github.com:coralproject/talk into passport 2016-11-17 10:54:16 -03:00
David Erwin e6ff70784d Merge branch 'master' into site-wide-comments 2016-11-16 10:48:28 -05:00
David Erwin b55d3768ff Merge master into site-wide-comments 2016-11-16 10:43:35 -05:00
gaba 4137758bfd Merge branch 'master' into comment-box 2016-11-15 15:21:08 -08:00
gaba 08d672ed46 Changes model and add admin. 2016-11-15 10:11:37 -08: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 688fbd0bf6 Sending asset_url to backend and retreiving stream with asset. 2016-11-14 16:40:04 -05:00
David Jay 1a7b716820 Updating stream endpoint to expect asset_url and to return asset. 2016-11-14 15:51:17 -05:00
David Jay 6fa40c3f9b Adding model tests for assets. 2016-11-14 15:11:25 -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 b629cf359f Removing likes and flags on second click. 2016-11-11 19:07:15 -05:00
Belen Curcio 103acd4bce Continue with Facebook Funtionalit 2016-11-11 20:18:22 -03:00
Belen Curcio c72e504af8 Merge branch 'master' of github.com:coralproject/talk into passport 2016-11-11 19:43:49 -03: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
Belen Curcio 799c460186 Merge branch 'master' of github.com:coralproject/talk into passport 2016-11-11 16:49:28 -03:00
Wyatt Johnson 6c13e1c1c9 Added fallback for secret during testing 2016-11-10 17:22:14 -07:00
Wyatt Johnson 6867760099 Initial pass at adding middleware for users 2016-11-10 17:14:33 -07: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 d9dc198d46 Moved chained funcitons to multiple lines 2016-11-10 14:52:05 -05:00
David Erwin e632632754 Merging and updating tests 2016-11-10 12:16:58 -05:00
David Erwin 822f586888 Merge master and lint 2016-11-10 11:37:14 -05:00
David Erwin b6a0a99d91 Update method name for clarity 2016-11-10 10:12:47 -05:00
David Erwin 923edc7828 Merge branch 'master' into queue 2016-11-10 10:07:07 -05:00
David Jay 53001eafa3 Fixing linting error. 2016-11-09 22:44:43 -05:00
David Jay b50c22a414 Merge branch 'master' of https://github.com/coralproject/talk into reader-flags 2016-11-09 22:44:12 -05:00
Wyatt Johnson 27896b8e42 Fixed tests for new users model 2016-11-09 16:33:19 -07:00
Wyatt Johnson 42a7eee1a2 Merge branch 'master' into auth 2016-11-09 16:28:39 -07:00
Wyatt Johnson c203bf16eb Improved tests and fixed them for new users model 2016-11-09 16:26:23 -07:00
gaba 49ea01049f Merge branch 'master' into update-settings-in-ui 2016-11-09 13:57:19 -08:00
gaba d7ea18cba9 Fix linting problems. Remove comment of code. Add package. 2016-11-09 13:52:47 -08:00
David Jay 6ab561b91b Updating and passing coral-framework tests 2016-11-09 16:39:54 -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 9ff2613ab4 Comment stream with new and approved when post-moderated. 2016-11-09 11:40:57 -08:00
David Jay e0e80aa5cd Moving coral-framework tests over and updating mocha to transpile them. 2016-11-09 14:10:01 -05:00
David Jay 07db6b3f9c Merge branch 'master' of https://github.com/coralproject/talk into reader-flags 2016-11-09 13:22:45 -05:00
gaba ab68b81f21 Add tests to stream on moderated comments. 2016-11-09 09:33:15 -08:00