Commit Graph

1758 Commits

Author SHA1 Message Date
David Jay 17eefeea15 Merge branch 'master' into mobile-width-fix 2017-02-01 12:16:57 -05:00
David Jay 26ce3c635d Merge pull request #274 from coralproject/emailus-veritas
Verify Email upon signup
2017-02-01 12:13:28 -05:00
David Jay 37d688f99d Merge branch 'mobile-width-fix' of github.com:coralproject/talk into mobile-width-fix 2017-02-01 12:12:14 -05:00
David Jay bc6c77176e Fixing error in styling. 2017-02-01 12:11:12 -05:00
David Jay e24b953f51 Merge branch 'master' into emailus-veritas 2017-02-01 12:06:57 -05:00
David Erwin 653e67c9c4 Merge pull request #271 from coralproject/e2e-port-fix
Switching e2e to port 3011.
2017-02-01 11:59:13 -05:00
Riley Davis f5d873ba57 use referer from headers 2017-01-31 13:45:23 -07:00
David Jay 20bdf648d7 Merge branch 'e2e-port-fix' of github.com:coralproject/talk into e2e-port-fix 2017-01-31 15:40:09 -05:00
Riley Davis 55dc229b32 Merged branch emailus-veritas into emailus-veritas 2017-01-31 13:29:34 -07:00
Riley Davis e6e8ad5ca6 close the resend email box after use. remove dead code 2017-01-31 13:29:23 -07:00
David Jay 5d185e7aca Updating port in globals. 2017-01-31 15:21:21 -05:00
Wyatt Johnson a13b1c95d6 Adjusted form 2017-01-31 12:57:09 -07:00
David Jay 4a6b09ac96 Merge branch 'master' into e2e-port-fix 2017-01-31 14:41:43 -05:00
David Jay 64d2aa7f42 Merge branch 'master' into mobile-width-fix 2017-01-31 14:41:30 -05:00
David Jay 3ca263bcfb Updating mock article template to support mobile widths. 2017-01-31 14:23:15 -05:00
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
David Jay e8d8c7af5b Switching e2e to port 3011. 2017-01-30 18:04:17 -05: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