7fe6002219
Merge branch 'master' into hide-pending-sometimes
2017-02-02 12:28:17 -03:00
b4a03a5133
Merge branch 'master' into design-pass-tweaks
2017-02-02 07:55:41 -03:00
22c0ed686f
rename everything to Pre-Mod from Pending. hide the pre-mod tab sometimes.
2017-02-01 13:33:29 -07:00
e24b953f51
Merge branch 'master' into emailus-veritas
2017-02-01 12:06:57 -05:00
20bdf648d7
Merge branch 'e2e-port-fix' of github.com:coralproject/talk into e2e-port-fix
2017-01-31 15:40:09 -05:00
5d185e7aca
Updating port in globals.
2017-01-31 15:21:21 -05:00
e63e1f3428
Merge branch 'master'
...
Conflicts:
errors.js
test/routes/api/auth/index.js
2017-01-31 12:05:16 -07:00
56ddc49386
resend verify email
2017-01-31 12:04:19 -07:00
91cd2e9e86
Fixes #266
2017-01-30 18:21:36 -07:00
f5dc5ed8b7
Test updated
2017-01-30 15:53:29 -03:00
b674ff45c0
Addressing errors with replies in e2e.
2017-01-27 17:29:23 -05:00
1da61784b4
Fixing bugs around settings in e2e.
2017-01-27 16:10:47 -05:00
71647d5233
Merge branch 'master' into e2e-env-fix
2017-01-26 16:47:52 -07:00
f06edec6a2
Merge branch 'master' of github.com:coralproject/talk into moderate-bio
2017-01-26 16:38:43 -05:00
3d08d1f54f
Merge branch 'master' into e2e-env-fix
2017-01-26 16:30:14 -05:00
2e34f726eb
Updating tests to reflect graphql changes.
2017-01-26 14:41:03 -05:00
aa83aea849
Merge branch 'master' of github.com:coralproject/talk into e2e-env-fix
2017-01-25 17:17:04 -05:00
31abe57cb2
Merge branch 'master' of github.com:coralproject/talk into moderate-bio
...
Integrating graphql, updating tests, and preserving transition to ModerationList from CommentList.
2017-01-25 17:15:12 -05:00
b3eb3e3c43
Updated tests for Comment History
2017-01-25 11:44:51 -03:00
14483a39a0
Tests passing, removing legacy items
2017-01-25 08:38:03 -03:00
c1d3cdce77
deprecating items
2017-01-25 08:11:52 -03:00
b0acdff34d
Merge branch 'graphql' of github.com:coralproject/talk into graphql
2017-01-24 16:23:27 -05:00
ce73118f53
Loading history links in parent page.
2017-01-24 16:04:03 -05:00
0a5a23c1f3
Added fixes for tests on CI
2017-01-24 13:45:06 -07:00
cda768d694
Fixer pre/post
2017-01-24 13:10:35 -07:00
6e9757ae91
Updating tests to use capitalized admin.
2017-01-24 14:27:50 -05:00
a7e9c0c776
Const, service, and model updates
...
- Updated enum values to be uppercase
- Updated services to expose service models
- Updated models to only export the mongoose model
- Moved all mongoose static methods over to new services
- Updated tests to refelct new setup
BREAKING
- Status that were uppercased (caps) have caused issues with the
admin pages
2017-01-24 12:10:32 -07:00
6563f29ccf
Moved tests -> test because mocha likes that
2017-01-20 17:28:08 -07:00
Belén Curcio