Commit Graph
8775 Commits
Author SHA1 Message Date
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
Belen Curcio 7866d1f8cd Done Wizard mEnu 2017-02-01 15:17:15 -03: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 Jay 37975574ea Switching rejected usernames from suspended to banned. 2017-02-01 12:26:01 -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
David Jay 6c01a37f6a Removing user bio. 2017-02-01 11:48:16 -05:00
Belen Curcio caa04de09d linting and proptypes 2017-02-01 12:12:28 -03:00
Belen Curcio 12070309d6 Wizard Nav 2017-02-01 12:11:15 -03:00
Belen Curcio 6a4315d608 Working Install Wizard 2017-02-01 10:49:16 -03:00
Belen Curcio 6c318b0502 Merge branch 'master' of github.com:coralproject/talk into install-admin 2017-02-01 09:57:02 -03: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