scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 09:35:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
757 commits 216 branches 1 tag 474 MiB
Commit graph

757 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Taylor
3c2fec42f2 Only catch the ENOENT error 
The catch there before is meant to just continue if it comes across a file that doesn't exist (in which case the language will default to english). However, it was not specific enough – now, it only catches the error if the file doesn't exist, and throws anything else, preveting a build.
 2016-03-22 16:25:05 -04:00
Ray Schamp
1eb8c537c1 Add method for using token in api requests 
Requires a change on the api to read the token from the querystring.
 2016-03-22 15:46:44 -04:00
Ray Schamp
32b7d5a41b Retrieve token from session cookie 2016-03-22 14:43:07 -04:00
Matthew Taylor
faf3549509 Merge pull request #390 from mewtaylor/issue/356-project-count 
Fix GH-356: Use `formatNumber` to localize project count
 2016-03-22 12:14:42 -04:00
Matthew Taylor
9a2a923b7b Remove projectCount from intro.jsx 
thanks @rschamp!
 2016-03-22 12:09:51 -04:00
Matthew Taylor
4914ba6d85 Use formatNumber to localize project count 
`toLocaleString()` is not supported in Safari, but react-intl has a polyfill, and so it is. This also localized the intro description string, which wasn't previously. This also fixes #366 by doing as @rschamp suggested and checking if the count is the default count before setting the value.
 2016-03-22 11:00:37 -04:00
Ray Schamp
96bc1b1ab1 Add method for reading session cookie 
Assumes the session cookie is stored as JSON which may or may not have been compressed via zlib (indicated by a leading `.`), which is then base64-encoded, and made URL-safe by replacing all `+` and `/` characters with `-` and `_` respectively.
 2016-03-22 09:11:09 -04:00
Ray Schamp
9cd5c98004 Make Jar formatting consistent with everything else 2016-03-22 09:09:42 -04:00
Matthew Taylor
3c307e1706 Merge pull request #385 from mewtaylor/issue/add-nynorsk 
Add nynorsk to dropdown
 2016-03-22 08:10:14 -04:00
Ray Schamp
2bd9c34cdd Merge pull request #386 from rschamp/feature/redux 
Use Redux for session handling
 2016-03-21 22:05:24 -04:00
Matthew Taylor
358a5acf97 Merge pull request #388 from mewtaylor/issue/gh-381-languages 
[Master] Fix GH-381: add languages to custom config
 2016-03-21 11:26:37 -04:00
Matthew Taylor
8ab2546036 Merge pull request #389 from mewtaylor/issue/gh-381-languages 
[Develop] Fix GH-381: add custom langauges
 2016-03-21 08:48:25 -04:00
Matthew Taylor
0529c903f7 Add languages to custom locales 
These languages are not supported in `intl-messageformat`. Fixes #381.
 2016-03-21 08:04:52 -04:00
Ray Schamp
e6e91ccca7 Meaningless change 2016-03-21 00:52:28 -04:00
Ray Schamp
728910a679 Meaningless change 2016-03-21 00:44:31 -04:00
Ray Schamp
7b72e6cdcd Fix lint errors 2016-03-18 12:40:30 -04:00
Ray Schamp
a5e336a175 Use redux for session handling 2016-03-18 11:51:22 -04:00
Ray Schamp
1205ed019d Make Api mixin usable as a standalone module 2016-03-18 10:55:12 -04:00
Ray Schamp
faabc63e65 Move component structure to one tree 
Instead of inserting `Navigation` and `Footer` into every `render`ed component, just compose them in the views with a new `Page` component.
 2016-03-18 10:54:26 -04:00
morant
99772ca41a * Fix alignment of Editor link in Microworlds. 
* Remove fixed width from most components (replace with relative width).
 2016-03-17 15:58:26 -04:00
Matthew Taylor
af928160cf Add nynorsk to dropdown 2016-03-16 11:55:54 -04:00
morant
2e5a0e1439 Merge remote-tracking branch 'upstream/develop' into feature/microworlds 
* Removed microwords from server/routes for now.

# Conflicts:
#	server/routes.json
#	src/components/thumbnail/thumbnail.jsx
 2016-03-11 21:14:27 -05:00
morant
d735d38d91 * Fix aligning of thumbnails inside a NestedCarousel 
* Remove links from thumbnail image
* Fix vertical aligning when a thumbnail has more than one line of text
 2016-03-11 18:17:34 -05:00
Matthew Taylor
17a2f6ce2c Merge pull request #383 from mewtaylor/hotfix/wedo-appstore-link 
[Master] Hotfix: wedo appstore link
 2016-03-10 16:10:39 -05:00
Matthew Taylor
cb81ae550a Merge pull request #382 from mewtaylor/hotfix/wedo-appstore-link 
[Develop] Hotfix: wedo appstore link
 2016-03-10 15:28:50 -05:00
Matthew Taylor
c514d814c9 Update device manager app store link 2016-03-10 15:14:08 -05:00
Matthew Taylor
8c6e12677d Merge pull request #379 from mewtaylor/wedo-landing 
[Master] – Wedo landing page
 2016-03-10 10:29:34 -05:00
Matthew Taylor
b484480e1e Merge branch 'wedo-landing' into develop 
* wedo-landing:
  Update with links, fix linter issues, center setup
  [WIP] Add WeDo Landing page

# Conflicts:
#	server/routes.json
 2016-03-10 09:05:51 -05:00
Matthew Taylor
aeaa02aae8 Update with links, fix linter issues, center setup 2016-03-09 23:04:25 -05:00
carljbowman
3220fd1b9d [WIP] Add WeDo Landing page 
Adding LEGO WeDO landing page. This also includes the initial pass on Global Typographic Standards.

Needs Work
-Add URLs to all links on the page (still being generated)
-Ater URLs have been added, update translation JSON to include messages that include links
 2016-03-09 14:33:17 -05:00
The_Grits
5878c8f407 Disable mobile Safari phone numbers 
Fixes mobile side of #356
 2016-03-08 15:49:00 -05:00
Matthew Taylor
6f8a916426 Merge pull request #376 from mewtaylor/issue/gh-374-tips-link 
[Develop] Fix GH-374: Add tips to create link for logged out
 2016-03-04 14:44:27 -05:00
Matthew Taylor
4a40482f74 Add tips to create link for logged out user 
Fixes #374
 2016-03-04 10:27:00 -05:00
Andrew Sliwinski
73b0766d56 Merge pull request #369 from thisandagain/feature/jobs 
Migrate - Jobs Page
 2016-03-03 13:49:07 -05:00
Andrew Sliwinski
80dcc08416 Merge pull request #371 from thisandagain/feature/node 
Swap environments for CD
 2016-03-03 11:54:14 -05:00
Andrew Sliwinski
f23ada9264 Swap environments for CD. Resolves GH-351 2016-03-03 09:57:41 -05:00
Andrew Sliwinski
14e28739bc Merge pull request #370 from thisandagain/feature/node 
Prepare for migration to Node 4.2 LTS
 2016-03-02 11:38:49 -05:00
Andrew Sliwinski
834327a96a Patch GCC for travis image for Node 4.X. Re GH-351 2016-03-02 11:17:19 -05:00
Andrew Sliwinski
9cbe1c8498 Update devDependencies and remove redundant / unused modules. Re GH-351 2016-03-02 10:14:05 -05:00
Andrew Sliwinski
5ae65979dd Update dependencies. Re GH-351 2016-03-02 10:03:22 -05:00
Andrew Sliwinski
7faf2aa8c2 Update travis to use Node 4.2.X LTS. Re GH-351 2016-03-02 10:01:08 -05:00
Andrew Sliwinski
f4be08fc4f Remove unused files 2016-03-02 09:50:11 -05:00
Andrew Sliwinski
47ab0a0ae0 Update jobs to match Media Lab listings 2016-03-02 09:42:51 -05:00
Ray Schamp
11a8eb178f Merge pull request #368 from LLK/release/2.2.6 
Release 2.2.6
 2016-03-01 15:18:03 -05:00
Andrew Sliwinski
7511121972 Merge branch 'develop' into feature/jobs 2016-03-01 10:19:34 -05:00
Matthew Taylor
0ac9f5edc5 Merge pull request #359 from TheGrits/patch-2 
Fix gh-357: Splash - Initial value of project count is arbitrary
 2016-02-23 11:43:26 -05:00
Matthew Taylor
9dc4195bbf add key again 2016-02-23 08:48:19 -05:00
Matthew Taylor
ab6bdfbd6a Add new keys 2016-02-23 08:39:44 -05:00
Matthew Taylor
e294b68b77 Revert "Attempt to fix travis deployment" 
This reverts commit 7488715b9a.
 2016-02-22 09:07:25 -05:00
morant
c7cc1b626f Revert "Revert "Fix review comments, and organize code a bit."" 
This reverts commit e9cb08d273.
 2016-02-19 15:11:23 -05:00