 David ErwinandGitHub
|
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 ErwinandGitHub
|
fcd431dc21
|
Merge branch 'master' into wrong-error-proptype
|
2017-02-07 12:51:20 -05:00 |
|
|
Riley DavisandGitHub
|
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 |
|
|
Riley DavisandGitHub
|
cd3d08c6f9
|
Merge branch 'master' into bugfix-tiny-mobile-fonts
|
2017-02-07 10:05:20 -07:00 |
|
|
Kim GardnerandGitHub
|
ba450a0166
|
Merge pull request #283 from coralproject/username-ban
Username banning flow
|
2017-02-06 23:04:43 -05:00 |
|
|
David JayandGitHub
|
586537084b
|
Merge branch 'master' into bugfix-tiny-mobile-fonts
|
2017-02-06 18:29:34 -08:00 |
|
|
David JayandGitHub
|
652170735b
|
Merge branch 'master' into username-ban
|
2017-02-06 18:14:13 -08:00 |
|
|
Kim GardnerandGitHub
|
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 |
|
|
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 |
|
|
Riley DavisandGitHub
|
36ba9bd615
|
Merge branch 'master' into more-email-verify
|
2017-02-06 13:39:34 -07:00 |
|
|
David Jay
|
1901592780
|
Switching displayname edit after facebook auth to account endpoint.
|
2017-02-06 11:07:35 -08:00 |
|
|
David JayandGitHub
|
cb78e8d563
|
Merge branch 'master' into username-ban
|
2017-02-06 10:23:14 -08:00 |
|
|
Kim GardnerandGitHub
|
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 LosowskyandGitHub
|
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 ErwinandGitHub
|
c8bb59be5b
|
Merge pull request #289 from coralproject/circle-release-fix
Circle release fix
|
2017-02-03 16:16:00 -05:00 |
|
|
David ErwinandGitHub
|
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 GoeringandGitHub
|
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 |
|
|
Riley DavisandGitHub
|
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 |
|
|
David Jay
|
2dacb72341
|
Updating reload code.
|
2017-02-03 10:27:17 -08:00 |
|
|
David Jay
|
d5abe78a3d
|
Merge branch 'username-ban' of github.com:coralproject/talk into username-ban
|
2017-02-03 10:20:29 -08:00 |
|
|
David Jay
|
6e92f8c3d6
|
Merge branch 'master' of github.com:coralproject/talk into username-ban
|
2017-02-03 10:19:21 -08: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 |
|
|
David Jay
|
d92c2d9744
|
Updating user queue routes.
|
2017-02-03 10:18:29 -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 |
|
|
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 |
|