Commit Graph

3586 Commits

Author SHA1 Message Date
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
Wyatt Johnson fb8450c7ff Fixed issues with default setup 2017-02-03 11:22:35 -07: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
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
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 b8b66bc50c Merge branch 'master' into username-ban 2017-02-02 12:51:11 -05:00
Wyatt Johnson 2df980b560 Merge branch 'master' into install-admin 2017-02-02 10:34:17 -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 bb798b8b02 Merge branch 'master' into story-134624635 2017-02-02 10:05:17 -07:00
David Erwin 03c240054a Merge pull request #284 from coralproject/stream-admin-bugfix
Fix admin user stream bug
2017-02-02 12:02:06 -05:00
David Erwin 79a2a2144c Fix admin user stream bug 2017-02-02 11:51:09 -05:00
gaba d53dc09aed Merge branch 'master' into story-134624635 2017-02-02 08:16:50 -08:00
David Erwin ce002e366d Merge pull request #282 from coralproject/hide-pending-sometimes
Hide Pre-Mod tab sometimes
2017-02-02 10:33:00 -05:00
Belén Curcio 7fe6002219 Merge branch 'master' into hide-pending-sometimes 2017-02-02 12:28:17 -03:00
Belén Curcio 3273749fbb Merge pull request #269 from coralproject/design-pass-tweaks
Design pass tweaks
2017-02-02 12:21:47 -03:00
David Erwin 22e32b1869 Merge branch 'master' into hide-pending-sometimes 2017-02-02 10:16:53 -05:00
Belén Curcio 04669350a1 Merge branch 'master' into design-pass-tweaks 2017-02-02 12:15:23 -03:00
David Erwin b0045fd8a6 Merge pull request #281 from coralproject/add-yarn
Add yarn + Upgrade Webpack
2017-02-02 10:14:07 -05:00
Wyatt Johnson bd86eef441 Merge branch 'master' into add-yarn 2017-02-02 08:02:06 -07:00
Belen Curcio 65aa5e7e92 Ádding Select, Options to Coral Ui and steps with formField 2017-02-02 11:31:43 -03:00
Belén Curcio b4a03a5133 Merge branch 'master' into design-pass-tweaks 2017-02-02 07:55:41 -03:00
Belen Curcio ad8d92a8ea Merge branch 'master' of github.com:coralproject/talk into install-admin 2017-02-01 23:08:22 -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