Commit graph

61 commits

Author SHA1 Message Date
morant
cca175154c First version of generic microworlds.
Reads videos information from JSON, other parts still not generic.
2016-01-08 14:43:39 -05:00
morant
9f0d36624a Fresh version of arts microworld 2015-11-22 21:40:08 -05:00
Ray Schamp
ae8d4d8990 Use webpack-dev-middleware for assets in dev 2015-11-19 15:25:39 -05:00
Ray Schamp
c065df3faa Use webpack for static assets 2015-11-19 15:25:39 -05:00
Matthew Taylor
133e42de06 Update to beta 1
locales configuration not loaded automatically anymore, so we need to load react-intl with locales included into the browser ahead of time
2015-11-19 15:25:39 -05:00
Ray Schamp
8536006416 Split CLIENT_ and NODE_ SENTRY_DSN vars 2015-11-12 17:00:19 -05:00
Ray Schamp
aa2eeab353 Log Javascript errors to Sentry 2015-11-06 17:08:50 -05:00
Andrew Sliwinski
f247761390 Merge branch 'develop' of github.com:llk/scratch-www into bugfix/199 2015-11-03 10:49:39 -05:00
Andrew Sliwinski
06de644ae6 Remove ./src/environment from Webpack config and bind environment to window. Resolves GH-199. 2015-11-03 10:49:32 -05:00
Andrew Sliwinski
0bfd6e1430 Update environment defaults 2015-11-03 10:44:56 -05:00
Andrew Sliwinski
d18799d221 Merge pull request #192 from thisandagain/bugfix/og
Update default og:image
2015-10-30 09:56:49 -04:00
Andrew Sliwinski
c0907f34cd Update default og:image 2015-10-29 18:40:56 -04:00
Andrew Sliwinski
18cd13701f Merge pull request #186 from mewtaylor/issue/180-clear-homepage-cache
#180 – Use xhr to clear cache instead of form
2015-10-29 18:36:00 -04:00
Ray Schamp
a20fc32a42 Merge pull request #173 from thisandagain/feature/minify
Use Minified react & react-dom in production
2015-10-29 15:49:00 -04:00
Andrew Sliwinski
6913a688d3 Block PUT, POST, and DEL requests 2015-10-29 12:06:13 -04:00
Matthew Taylor
d897d4387d Use xhr to clear cache instead of form
because csrf. also, since we don't have a definite message/banner system in place yet, use the button itself for feedback rather than messages. The button will disable if it has been successfully used, or turn pink if there was an error (and it will not be disabled in that case).
2015-10-29 10:28:32 -04:00
Andrew Sliwinski
de5e479b52 Minify react & react-dom in production 2015-10-25 18:58:17 -04:00
Colby Gutierrez-Kraybill
9e9dc0221d Merge pull request #132 from colbygk/feature/sentry-integration
Feature/sentry integration
2015-10-23 14:26:28 -04:00
Colby Gutierrez-Kraybill
3bf5f8b96c Adjust nitpicks, remove whitespace in (), add around + 2015-10-23 10:43:30 -04:00
Ray Schamp
be6358fba9 Merge pull request #138 from rschamp/feature/welcome-panel
Add welcome panel component to homepage
2015-10-22 22:42:47 -04:00
Ray Schamp
af415e1bf3 Set template cue to dismiss welcome panel 2015-10-22 17:17:27 -04:00
Colby Gutierrez-Kraybill
bec911f0a8 Handle sentry config and express routing/page handling errors, to do: handle uncaughtExceptions 2015-10-22 15:12:38 -04:00
Colby Gutierrez-Kraybill
b33645beda Handle sentry config and express routing/page handling errors, to do: handle uncaughtExceptions 2015-10-22 15:05:55 -04:00
Andrew Sliwinski
d86703e5db Add window.Intl polyfill. Resolves GH-96 2015-10-21 20:49:31 -04:00
Matthew Taylor
7e4555e6b6 Use language dropdown form to change language
xhr was not updating the session/cookie for some reason. So just force state change, and force form submission to change language
2015-10-20 16:51:30 -04:00
Ray Schamp
6259cb5b97 Pull homepage rows from the API
Not localized yet
2015-10-20 14:49:25 -04:00
Ray Schamp
6cdc447e83 Merge pull request #80 from thisandagain/bugfix/nginx
Remove nginx build process and clean-up for production
2015-10-20 13:27:42 -04:00
Andrew Sliwinski
98edeeee73 Merge pull request #79 from thisandagain/feature/og
Add GA tracking and optimize open graph tags
2015-10-20 13:26:14 -04:00
Colby Gutierrez-Kraybill
d39b691c46 Adding newrelic integration 2015-10-20 12:54:48 -04:00
Andrew Sliwinski
9d9a2ca491 Remove nginx build process and clean-up for production 2015-10-20 12:48:32 -04:00
Andrew Sliwinski
a7255c49b2 Add GA tracking and optimize open graph tags 2015-10-20 10:51:33 -04:00
Ray Schamp
70f06b6be8 Redirect to CAPTCHA when too many attempts fail 2015-10-19 16:36:46 -04:00
Matthew Taylor
997b94a91c Merge branch 'develop' into feature/react-intl
* develop:
  Fix 'M' issue in Firefox
  Widen modal to account for tooltip overflow
  Name Registration component
  Refresh session, close popup after registration
  Add standalone legacy registration iframe

# Conflicts:
#	server/proxies.json
#	src/components/navigation/navigation.jsx
2015-10-16 11:14:45 -04:00
Matthew Taylor
567067ce88 Make LanguageChooser isolated in funcitonality
and only set cookie client side, rather than using the post request
2015-10-16 11:01:40 -04:00
Matthew Taylor
b8972d545c refactor cookieMixinFactory
isolate cookie business logic from react mixin logic so that they are more modular. And use the cookie business logic to set translation objects on the window
2015-10-15 23:09:35 -04:00
Ray Schamp
6b1ce8549e Add standalone legacy registration iframe 2015-10-15 11:13:02 -06:00
Ray Schamp
d3b8c2085e Add the language dropdown, it almost works 2015-10-15 11:48:03 -04:00
Matthew Taylor
c3b62c8f05 Update core react dependencies 2015-10-14 22:59:38 -04:00
Andrew Sliwinski
add7d319d8 Fix title rendering 2015-10-13 15:58:10 -04:00
Ray Schamp
f569d02e92 Fix GH-27: Disallow iframe embedding 2015-10-07 22:49:17 -04:00
Ray Schamp
7b3874ffd5 Add csrf token handling to api mixin 2015-10-07 15:00:47 -04:00
Ray Schamp
a701c0829f Document environment variables, remove .env.sample 2015-10-07 11:48:18 -04:00
Ray Schamp
06f71a0da6 Update avatar thumbnailUrl per discussion 2015-10-06 13:32:51 -04:00
Ray Schamp
66f654536b Use NODE_ENV convention for node environment 2015-10-02 16:58:09 -04:00
Ray Schamp
8d574399e5 Use environment for proxy settings
Also use default local scratchr2 port, 8080.
2015-10-02 16:58:08 -04:00
Ray Schamp
69820aed6e Add newline for OCD reasons 2015-10-02 16:58:08 -04:00
Ray Schamp
4b4482f1fe Allow logging in and out
On scratchr2, the /session/ endpoint also sets the csrf cookie to allow this.
2015-10-02 16:58:08 -04:00
Ray Schamp
e0d17005e4 Get session from scratchr2 via proxy
Cookies aren't shared across ports, so the proxy is necessary to share the session between scratchr2 and www.
2015-10-02 16:58:08 -04:00
carljbowman
fbd54998e6 Add HOC Landing page View
Created a HOC Landing View. Currently all the SCSS lives at the view level and needs to be made into componets. After building out some Global style sheets I will revisit.
2015-09-25 09:59:56 -04:00
Ray Schamp
d6576409f1 Something like session handling 2015-09-22 10:26:19 -04:00