Commit Graph
1772 Commits
Author SHA1 Message Date
gaba f4d672ddcf Merge branch 'master' into story-134624635 2017-02-01 10:42:00 -08:00
Gabriela Rodríguez BerónandGitHub 81ae482524 Merge pull request #279 from coralproject/graphql-hotfix
fix a bug per wyatt advice
2017-02-01 10:28:36 -08:00
riley 00297d1a1a fix a bug per wyatt advice 2017-02-01 11:22:42 -07:00
Gabriela Rodríguez BerónandGitHub f7c43a7853 Merge pull request #270 from coralproject/timeago-fix
Fixing bug where timeAgo cannot interpret dates from mongoose properly.
2017-02-01 09:57:30 -08:00
Gabriela Rodríguez BerónandGitHub e1650aa721 Merge branch 'master' into timeago-fix 2017-02-01 09:52:40 -08:00
David JayandGitHub 6a4c168882 Merge pull request #275 from coralproject/mobile-width-fix
Updating mock article template to support mobile widths.
2017-02-01 12:37:44 -05:00
David JayandGitHub 17eefeea15 Merge branch 'master' into mobile-width-fix 2017-02-01 12:16:57 -05:00
David JayandGitHub 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 JayandGitHub e24b953f51 Merge branch 'master' into emailus-veritas 2017-02-01 12:06:57 -05:00
David ErwinandGitHub 653e67c9c4 Merge pull request #271 from coralproject/e2e-port-fix
Switching e2e to port 3011.
2017-02-01 11:59:13 -05:00
gaba 097934dee5 Merge branch 'master' into story-134624635 2017-01-31 15:00:14 -08:00
gaba 282c7dc4f5 Removes duplicate func and adds tests. 2017-01-31 14:04:31 -08:00
gaba 37eae51641 Adds component to coral-framework to deal with the change of displayname. 2017-01-31 13:52:40 -08:00
gaba a377f61bdd Adds service and endpoint to change displayname. 2017-01-31 13:51:36 -08:00
gaba 80122dfdce Adds formfield to components. 2017-01-31 13:48:45 -08: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 JayandGitHub f44c1d6f0a Merge branch 'master' into timeago-fix 2017-01-31 14:41:58 -05:00
David JayandGitHub 4a6b09ac96 Merge branch 'master' into e2e-port-fix 2017-01-31 14:41:43 -05:00
David JayandGitHub 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 JohnsonandGitHub 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
David Jay 235214642e Fixing bug where timeAgo cannot interpret dates from mongoose properly. 2017-01-30 17:55:06 -05:00
Wyatt JohnsonandGitHub b75557912f Merge pull request #268 from coralproject/graph-pagination
Graph Pagination
2017-01-30 14:43:44 -07:00
Belén CurcioandGitHub 887fe08819 Merge branch 'master' into graph-pagination 2017-01-30 17:12:23 -03:00
gaba e803593fc7 Move stuff around. 2017-01-30 11:34:04 -08:00
David ErwinandGitHub 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 JayandGitHub f09d9d0a8b Merge branch 'master' into e2e-env-fix 2017-01-27 14:10:59 -05:00