 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
|
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 |
|
|
gaba
|
abedb36791
|
Merge branch 'master' into ban-user
|
2016-11-28 16:04:15 -08: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 |
|
|
gaba
|
1ec7435ef4
|
Merge branch 'master' into ban-user
|
2016-11-28 11:41:31 -08:00 |
|
|
Wyatt JohnsonandDan Zajdband
|
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 |
|
|
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
|
7dc7df2601
|
Merge branch 'master' into ban-user
|
2016-11-22 09:30:52 -08:00 |
|
|
gaba
|
0a8ab759b5
|
Move into setStatus and other actions when banned and unbanned.
|
2016-11-21 17:01:36 -08:00 |
|
|
David Jay
|
1931c85d67
|
Merging
|
2016-11-21 19:23:29 -05:00 |
|
|
David Jay
|
2b9caf8daf
|
Updating frontend to utilize new action delete endpoint.
|
2016-11-21 18:00:50 -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 |
|
|
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 |
|
|
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 |
|
|
Wyatt Johnson
|
7cc311bd81
|
Added wordlist, cleaned comments api
|
2016-11-21 11:18:52 -07: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 |
|
|
gaba
|
81f770fb05
|
Merge branch 'passport' into ban-user
|
2016-11-17 11:55:20 -08:00 |
|
|
Belen Curcio
|
f1320c7f04
|
Merge branch 'master' of github.com:coralproject/talk into passport
|
2016-11-17 10:54:16 -03:00 |
|
|
gaba
|
bc3f9bb0b4
|
Adds status to the user and tests on setStatus.
|
2016-11-16 12:44:34 -08:00 |
|
|
David ErwinandGitHub
|
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 |
|