Gabriela Rodríguez Berón
53a403cddb
Merge branch 'master' into preserve-comment-view-state
2017-01-13 14:29:50 -08:00
Gabriela Rodríguez Berón
1accc54238
Merge branch 'master' into unique-username
2017-01-13 14:21:42 -08:00
Wyatt Johnson
05c055c3d2
Merge branch 'master' into preserve-comment-view-state
2017-01-13 15:20:49 -07:00
Wyatt Johnson
c90230c115
Adjusted stream to preserve comment view state
2017-01-12 17:55:08 -07:00
Riley Davis
ad0f530fd3
don't return unpublished comments in My Comments section. add tests
2017-01-12 17:07:35 -07:00
Gabriela Rodríguez Berón
1cc048d46e
Merge branch 'master' into unique-username
2017-01-12 14:53:13 -08:00
Riley Davis
0eefd3364b
update tests
2017-01-12 15:25:36 -07:00
gaba
873ec09f62
Merge branch 'master' into unique-username
2017-01-12 08:46:51 -08:00
David Jay
09e3889793
Updating action type from to for consistency.
2017-01-11 15:42:56 -05:00
riley
7bc848b801
make tests pass
2017-01-09 10:47:28 -07:00
gaba
976f0762b3
Password lenght of 8.
2017-01-06 17:42:42 -03:00
gaba
4dbc73f9ab
Add a test on already used display name.
2017-01-06 16:57:25 -03:00
Riley Davis
6a61f47ddf
Merged branch master into bad-words
2017-01-06 12:45:41 -07:00
Riley Davis
72cd78da8c
use wordlist service
2017-01-06 12:35:08 -07:00
Wyatt Johnson
be72ebf2a1
Added tests + model implementation.
2017-01-05 17:01:41 -07:00
Wyatt Johnson
298e1e8d73
Updates to user cli + e2e + tests
...
- Updates to before + beforeEach for mongooose
- Removed reference to dotenv from cli in e2e, should use
NODE_ENV=test instead.
- Changed test port from 30?? to 3000 to be consistent with what
nightwatch was expecting
2017-01-04 10:16:51 -07:00
Wyatt Johnson
55bd600d96
Removed public function in favor of filterForUser transformer
2016-12-13 16:14:49 -07:00
Wyatt Johnson
ce17fa8773
Updated tests, fixes #166
2016-12-13 15:15:08 -07:00
David Jay
cb1d12f757
Preventing backend from sending banned words to frontend.
2016-12-13 14:09:50 -05:00
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