 Belén Curcio
|
3273749fbb
|
Merge pull request #269 from coralproject/design-pass-tweaks
Design pass tweaks
|
2017-02-02 12:21:47 -03:00 |
|
|
Belén Curcio
|
04669350a1
|
Merge branch 'master' into design-pass-tweaks
|
2017-02-02 12:15:23 -03:00 |
|
|
David Erwin
|
b0045fd8a6
|
Merge pull request #281 from coralproject/add-yarn
Add yarn + Upgrade Webpack
|
2017-02-02 10:14:07 -05:00 |
|
|
Wyatt Johnson
|
bd86eef441
|
Merge branch 'master' into add-yarn
|
2017-02-02 08:02:06 -07:00 |
|
|
Belén Curcio
|
b4a03a5133
|
Merge branch 'master' into design-pass-tweaks
|
2017-02-02 07:55:41 -03:00 |
|
|
Riley Davis
|
13114e7530
|
Merge pull request #276 from coralproject/bugfix-asset-search
Addressing console errors in asset search.
|
2017-02-01 14:35:42 -07:00 |
|
|
David Jay
|
265860bccb
|
Merge branch 'master' into bugfix-asset-search
|
2017-02-01 15:16:36 -05:00 |
|
|
Wyatt Johnson
|
064ccfbbb3
|
Added build step for static assets
|
2017-02-01 13:12:40 -07:00 |
|
|
Wyatt Johnson
|
e4722249b6
|
Added node env to environment
|
2017-02-01 13:07:14 -07:00 |
|
|
Wyatt Johnson
|
3a87bdc282
|
Merge branch 'master' into add-yarn
|
2017-02-01 12:56:52 -07:00 |
|
|
Wyatt Johnson
|
7beb28e077
|
Updated documentation
|
2017-02-01 12:54:15 -07:00 |
|
|
Wyatt Johnson
|
6b582fdb2c
|
Updated docker + build
|
2017-02-01 12:54:04 -07:00 |
|
|
Gabriela Rodríguez Berón
|
f45429f510
|
Merge pull request #280 from coralproject/display-name-fix
Allowing uppercase letters in the display name.
|
2017-02-01 11:46:38 -08:00 |
|
|
riley
|
4a9c996cba
|
enforce uniqueness case-independent
|
2017-02-01 12:39:16 -07:00 |
|
|
Wyatt Johnson
|
f4177f318f
|
Upgraded webpack
|
2017-02-01 12:34:17 -07:00 |
|
|
Wyatt Johnson
|
723dee3394
|
Added yarn.lock back
|
2017-02-01 12:33:50 -07:00 |
|
|
gaba
|
3d301b7e70
|
Allowing uppercase letters in the display name.
|
2017-02-01 10:51:33 -08:00 |
|
|
Riley Davis
|
ec956165a3
|
Merge branch 'master' into bugfix-asset-search
|
2017-02-01 11:35:59 -07:00 |
|
|
Gabriela Rodríguez Berón
|
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ón
|
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ón
|
e1650aa721
|
Merge branch 'master' into timeago-fix
|
2017-02-01 09:52:40 -08:00 |
|
|
Wyatt Johnson
|
d1cf6fd19b
|
Applied patch
|
2017-02-01 10:45:01 -07:00 |
|
|
David Jay
|
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 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
|
f44c1d6f0a
|
Merge branch 'master' into timeago-fix
|
2017-01-31 14:41:58 -05: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
|
ae3b8a6474
|
Merge branch 'master' into bugfix-asset-search
|
2017-01-31 14:41:22 -05:00 |
|
|
David Jay
|
7babb14bab
|
Addressing bug in asset search.
|
2017-01-31 14:37:52 -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 |
|