scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 15:47:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
344 commits 216 branches 1 tag 464 MiB
Commit graph

344 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Sliwinski
8647d01e1f Merge pull request #75 from mewtaylor/bugfix/define-format-message 
Define `formatMessage` when used.
 2015-10-19 20:37:24 -04:00
Andrew Sliwinski
0f89152399 Create locale directory if it does not exist 2015-10-19 20:35:36 -04:00
Andrew Sliwinski
dae7288395 Merge pull request #73 from rschamp/feature/login-captcha-redirect 
Redirect to CAPTCHA when too many login attempts fail
 2015-10-19 20:34:10 -04:00
Matthew Taylor
010109a767 Use api to set language instead of cookie 
just to be safe. But i'm leaving in the `set` method of `jar.js` so we can easily move to it in the future.
 2015-10-19 19:49:24 -04:00
Matthew Taylor
e9d24b083a define formateMessage 
I was forgetting to define it, like is done in `activity.jsx`. I was also incorrectly interpreting the documentation
 2015-10-19 19:36:56 -04:00
Matthew Taylor
44aac35660 Merge pull request #71 from mewtaylor/feature/splash-admin-panel 
Add `AdminPanel` component
 2015-10-19 18:45:33 -04:00
Matthew Taylor
1252e32dec Merge pull request #74 from mewtaylor/bugfix/automatically-generate-locale-dir 
Automatically generate `locales` output dir if it doesn't exist
 2015-10-19 18:45:01 -04:00
Matthew Taylor
b6f77c7c77 Generate output dir if it doesn't exist 2015-10-19 18:16:13 -04:00
Ray Schamp
70f06b6be8 Redirect to CAPTCHA when too many attempts fail 2015-10-19 16:36:46 -04:00
Matthew Taylor
43786861c8 Add AdminPanel component 
And include it on the splash page.
 2015-10-19 14:55:38 -04:00
Matthew Taylor
4532db95df Merge pull request #67 from mewtaylor/feature/react-intl 
Feature: Add localization to scratch-www
 2015-10-16 19:30:33 -04:00
Matthew Taylor
58ef98016a General cleanup 2015-10-16 15:10:27 -04:00
Matthew Taylor
7b704e878f Give name to the exported module 2015-10-16 15:10:17 -04:00
Matthew Taylor
3bfcb698e6 alpha ordering 2015-10-16 15:09:20 -04:00
Matthew Taylor
a9d8119471 Allow loader to work with json correctly 
It was trying to parse it as js before
 2015-10-16 15:09:06 -04:00
Matthew Taylor
cf0fb33373 Add new line 2015-10-16 15:08:17 -04:00
Ray Schamp
d310386683 Merge pull request #68 from thisandagain/bugfix/56 
Add 'matchMedia' polyfill
 2015-10-16 10:58:13 -06:00
Andrew Sliwinski
578e1afab8 Add 'matchMedia' polyfill. Resolves GH-56 2015-10-16 12:05:27 -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
925eeafa7e Add lint exception for formatMessage injection 
It's a bit magical, but it's how they do it...
 2015-10-16 11:05:39 -04:00
Matthew Taylor
1c338e8394 Add template icu json file 
For us, it's in english
 2015-10-16 11:05:03 -04:00
Matthew Taylor
b26a0f69c3 Didn't mean to commit that stuff commented out 2015-10-16 11:04:34 -04:00
Matthew Taylor
c1de837595 Add formatted messages 
only to components and things that will be going out in the first deploy
 2015-10-16 11:04:01 -04:00
Matthew Taylor
d0b22d0f97 Forgot to include these as part of init restructure 2015-10-16 11:02:41 -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
d307b21d3d Add cookie setter to jar 2015-10-16 10:59:55 -04:00
Matthew Taylor
d6782e1034 don't use double quotes in mixin 2015-10-16 10:59:41 -04:00
Matthew Taylor
0577860f3a Rename renderer to render 
and make it a method that returns a component, rather than an object with a render method
 2015-10-15 23:11:09 -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
Matthew Taylor
be5d8cd3eb use po2icu to get po files as json icu files 2015-10-15 23:02:57 -04:00
Ray Schamp
ed94b6f447 Merge pull request #62 from carljbowman/navigation-icon-update 
Fix 'M' issue in Firefox
 2015-10-15 15:52:01 -06:00
carljbowman
694d8a7597 Fix 'M' issue in Firefox 
Set fixed 'text-indent' to push content out of the navigation element.
 2015-10-15 15:26:33 -06:00
Ray Schamp
4ad7302f14 Merge pull request #45 from rschamp/feature/join 
Implement join flow
 2015-10-15 14:53:18 -06:00
Ray Schamp
f44e0b249a Widen modal to account for tooltip overflow 2015-10-15 11:13:31 -06:00
Ray Schamp
8b8aa0ee48 Name Registration component 2015-10-15 11:13:31 -06:00
Ray Schamp
fcec859cbe Refresh session, close popup after registration 2015-10-15 11:13:31 -06: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
Ray Schamp
aaf263f9b6 Generalize the csrf cookie fetcher 
So we can use it with other cookies, like scratchlanguage
 2015-10-15 11:47:55 -04:00
Matthew Taylor
0884294516 Merge pull request #60 from mewtaylor/feature/upgrade-react-0.14 
Feature: Upgrade React to 0.14
 2015-10-15 11:40:31 -04:00
Matthew Taylor
54920f5e9f Merge branch 'develop' into feature/upgrade-react-0.14 
* develop:
  Avoid class name conflict on login li
  Update Hover JS fuctions with intative naming
  Remove extra white space on HOC Landing
  Add Collaborators and Logos
  Add CN Logo to Hide & Seek asset
  Remove excess/unused CSS
  Update HOC with Banner Hoverstates & Assets
 2015-10-14 23:03:01 -04:00
Matthew Taylor
3d8ae43391 Use forks of react-modal and react-slick 
They're not 0.14 compatible completely yet, so use forks that make use of outstanding PRs for 0.14 compatibility until they release an npm module with support
 2015-10-14 23:01:19 -04:00
Matthew Taylor
c3b62c8f05 Update core react dependencies 2015-10-14 22:59:38 -04:00
Andrew Sliwinski
3d04e10720 Merge pull request #57 from carljbowman/hoc-landing-updates 
Update HOC with Banner Hoverstates & Assets
 2015-10-14 17:31:03 -04:00
Ray Schamp
644eebf6ba Merge pull request #58 from rschamp/bugfix/signin-margin 
Avoid class name conflict on login li
 2015-10-14 15:13:51 -06:00
Ray Schamp
1696921354 Avoid class name conflict on login li 2015-10-14 15:02:36 -06:00
carljbowman
c7367967ba Update Hover JS fuctions with intative naming 2015-10-14 14:53:40 -06:00
carljbowman
5a8ab315b5 Remove extra white space on HOC Landing 2015-10-14 14:46:13 -06:00
carljbowman
4424fe2f0b Add Collaborators and Logos 2015-10-14 14:45:00 -06:00
carljbowman
75756e4096 Add CN Logo to Hide & Seek asset 2015-10-14 11:51:34 -06:00