 Riley Davis
|
ec1dfefc5d
|
lint
|
2017-01-31 12:15:33 -07:00 |
|
|
Riley Davis
|
3d83c246f7
|
simplify email text
|
2017-01-31 12:08:59 -07:00 |
|
|
Riley Davis
|
e63e1f3428
|
Merge branch 'master'
Conflicts:
errors.js
test/routes/api/auth/index.js
|
2017-01-31 12:05:16 -07:00 |
|
|
Riley Davis
|
56ddc49386
|
resend verify email
|
2017-01-31 12:04:19 -07:00 |
|
|
Wyatt Johnson
|
d72b661c93
|
Merge pull request #272 from coralproject/fix-252
CLI + Init fixes
v0.0.3
|
2017-01-31 10:47:02 -07:00 |
|
|
Wyatt Johnson
|
0af41a5b6b
|
Updated circle test
|
2017-01-30 18:41:23 -07:00 |
|
|
Wyatt Johnson
|
864413b5d6
|
Fixed issues with e2e
|
2017-01-30 18:38:06 -07:00 |
|
|
Wyatt Johnson
|
91cd2e9e86
|
Fixes #266
|
2017-01-30 18:21:36 -07:00 |
|
|
Wyatt Johnson
|
e6ef4b615f
|
Changed prompt lib, updated cli's
- fixes #252
|
2017-01-30 17:46:09 -07:00 |
|
|
Riley Davis
|
976c821715
|
move FormField to coral-ui
|
2017-01-30 16:00:24 -07:00 |
|
|
Wyatt Johnson
|
b75557912f
|
Merge pull request #268 from coralproject/graph-pagination
Graph Pagination
|
2017-01-30 14:43:44 -07:00 |
|
|
Belén Curcio
|
887fe08819
|
Merge branch 'master' into graph-pagination
|
2017-01-30 17:12:23 -03:00 |
|
|
David Erwin
|
1070dfd5ae
|
Merge pull request #249 from coralproject/e2e-env-fix
E2E environment fix
|
2017-01-30 12:14:50 -05:00 |
|
|
Wyatt Johnson
|
04cd7312a6
|
Added support for new commentCount
|
2017-01-27 15:52:05 -07:00 |
|
|
David Jay
|
b674ff45c0
|
Addressing errors with replies in e2e.
|
2017-01-27 17:29:23 -05:00 |
|
|
Riley Davis
|
5e521b832c
|
add a confirm-email landing page
|
2017-01-27 15:04:42 -07:00 |
|
|
David Jay
|
1da61784b4
|
Fixing bugs around settings in e2e.
|
2017-01-27 16:10:47 -05:00 |
|
|
David Jay
|
f0bb9db892
|
Merge branch 'e2e-env-fix' of github.com:coralproject/talk into e2e-env-fix
|
2017-01-27 15:21:47 -05:00 |
|
|
David Jay
|
9d15a0448a
|
Adding settings init to pree2e script.
|
2017-01-27 15:21:18 -05:00 |
|
|
David Jay
|
f09d9d0a8b
|
Merge branch 'master' into e2e-env-fix
|
2017-01-27 14:10:59 -05:00 |
|
|
David Jay
|
801d18639b
|
Merge branch 'e2e-env-fix' of github.com:coralproject/talk into e2e-env-fix
|
2017-01-27 14:09:29 -05:00 |
|
|
David Jay
|
fcf22ef4f9
|
Adding selenium settings and fixing bug in moderation approval.
|
2017-01-27 14:07:34 -05:00 |
|
|
Wyatt Johnson
|
2e6c7f7b09
|
First pass at pagination
|
2017-01-27 12:05:19 -07:00 |
|
|
Wyatt Johnson
|
d829d2541f
|
Added new env var for e2e reports
|
2017-01-27 11:20:45 -07:00 |
|
|
Wyatt Johnson
|
ebc928c6f2
|
Merge pull request #267 from coralproject/lodash-dep
Lodash Import
|
2017-01-27 11:03:59 -07:00 |
|
|
Belen Curcio
|
55a8b4984a
|
only importing isEqual
|
2017-01-27 14:58:36 -03:00 |
|
|
David Erwin
|
087b1a7bd7
|
Merge pull request #264 from coralproject/postmod-default
Update default setting to POST moderation
|
2017-01-27 11:16:36 -05:00 |
|
|
Wyatt Johnson
|
0096de6e79
|
Merge branch 'master' into postmod-default
|
2017-01-27 09:11:51 -07:00 |
|
|
Kim Gardner
|
88d718e7c9
|
Merge pull request #265 from coralproject/remove-avatar
Remove avatar from user cards
|
2017-01-27 10:32:12 -05:00 |
|
|
David Erwin
|
c8c160a551
|
Remove avatar from user cards
|
2017-01-27 10:16:09 -05:00 |
|
|
Wyatt Johnson
|
5d1fd61425
|
Merge branch 'master' into e2e-env-fix
|
2017-01-27 08:04:34 -07:00 |
|
|
Wyatt Johnson
|
9fbde9c023
|
Update init.js
|
2017-01-27 08:04:00 -07:00 |
|
|
David Erwin
|
744fce4563
|
Set settings model as well
|
2017-01-27 10:01:58 -05:00 |
|
|
David Erwin
|
c071484357
|
Removing test artifiacts
|
2017-01-27 09:48:41 -05:00 |
|
|
David Erwin
|
0a80205095
|
Update default setting to POST moderation
|
2017-01-27 09:45:35 -05:00 |
|
|
David Erwin
|
fbc5a6660a
|
Merge pull request #263 from coralproject/moderate-bio
Marking correct user as "Pending" on user flags.
|
2017-01-27 09:25:02 -05:00 |
|
|
Wyatt Johnson
|
71647d5233
|
Merge branch 'master' into e2e-env-fix
|
2017-01-26 16:47:52 -07:00 |
|
|
David Jay
|
e7587d9a41
|
Merge branch 'master' into moderate-bio
|
2017-01-26 17:46:20 -05:00 |
|
|
David Jay
|
02ece80227
|
Marking correct user as Pending on user flags.
|
2017-01-26 17:42:45 -05:00 |
|
|
David Erwin
|
74d78b76a5
|
Merge pull request #219 from coralproject/moderate-bio
Moderate bio or username
|
2017-01-26 17:09:44 -05:00 |
|
|
David Jay
|
d4c9bdb6fd
|
Merge branch 'e2e-env-fix' of github.com:coralproject/talk into e2e-env-fix
|
2017-01-26 16:52:12 -05:00 |
|
|
David Jay
|
b8ff2b6763
|
Resetting chrome version to 2.25 in nightwatch.
|
2017-01-26 16:51:03 -05:00 |
|
|
Wyatt Johnson
|
fa985acd14
|
Update circle.yml
|
2017-01-26 14:45:02 -07:00 |
|
|
David Jay
|
f06edec6a2
|
Merge branch 'master' of github.com:coralproject/talk into moderate-bio
|
2017-01-26 16:38:43 -05:00 |
|
|
David Jay
|
b6d8a90084
|
Updating style of UserActions and moving ActionButton to its own component.
|
2017-01-26 16:36:43 -05:00 |
|
|
David Erwin
|
3d08d1f54f
|
Merge branch 'master' into e2e-env-fix
|
2017-01-26 16:30:14 -05:00 |
|
|
David Erwin
|
b35336d1ed
|
Merge pull request #260 from coralproject/hide-premod-links
Hiding premod links
|
2017-01-26 16:28:48 -05:00 |
|
|
David Erwin
|
f42b8f324a
|
Merge branch 'master' into hide-premod-links
|
2017-01-26 16:24:06 -05:00 |
|
|
David Erwin
|
30583cd93f
|
Merge pull request #261 from coralproject/collapse-replies
Collapse replies
|
2017-01-26 16:21:07 -05:00 |
|
|
David Erwin
|
2086bd7b72
|
Merge branch 'master' into collapse-replies
|
2017-01-26 16:17:23 -05:00 |
|