c8bb59be5b
Merge pull request #289 from coralproject/circle-release-fix
...
Circle release fix
2017-02-03 16:16:00 -05:00
bc14a9a758
Merge branch 'master' into circle-release-fix
2017-02-03 16:11:23 -05:00
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
3441ec36c6
re-direct to sign in when email verification is off. add proptypes
2017-02-03 12:50:01 -07:00
5614b9781e
Merge branch 'master' into 20170203_futureproof_embed_code
2017-02-04 03:31:33 +08:00
f9cfdd07a5
update e2e tests to find iframe using selector that works with coral-embed
2017-02-04 03:25:15 +08:00
c784de6e95
Updating e2e tests.
2017-02-03 11:15:10 -08:00
8664a16bfc
modQueue Query
2017-02-03 16:05:27 -03:00
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
35919740fd
Uncommented things that were
2017-02-03 11:39:31 -07:00
5caade2409
Adjusted circle scripts for current usage of flags
2017-02-03 11:36:49 -07:00
838e2a66e3
trivial change to trigger CircleCI (wyatt asked me to)
2017-02-04 02:35:58 +08:00
2dacb72341
Updating reload code.
2017-02-03 10:27:17 -08:00
fb8450c7ff
Fixed issues with default setup
2017-02-03 11:22:35 -07:00
d5abe78a3d
Merge branch 'username-ban' of github.com:coralproject/talk into username-ban
2017-02-03 10:20:29 -08:00
6e92f8c3d6
Merge branch 'master' of github.com:coralproject/talk into username-ban
2017-02-03 10:19:21 -08:00
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
d92c2d9744
Updating user queue routes.
2017-02-03 10:18:29 -08:00
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
f488b0e02d
Added BE for setup
...
- Adjusted docs
- Fixed issues with process terminating wrong
2017-02-03 11:05:46 -07:00
160fb6e4d4
Add async attribute to coral-embed scripts
2017-02-04 02:03:31 +08:00
8f374852ac
hide social stuff after sign up
2017-02-03 10:49:52 -07:00
841d6add45
Rename /Coral.js to /embed.js
2017-02-04 01:48:57 +08:00
b9c918eb88
Add pym.js LICENSE to coral-embed
2017-02-04 01:29:24 +08:00
5c365b1a79
YOU. SHALL. NOT. PASS
2017-02-03 10:19:56 -07:00
f1010462ec
Dont' use const/let in coral-embed so it works in all browsers
2017-02-04 01:19:47 +08:00
c4b934a542
whoops. commited to the wrong branch
2017-02-03 10:19:18 -07:00
a6f7cf258b
attempt to make e2e tests pass
2017-02-03 10:15:51 -07:00
fb60b088b3
Rename coral-embd-api to coral-embed
2017-02-04 01:15:35 +08:00
e376e19c2c
remove console.log from coral-embed-api
2017-02-04 01:00:46 +08:00
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
80241025e5
linitin
2017-02-03 13:43:17 -03:00
b5c9c1c731
Returns the real displayname and not the one transformed.
2017-02-02 16:03:14 -08:00
7da141ed29
Dispatch other action to only trigger change when sign up.
2017-02-02 15:44:45 -08:00
d74d2e9e87
Dispatchs the user.
2017-02-02 15:25:45 -08:00
c272b88340
It returns user now.
2017-02-02 15:24:55 -08:00
5a5c04f557
break the line as per the designs
2017-02-02 15:57:54 -07:00
98c3d11815
add a translation
2017-02-02 15:46:51 -07:00
a53db77c21
redirect back to the proper page
2017-02-02 15:44:12 -07:00
a0cf467f1b
remove confirm and replace with verify
2017-02-02 14:59:45 -07:00
b8b66bc50c
Merge branch 'master' into username-ban
2017-02-02 12:51:11 -05:00
2df980b560
Merge branch 'master' into install-admin
2017-02-02 10:34:17 -07:00
feb0860ba1
Merge branch 'master' of github.com:coralproject/talk into username-ban
2017-02-02 12:29:29 -05:00
bb798b8b02
Merge branch 'master' into story-134624635
2017-02-02 10:05:17 -07:00
03c240054a
Merge pull request #284 from coralproject/stream-admin-bugfix
...
Fix admin user stream bug
2017-02-02 12:02:06 -05:00
79a2a2144c
Fix admin user stream bug
2017-02-02 11:51:09 -05:00
d53dc09aed
Merge branch 'master' into story-134624635
2017-02-02 08:16:50 -08:00
ce002e366d
Merge pull request #282 from coralproject/hide-pending-sometimes
...
Hide Pre-Mod tab sometimes
2017-02-02 10:33:00 -05:00
7fe6002219
Merge branch 'master' into hide-pending-sometimes
2017-02-02 12:28:17 -03:00
3273749fbb
Merge pull request #269 from coralproject/design-pass-tweaks
...
Design pass tweaks
2017-02-02 12:21:47 -03:00
David Erwin