 gaba
|
1eb204f822
|
Merge branch 'master' into ban-user
|
2016-12-08 13:28:12 -10:00 |
|
|
Riley Davis
|
500dafbafa
|
riley being anal
|
2016-12-08 12:51:45 -10:00 |
|
|
Wyatt Johnson
|
3d35183e67
|
Add payload filtering and status_history updates
|
2016-12-08 15:56:52 -05:00 |
|
|
gaba
|
23c67b4a49
|
It fix the status change after merging master in.
|
2016-12-07 16:37:11 -10: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 |
|
|
gaba
|
eb916099bd
|
Merge
|
2016-12-02 16:52:16 -08:00 |
|
|
David Jay
|
8dad90104d
|
Returning infobox data in stream.
|
2016-12-02 12:26:31 -05:00 |
|
|
gaba
|
15eb946f00
|
Trying to get the Dialog up.
|
2016-12-01 13:05:10 -08:00 |
|
|
gaba
|
27eb341fa8
|
Fix users and comments as a merge was weird before.
|
2016-11-29 10:56:44 -08:00 |
|
|
gaba
|
a375bf638a
|
Merge branch 'master' into ban-user
|
2016-11-29 10:42:46 -08:00 |
|
|
Wyatt Johnson
|
3448752f6f
|
Added asset settings + improved tests for routes
|
2016-11-28 17:13:11 -07:00 |
|
|
gaba
|
1ec7435ef4
|
Merge branch 'master' into ban-user
|
2016-11-28 11:41:31 -08: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
|
325162cb3e
|
Added authorization pieces + test functions
|
2016-11-22 17:15:14 -07:00 |
|
|
gaba
|
822e13914a
|
Fix changeStatus
|
2016-11-22 14:52:43 -08:00 |
|
|
gaba
|
f7c4e8bf24
|
Merge branch 'master' into ban-user
|
2016-11-22 09:35:06 -08:00 |
|
|
gaba
|
0a8ab759b5
|
Move into setStatus and other actions when banned and unbanned.
|
2016-11-21 17:01:36 -08: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 |
|
|
gaba
|
8355f441e3
|
When banning without commentid.
|
2016-11-21 12:42:14 -08:00 |
|
|
gaba
|
3337e95a6c
|
Move the change status of the user to a ban the user func.
|
2016-11-21 12:18:19 -08: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
|
2e6700e490
|
Addressing but where flag increases like count.
|
2016-11-18 11:50:12 -05:00 |
|
|
gaba
|
bc3f9bb0b4
|
Adds status to the user and tests on setStatus.
|
2016-11-16 12:44:34 -08: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
|
6fa40c3f9b
|
Adding model tests for assets.
|
2016-11-14 15:11:25 -05:00 |
|
|
David Jay
|
4bea5e5914
|
Adding route to delete actions.
|
2016-11-11 17:06:29 -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
|
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 |
|
|
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 |
|
|
gaba
|
ab68b81f21
|
Add tests to stream on moderated comments.
|
2016-11-09 09:33:15 -08:00 |
|
|
gaba
|
b5769f429c
|
One test to do.
|
2016-11-08 16:01:57 -08:00 |
|
|
gaba
|
b19f936e64
|
Adds tests
|
2016-11-08 15:59:35 -08:00 |
|
|
gaba
|
0968b02c3a
|
Moderation queue depending on moderation settings.
|
2016-11-08 15:26:05 -08:00 |
|
|
David Jay
|
d7ead01180
|
Expecting stream endpoint to return items broken out by type.
|
2016-11-08 17:53:38 -05:00 |
|
|
David Jay
|
eb00e63a41
|
Adding action summaries function to actions model.
|
2016-11-08 15:21:52 -05:00 |
|
|
Riley Davis
|
601d36f2df
|
whoops missed some semicolons
|
2016-11-07 12:54:04 -07:00 |
|