David Erwin
|
fcd62140c6
|
Merge branch 'master' into remove-queue-folder
|
2016-11-10 13:27:25 -05:00 |
|
gaba
|
eb9e8f4713
|
Removes queue folder as we are already working on the moderation queue in comments.
|
2016-11-10 09:38:46 -08:00 |
|
David Erwin
|
e632632754
|
Merging and updating tests
|
2016-11-10 12:16:58 -05:00 |
|
David Erwin
|
a234eeb3ba
|
Add json header, update status, and lint
|
2016-11-10 10:49:55 -05:00 |
|
David Erwin
|
b6a0a99d91
|
Update method name for clarity
|
2016-11-10 10:12:47 -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 |
|
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
|
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 |
|
gaba
|
0968b02c3a
|
Moderation queue depending on moderation settings.
|
2016-11-08 15:26:05 -08:00 |
|
David Jay
|
e8584b499b
|
Returning actions, items, and comments as seperate arrays.
|
2016-11-08 15:32:52 -05:00 |
|
David Jay
|
fcd65c18fd
|
Switching stream to use action summaries function.
|
2016-11-08 15:23:04 -05: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 |
|
David Jay
|
0e1e04d2a9
|
Returning usernames.
|
2016-11-07 16:19:20 -05:00 |
|
David Jay
|
4737e84681
|
Displaying comments and replies appropriately.
|
2016-11-07 16:11:10 -05:00 |
|
gaba
|
d911e5b30d
|
Improve test.
|
2016-11-07 13:08:23 -08:00 |
|
gaba
|
03e5242dcf
|
Merge branch 'master' into comment-api-implementation
|
2016-11-07 12:22:31 -08:00 |
|
Wyatt Johnson
|
fff55e808b
|
Merge branch 'master' into asset
|
2016-11-07 12:42:30 -07:00 |
|
gaba
|
16e7a6c868
|
CHanges from query to body for post/put.
|
2016-11-07 11:34:34 -08:00 |
|
gaba
|
6f0698b950
|
More endpoints
|
2016-11-07 11:27:05 -08:00 |
|
Wyatt Johnson
|
4a9c1775f1
|
Updated linting rules + fixed test layout to standardize
|
2016-11-07 11:51:45 -07:00 |
|
David Erwin
|
c84fc24f78
|
Update based on review
|
2016-11-07 13:07:25 -05:00 |
|
Dan Zajdband
|
adb2dc2054
|
fix(coral-admin): updated queue endpoint
|
2016-11-07 12:21:27 -05:00 |
|
gaba
|
cffee1ec18
|
Merge branch 'master' of github.com:coralproject/talk into comment-api-implementation
|
2016-11-07 09:18:51 -08:00 |
|
David Erwin
|
2ff6bcf85d
|
Merging master into asset
|
2016-11-07 12:00:28 -05:00 |
|
David Erwin
|
c1359a9af9
|
Move url route into general asset search
|
2016-11-05 14:44:42 -04:00 |
|
David Erwin
|
a6b2215a4b
|
Implement asset tests
|
2016-11-05 11:14:21 -04:00 |
|
David Erwin
|
cb08f139ca
|
Swagger and linting
|
2016-11-05 08:50:34 -04:00 |
|
David Erwin
|
c80282dd91
|
Implement asset upsert and find
|
2016-11-04 22:24:06 -04:00 |
|
gaba
|
9916edc127
|
Adds implementation for get all comments
|
2016-11-04 15:10:28 -07:00 |
|
gaba
|
9be29b9346
|
Removes console log.
|
2016-11-04 14:59:25 -07:00 |
|
gaba
|
43a70ea71c
|
Add tests for stream. Move to promises the rightway.
|
2016-11-04 14:45:46 -07:00 |
|
gaba
|
3cff52d72f
|
It returns an array. Need to check the tests.
|
2016-11-04 14:32:47 -07:00 |
|
gaba
|
69980c9d7d
|
Simplify concat.
|
2016-11-04 14:24:04 -07:00 |
|
gaba
|
7f31d4b9e9
|
Merge branch 'comment-api' of github.com:coralproject/talk into comment-api
|
2016-11-04 14:16:25 -07:00 |
|
gaba
|
23ea7025ea
|
Convert from promises to array
|
2016-11-04 14:13:22 -07:00 |
|
Kim Gardner
|
b29a9a1c24
|
Merge branch 'master' into comment-api
|
2016-11-04 16:49:29 -04:00 |
|
gaba
|
ea93687f89
|
Not sure when I lost the implmenetation of this.
|
2016-11-04 13:43:03 -07:00 |
|
gaba
|
4836069fb6
|
Rmeoves console.log
|
2016-11-04 13:36:35 -07:00 |
|
gaba
|
19a7de5c98
|
Remove validations for now until we really use them.
|
2016-11-04 13:28:40 -07:00 |
|
gaba
|
8cea206dd8
|
Add chai-http for tests. Simplify route for comments
|
2016-11-04 13:21:55 -07:00 |
|
Riley Davis
|
dba1b04558
|
204 no content
|
2016-11-04 14:06:02 -06:00 |
|
gaba
|
a95bbb5fd0
|
Merge branch 'master' into comment-api
|
2016-11-04 11:01:09 -07:00 |
|
gaba
|
7c40e21879
|
Get comment
|
2016-11-04 10:51:17 -07:00 |
|
Riley Davis
|
2af57b9ab0
|
Merge branch 'master' into parse-body-send-json
|
2016-11-04 11:00:03 -06:00 |
|