Riley Davis
9d3960fd7b
fix a warning in the console when you're signed out
2017-02-07 10:37:38 -07:00
David Jay and GitHub
652170735b
Merge branch 'master' into username-ban
2017-02-06 18:14:13 -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
David Jay
1901592780
Switching displayname edit after facebook auth to account endpoint.
2017-02-06 11:07:35 -08:00
David Jay and GitHub
cb78e8d563
Merge branch 'master' into username-ban
2017-02-06 10:23:14 -08:00
Riley Davis
e91ff306e9
whoops, missed one
2017-02-03 14:21:22 -07: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 and GitHub
5614b9781e
Merge branch 'master' into 20170203_futureproof_embed_code
2017-02-04 03:31:33 +08: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
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
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
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
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
Riley Davis
a53db77c21
redirect back to the proper page
2017-02-02 15:44:12 -07:00
Riley Davis
a0cf467f1b
remove confirm and replace with verify
2017-02-02 14:59:45 -07:00
David Jay
feb0860ba1
Merge branch 'master' of github.com:coralproject/talk into username-ban
2017-02-02 12:29:29 -05:00
Riley Davis and GitHub
bb798b8b02
Merge branch 'master' into story-134624635
2017-02-02 10:05:17 -07:00
gaba
d53dc09aed
Merge branch 'master' into story-134624635
2017-02-02 08:16:50 -08:00
Belén Curcio and GitHub
7fe6002219
Merge branch 'master' into hide-pending-sometimes
2017-02-02 12:28:17 -03:00
David Erwin and GitHub
22e32b1869
Merge branch 'master' into hide-pending-sometimes
2017-02-02 10:16:53 -05:00
Belén Curcio and GitHub
04669350a1
Merge branch 'master' into design-pass-tweaks
2017-02-02 12:15:23 -03:00
Wyatt Johnson and GitHub
bd86eef441
Merge branch 'master' into add-yarn
2017-02-02 08:02:06 -07:00
Belén Curcio and GitHub
b4a03a5133
Merge branch 'master' into design-pass-tweaks
2017-02-02 07:55:41 -03:00
David Jay
97c3ebc3e0
Whitelisting usernames once they have been approved.
2017-02-01 20:55:45 -05:00
David Jay
5831a6f927
Merge branch 'master' of github.com:coralproject/talk into username-ban
2017-02-01 20:00:54 -05:00
David Jay
d703cc2168
Prompting user to update name when banned.
2017-02-01 19:53:37 -05:00
Gabriela Rodríguez Berón and GitHub
d8ab3b8fba
Merge branch 'master' into story-134624635
2017-02-01 14:03:56 -08:00
gaba
445eb97d76
Moves create displayname dialog to sign-in plugin.
2017-02-01 14:00:09 -08:00
David Jay
e3da45daeb
Displaying appropriate suspension message.
2017-02-01 16:38:01 -05:00
gaba
4df09ffbd2
Validation for the field underneath.
2017-02-01 13:29:47 -08:00
gaba
0c360e62a6
Display errors that come from the backend.
2017-02-01 13:20:17 -08:00
David Jay
7e907e18f2
Enabling canEditName when suspending user.
2017-02-01 16:19:42 -05:00
David Jay
b2430eaf60
Adding displayname editing and appropriate toggle.
2017-02-01 15:55:33 -05:00
Riley Davis