Commit Graph

1896 Commits

Author SHA1 Message Date
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 526f0145f1 if goTo is not defined 2017-02-07 02:06:32 -03: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
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
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
Riley Davis 8c8a8eb3b8 define more propTypes. add a second button so tests work 2017-02-06 16:23:00 -07: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
Riley Davis 36ba9bd615 Merge branch 'master' into more-email-verify 2017-02-06 13:39:34 -07: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
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
Wyatt Johnson 35919740fd Uncommented things that were 2017-02-03 11:39:31 -07:00
Wyatt Johnson 5caade2409 Adjusted circle scripts for current usage of flags 2017-02-03 11:36:49 -07:00
Benjamin Goering 838e2a66e3 trivial change to trigger CircleCI (wyatt asked me to) 2017-02-04 02:35:58 +08:00
Wyatt Johnson fb8450c7ff Fixed issues with default setup 2017-02-03 11:22:35 -07:00
Benjamin Goering 1e8a363205 remove use of template strings in coral-embed script as some browsers will throw exceptions on them 2017-02-04 02:18:54 +08:00
Benjamin Goering bbdd9f22c1 re-copypaste pym.js into coral-embed, as eslint-fix had changed it to use template strings 2017-02-04 02:11:59 +08:00
Wyatt Johnson f488b0e02d Added BE for setup
- Adjusted docs
- Fixed issues with process terminating wrong
2017-02-03 11:05:46 -07:00
Benjamin Goering 160fb6e4d4 Add async attribute to coral-embed scripts 2017-02-04 02:03:31 +08:00
Riley Davis 8f374852ac hide social stuff after sign up 2017-02-03 10:49:52 -07:00
Benjamin Goering 841d6add45 Rename /Coral.js to /embed.js 2017-02-04 01:48:57 +08:00
Benjamin Goering b9c918eb88 Add pym.js LICENSE to coral-embed 2017-02-04 01:29:24 +08:00
Riley Davis 5c365b1a79 YOU. SHALL. NOT. PASS 2017-02-03 10:19:56 -07:00
Benjamin Goering f1010462ec Dont' use const/let in coral-embed so it works in all browsers 2017-02-04 01:19:47 +08:00
Riley Davis c4b934a542 whoops. commited to the wrong branch 2017-02-03 10:19:18 -07:00
Riley Davis a6f7cf258b attempt to make e2e tests pass 2017-02-03 10:15:51 -07:00
Benjamin Goering fb60b088b3 Rename coral-embd-api to coral-embed 2017-02-04 01:15:35 +08:00
Benjamin Goering e376e19c2c remove console.log from coral-embed-api 2017-02-04 01:00:46 +08:00
Benjamin Goering f7cddad659 Futureproof Embed Code
* Add client/coral-embed-api module. It's meant to be included in an HTML page and define window.Coral
* Serve coral-embed-api at /Coral.js
* Update / handler (article view) to use new embed format
* Update Talk Admin embed code section to use new embed format
2017-02-04 00:47:32 +08:00
Belen Curcio 80241025e5 linitin 2017-02-03 13:43:17 -03:00
gaba b5c9c1c731 Returns the real displayname and not the one transformed. 2017-02-02 16:03:14 -08:00
gaba 7da141ed29 Dispatch other action to only trigger change when sign up. 2017-02-02 15:44:45 -08:00
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 Davis 5a5c04f557 break the line as per the designs 2017-02-02 15:57:54 -07:00
Riley Davis 98c3d11815 add a translation 2017-02-02 15:46:51 -07:00