e91ff306e9
whoops, missed one
2017-02-03 14:21:22 -07: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
838e2a66e3
trivial change to trigger CircleCI (wyatt asked me to)
2017-02-04 02:35:58 +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
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
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
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
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
bb798b8b02
Merge branch 'master' into story-134624635
2017-02-02 10:05:17 -07:00
d53dc09aed
Merge branch 'master' into story-134624635
2017-02-02 08:16:50 -08:00
7fe6002219
Merge branch 'master' into hide-pending-sometimes
2017-02-02 12:28:17 -03:00
22e32b1869
Merge branch 'master' into hide-pending-sometimes
2017-02-02 10:16:53 -05:00
04669350a1
Merge branch 'master' into design-pass-tweaks
2017-02-02 12:15:23 -03:00
bd86eef441
Merge branch 'master' into add-yarn
2017-02-02 08:02:06 -07:00
b4a03a5133
Merge branch 'master' into design-pass-tweaks
2017-02-02 07:55:41 -03:00
d8ab3b8fba
Merge branch 'master' into story-134624635
2017-02-01 14:03:56 -08:00
445eb97d76
Moves create displayname dialog to sign-in plugin.
2017-02-01 14:00:09 -08:00
4df09ffbd2
Validation for the field underneath.
2017-02-01 13:29:47 -08:00
0c360e62a6
Display errors that come from the backend.
2017-02-01 13:20:17 -08:00
ee0bb50dd5
Adds errors on field when not validated.
2017-02-01 12:34:02 -08:00
22c0ed686f
rename everything to Pre-Mod from Pending. hide the pre-mod tab sometimes.
2017-02-01 13:33:29 -07:00
a8e4ce466d
Adds validation to the dialog.
2017-02-01 12:09:27 -08:00
7beb28e077
Updated documentation
2017-02-01 12:54:15 -07:00
c9b12fc5d6
Thanks git-godesses for the log on finding a bad remove when merging.
2017-02-01 10:46:32 -08:00
f4d672ddcf
Merge branch 'master' into story-134624635
2017-02-01 10:42:00 -08:00
ec956165a3
Merge branch 'master' into bugfix-asset-search
2017-02-01 11:35:59 -07:00
e1650aa721
Merge branch 'master' into timeago-fix
2017-02-01 09:52:40 -08:00
097934dee5
Merge branch 'master' into story-134624635
2017-01-31 15:00:14 -08:00
282c7dc4f5
Removes duplicate func and adds tests.
2017-01-31 14:04:31 -08:00
37eae51641
Adds component to coral-framework to deal with the change of displayname.
2017-01-31 13:52:40 -08:00
80122dfdce
Adds formfield to components.
2017-01-31 13:48:45 -08:00
e6e8ad5ca6
close the resend email box after use. remove dead code
2017-01-31 13:29:23 -07:00
7babb14bab
Addressing bug in asset search.
2017-01-31 14:37:52 -05:00
ec1dfefc5d
lint
2017-01-31 12:15:33 -07:00
Riley Davis