Commit Graph
1837 Commits
Author SHA1 Message Date
gaba d74d2e9e87 Dispatchs the user. 2017-02-02 15:25:45 -08:00
gaba c272b88340 It returns user now. 2017-02-02 15:24:55 -08:00
Riley DavisandGitHub bb798b8b02 Merge branch 'master' into story-134624635 2017-02-02 10:05:17 -07:00
David ErwinandGitHub 03c240054a Merge pull request #284 from coralproject/stream-admin-bugfix
Fix admin user stream bug
2017-02-02 12:02:06 -05:00
David Erwin 79a2a2144c Fix admin user stream bug 2017-02-02 11:51:09 -05:00
gaba d53dc09aed Merge branch 'master' into story-134624635 2017-02-02 08:16:50 -08:00
David ErwinandGitHub ce002e366d Merge pull request #282 from coralproject/hide-pending-sometimes
Hide Pre-Mod tab sometimes
2017-02-02 10:33:00 -05:00
Belén CurcioandGitHub 7fe6002219 Merge branch 'master' into hide-pending-sometimes 2017-02-02 12:28:17 -03:00
Belén CurcioandGitHub 3273749fbb Merge pull request #269 from coralproject/design-pass-tweaks
Design pass tweaks
2017-02-02 12:21:47 -03:00
David ErwinandGitHub 22e32b1869 Merge branch 'master' into hide-pending-sometimes 2017-02-02 10:16:53 -05:00
Belén CurcioandGitHub 04669350a1 Merge branch 'master' into design-pass-tweaks 2017-02-02 12:15:23 -03:00
David ErwinandGitHub b0045fd8a6 Merge pull request #281 from coralproject/add-yarn
Add yarn + Upgrade Webpack
2017-02-02 10:14:07 -05:00
Wyatt JohnsonandGitHub bd86eef441 Merge branch 'master' into add-yarn 2017-02-02 08:02:06 -07:00
Belén CurcioandGitHub b4a03a5133 Merge branch 'master' into design-pass-tweaks 2017-02-02 07:55:41 -03:00
Gabriela Rodríguez BerónandGitHub d8ab3b8fba Merge branch 'master' into story-134624635 2017-02-01 14:03:56 -08:00
gaba 445eb97d76 Moves create displayname dialog to sign-in plugin. 2017-02-01 14:00:09 -08:00
Riley DavisandGitHub 13114e7530 Merge pull request #276 from coralproject/bugfix-asset-search
Addressing console errors in asset search.
2017-02-01 14:35:42 -07:00
gaba 4df09ffbd2 Validation for the field underneath. 2017-02-01 13:29:47 -08:00
gaba 0c360e62a6 Display errors that come from the backend. 2017-02-01 13:20:17 -08:00
gaba ee0bb50dd5 Adds errors on field when not validated. 2017-02-01 12:34:02 -08:00
Riley Davis 6e118c93aa Merged branch master into hide-pending-sometimes 2017-02-01 13:33:42 -07:00
Riley Davis 22c0ed686f rename everything to Pre-Mod from Pending. hide the pre-mod tab sometimes. 2017-02-01 13:33:29 -07:00
David JayandGitHub 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
gaba 990685f17a Merge branch 'master' into story-134624635 2017-02-01 12:11:01 -08:00
gaba a8e4ce466d Adds validation to the dialog. 2017-02-01 12:09:27 -08:00
Wyatt Johnson e4722249b6 Added node env to environment 2017-02-01 13:07:14 -07:00
Wyatt JohnsonandGitHub 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ónandGitHub 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
gaba c9b12fc5d6 Thanks git-godesses for the log on finding a bad remove when merging. 2017-02-01 10:46:32 -08:00
gaba f4d672ddcf Merge branch 'master' into story-134624635 2017-02-01 10:42:00 -08:00
Riley DavisandGitHub ec956165a3 Merge branch 'master' into bugfix-asset-search 2017-02-01 11:35:59 -07: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
Wyatt Johnson d1cf6fd19b Applied patch 2017-02-01 10:45:01 -07: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