Commit Graph

3586 Commits

Author SHA1 Message Date
gaba d08a9fb7b2 Front End for Domain Whitelist. 2017-02-07 13:07:22 -08:00
Belen Curcio fd40135f1b Merge branch 'master' of github.com:coralproject/talk into install-admin 2017-02-07 17:46:45 -03:00
Belen Curcio a3e1bd972c Redirect if its initialized, funtionallity of finalStep 2017-02-07 17:44:27 -03:00
Belen Curcio f8d83ffbde Rest of the embed side config 2017-02-07 16:15:53 -03:00
Belen Curcio 3fc7fbd01e Ádmin running on Apollo 2017-02-07 16:06:32 -03:00
David Erwin f188df162c Merge pull request #294 from coralproject/wrong-error-proptype
fix a warning in the console when you're signed out
2017-02-07 13:02:18 -05:00
David Erwin fcd431dc21 Merge branch 'master' into wrong-error-proptype 2017-02-07 12:51:20 -05:00
Riley Davis ca2c55f643 Merge pull request #292 from coralproject/bugfix-tiny-mobile-fonts
Fixing mobile viewport width.
2017-02-07 10:50:30 -07:00
Riley Davis 9d3960fd7b fix a warning in the console when you're signed out 2017-02-07 10:37:38 -07:00
Wyatt Johnson 5cdfc7bd1b Merge branch 'master' into install-admin 2017-02-07 10:05:31 -07:00
Riley Davis cd3d08c6f9 Merge branch 'master' into bugfix-tiny-mobile-fonts 2017-02-07 10:05:20 -07:00
Wyatt Johnson cdc81c4fc5 Added new setup endpoint 2017-02-07 10:02:23 -07:00
Wyatt Johnson f47638ae07 Removed provisioning text. 2017-02-07 09:45:43 -07:00
Belen Curcio c837e89b38 wip 2017-02-07 13:43:17 -03:00
Belen Curcio 526f0145f1 if goTo is not defined 2017-02-07 02:06:32 -03:00
Kim Gardner ba450a0166 Merge pull request #283 from coralproject/username-ban
Username banning flow
2017-02-06 23:04:43 -05:00
Belen Curcio 0b9956a842 Merge branch 'master' of github.com:coralproject/talk into install-admin 2017-02-07 00:16:51 -03:00
Belen Curcio e239926866 Failure check 2017-02-07 00:07:53 -03:00
David Jay 586537084b Merge branch 'master' into bugfix-tiny-mobile-fonts 2017-02-06 18:29:34 -08:00
Belen Curcio 3a953c7efe First Step 2017-02-06 23:23:08 -03:00
Belen Curcio 77f090fd3c Multiple validations 2017-02-06 23:18:14 -03:00
David Jay 652170735b Merge branch 'master' into username-ban 2017-02-06 18:14:13 -08:00
Belen Curcio 16f93a0a19 Validaiton 2017-02-06 22:41:21 -03:00
Kim Gardner f19e0134db Merge pull request #286 from coralproject/more-email-verify
Cleanup on email verification
2017-02-06 20:26:07 -05:00
David Jay ecb72b036d Fixing mobile viewport width. 2017-02-06 16:49:31 -08:00
David Jay 80ea100fc5 Making username update services atomic. 2017-02-06 15:49:48 -08:00
Riley Davis 8c8a8eb3b8 define more propTypes. add a second button so tests work 2017-02-06 16:23:00 -07:00
gaba d93dfe55af Merge branch 'master' into story-138524853-domain-whitelist 2017-02-06 14:53:46 -08:00
David Jay b22895b908 Switching displayname update to account endpoint. 2017-02-06 14:38:14 -08:00
Riley Davis fe6d6f611d pause suddenly not a function? 2017-02-06 14:59:23 -07:00
Riley Davis 93ee5bfc4a just throwing stuff at the wall to see what sticks 2017-02-06 14:42:40 -07:00
Riley Davis 3a145e9927 add a pause to see if anything changes 2017-02-06 14:22:37 -07:00
gaba 8d4f87a95d Domain List. 2017-02-06 13:11:39 -08:00
Riley Davis 36ba9bd615 Merge branch 'master' into more-email-verify 2017-02-06 13:39:34 -07:00
Wyatt Johnson 7bef103217 Added new recentComments, recentReplies 2017-02-06 12:54:55 -07:00
David Jay 1901592780 Switching displayname edit after facebook auth to account endpoint. 2017-02-06 11:07:35 -08:00
David Jay cb78e8d563 Merge branch 'master' into username-ban 2017-02-06 10:23:14 -08:00
Kim Gardner adae7aadf3 Merge pull request #290 from coralproject/losowsky-patch-1
added product link, note about alpha
2017-02-04 15:03:32 -05:00
Andrew Losowsky 3815267919 added product link 2017-02-04 09:31:23 -05:00
Riley Davis ff3c49c7bd Merged branch master into more-email-verify 2017-02-03 14:21:40 -07:00
Riley Davis e91ff306e9 whoops, missed one 2017-02-03 14:21:22 -07:00
David Erwin c8bb59be5b Merge pull request #289 from coralproject/circle-release-fix
Circle release fix
2017-02-03 16:16:00 -05:00
David Erwin bc14a9a758 Merge branch 'master' into circle-release-fix 2017-02-03 16:11:23 -05:00
Riley Davis a0c03605b9 Merge branch 'master'
Conflicts:
	client/coral-embed-stream/src/Embed.js
	client/coral-framework/constants/auth.js
	client/coral-framework/reducers/auth.js
	client/coral-sign-in/components/SignUpContent.js
2017-02-03 13:12:32 -07:00
Riley Davis 3441ec36c6 re-direct to sign in when email verification is off. add proptypes 2017-02-03 12:50:01 -07:00
Benjamin Goering 5614b9781e Merge branch 'master' into 20170203_futureproof_embed_code 2017-02-04 03:31:33 +08:00
Benjamin Goering f9cfdd07a5 update e2e tests to find iframe using selector that works with coral-embed 2017-02-04 03:25:15 +08:00
David Jay c784de6e95 Updating e2e tests. 2017-02-03 11:15:10 -08:00
Belen Curcio 8664a16bfc modQueue Query 2017-02-03 16:05:27 -03:00
Riley Davis 5ae078ff6e Merge pull request #277 from coralproject/story-134624635
Adds a screen to create username after facebook signup
2017-02-03 11:55:00 -07:00