 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 |
|
|
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
|
2f7f0249b2
|
Added status changing + history
- Status's for comments is now an array of objects
|
2016-12-05 11:28:27 -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
|
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
|
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 |
|
|
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 |
|
|
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 |
|
|
Belen Curcio
|
f1320c7f04
|
Merge branch 'master' of github.com:coralproject/talk into passport
|
2016-11-17 10:54:16 -03: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 |
|
|
Belen Curcio
|
c72e504af8
|
Merge branch 'master' of github.com:coralproject/talk into passport
|
2016-11-11 19:43:49 -03: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 |
|
|
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
|
9ff2613ab4
|
Comment stream with new and approved when post-moderated.
|
2016-11-09 11:40:57 -08:00 |
|
|
gaba
|
ab68b81f21
|
Add tests to stream on moderated comments.
|
2016-11-09 09:33:15 -08:00 |
|
|
gaba
|
0968b02c3a
|
Moderation queue depending on moderation settings.
|
2016-11-08 15:26:05 -08:00 |
|
|
gaba
|
ed01d54418
|
It fixes random test on get comment by comment_id.
|
2016-11-08 10:26:35 -08:00 |
|
|
David Erwin
|
2807b2d5b2
|
Merge master into nod-queue
|
2016-11-08 13:05:31 -05:00 |
|
|
riley
|
095f6a319e
|
remove the 2 requests in settings tests. add Promises
|
2016-11-08 10:38:49 -07:00 |
|
|
Riley Davis
|
b10ae913ab
|
fix a race condition in the tests
|
2016-11-08 10:07:41 -07:00 |
|
|
gaba
|
588a8de489
|
MOve two lines into one.
|
2016-11-07 18:16:04 -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
|
626687f05b
|
Adds moderations queues.
|
2016-11-07 14:18:43 -08:00 |
|
|
gaba
|
8154133fe2
|
Improve test to remove comment.
|
2016-11-07 13:11:43 -08:00 |
|
|
gaba
|
d911e5b30d
|
Improve test.
|
2016-11-07 13:08:23 -08:00 |
|
|
Riley Davis
|
f819b087ac
|
Merge branch 'master' into comment-api-implementation
|
2016-11-07 13:34:58 -07:00 |
|
|
gaba
|
9e70b86687
|
Fix tests.
|
2016-11-07 12:29:07 -08:00 |
|
|
gaba
|
03e5242dcf
|
Merge branch 'master' into comment-api-implementation
|
2016-11-07 12:22:31 -08:00 |
|