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
gaba
536a2165cc
Merge branch 'master' into unique-username
2017-01-12 14:47:45 -08:00
Riley Davis
5136fce4a3
Merge branch 'master' into pending-queue-routes
2017-01-12 15:34:13 -07:00
Riley Davis
0eefd3364b
update tests
2017-01-12 15:25:36 -07:00
Wyatt Johnson
6e89734e12
Moved errors to errors.js, std error msgs/types
2017-01-12 14:08:52 -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
Wyatt Johnson
8519d07c67
Cleaned user auth response
2017-01-10 12:00:06 -07:00
Wyatt Johnson
7283feab6b
Merge branch 'master' into bad-words
2017-01-09 16:44:19 -07:00
Wyatt Johnson
ec3a114e65
Added missing endpoint + fix for mailer
2017-01-09 15:50:46 -07: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
Riley Davis
bba597f086
even more lint
2017-01-06 13:28:48 -07:00
Riley Davis
01db900c40
move defined errors into top-level errors.js file
2017-01-06 13:00:22 -07: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
4eb7c72ae2
Merge branch 'master' into email-confirm
2017-01-05 18:45:06 -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
a7680ae5d9
Initial pass at email confirmation
2017-01-03 17:35:58 -07:00
gaba
0fd6f4b44e
Working on the tests & sending CSRF
2017-01-03 18:01:21 -03:00
gaba
e2a032d4a5
Merge branch 'master' into csrf
2017-01-03 16:25:05 -03:00
gaba
5c6df6d481
Fix tests when flagging because suspect word.
2017-01-03 09:37:02 -03:00
gaba
8e5e75ed6f
It works for user signin/signup and posting comments.
2016-12-23 14:57:39 -08:00
gaba
ec3e9d1cd4
Merge branch 'master' into csrf
2016-12-22 14:23:01 -08:00
Riley Davis
9d1d109ec0
Merge branch 'master'
...
Conflicts:
client/coral-admin/src/reducers/index.js
2016-12-22 12:28:55 -07:00
Riley Davis
c6170f558a
Merge branch 'master' into add-flag-option
2016-12-22 10:38:34 -07:00
Riley Davis
b8b47e9c2c
normalize constant names
2016-12-21 16:56:29 -07:00
Wyatt Johnson
6db2361edb
Adjusted middleware
2016-12-21 16:19:19 -07:00
Wyatt Johnson
8233937f7a
Moved wordlist loading into the middleware
2016-12-21 15:55:40 -07:00
David Jay
c867ae8eeb
Removing Next and Prev from pager and updating tests.
2016-12-21 12:11:42 -08:00
gaba
29250f2bbc
Fixed unpromised rejection in test.
2016-12-20 18:01:28 -08:00
gaba
9c9597ae8c
Persist the session in tests through chai agent.
2016-12-20 17:52:55 -08:00
David Jay
a490aaeaf0
Merge branch 'master' of github.com:coralproject/talk into admin-asset-list
2016-12-20 17:02:24 -08:00
Riley Davis
652a41971b
Merge branch 'master'
...
Conflicts:
client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
2016-12-20 14:51:36 -07:00
gaba
16a4daaeb3
Merge branch 'master' into csrf
2016-12-20 13:46:08 -08:00
gaba
e16bc8f7ad
Adds agent to persist session in tests.
2016-12-20 12:18:30 -08:00
David Jay
a3eb4f5c76
Merge branch 'add-flag-option' of github.com:coralproject/talk into add-flag-option
2016-12-20 11:31:57 -08:00
gaba
f49ca9f89a
PAss the token around.
2016-12-19 18:11:11 -08:00
David Jay
be3d506459
Moving action metadata to nested object.
2016-12-19 20:10:42 -05:00
David Jay
4d508f6afa
Merge branch 'master' of github.com:coralproject/talk into admin-asset-list
2016-12-19 13:41:43 -05:00
Belen Curcio
374de3cd27
Replacing export default by module.exports
2016-12-19 14:34:26 -03:00
Riley Davis
d65f786dcd
Merge branch 'master'
...
Conflicts:
routes/api/comments/index.js
2016-12-19 10:28:54 -07:00
Belen Curcio
29ee652ac8
ready to push changes
2016-12-19 13:12:20 -03:00