scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-13 09:11:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
689 commits 221 branches 1 tag 508 MiB
Commit graph

689 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
morant
e9cb08d273 Revert "Fix review comments, and organize code a bit." 
This reverts commit 3d9d280bb9.
 2016-02-19 14:39:43 -05:00
morant
3d9d280bb9 Fix review comments, and organize code a bit. 
The only visible change should be that the tips thumbnails are no longer links.
 2016-02-19 14:30:07 -05:00
Matthew Taylor
4a1362b434 Merge pull request #364 from mewtaylor/issue/gh-358-travis-badge 
Fix GH-358: Add new travis badge to readme
 2016-02-19 08:20:48 -05:00
Matthew Taylor
7488715b9a Attempt to fix travis deployment 
It seems to not like underscores anymore.
 2016-02-18 15:54:03 -05:00
Matthew Taylor
c596765b51 Merge pull request #361 from TheGrits/patch-1 
Fix travis build fail
 2016-02-18 15:29:02 -05:00
Matthew Taylor
1d2fa70e4e Add new travis badge to readme 
Fixes #358
 2016-02-18 15:16:49 -05:00
The_Grits
8d05ed84b4 singlequotes 
Apparently double quotes don't work
 2016-02-18 14:34:02 -05:00
The_Grits
9f2325bd83 "over 13 million" 
Changed as per @mewtaylor's suggestion
 2016-02-18 14:29:58 -05:00
The_Grits
7992c43b87 Update credits.jsx 
Travis was complaining that link 188 had over 120 characters, this should fix it.
 2016-02-12 07:37:25 -05:00
Matthew Taylor
212a2d2c41 Merge pull request #352 from technoboy10/gh333-creditspage 
Fix gh-333: Add/Remove Moderators on Credits Page
 2016-02-10 22:51:54 -05:00
Matthew Taylor
b961891e66 Merge pull request #355 from TheGrits/patch-1 
Fix gh-354: 'Supported Organizations' in credits overflows
 2016-02-10 22:51:05 -05:00
Matthew Taylor
8884bcae7a Merge pull request #360 from technoboy10/gh300-scrollbar-fix 
Fix gh-300: Horizontal Scroll Bar Shows on Front Page
 2016-02-10 22:23:16 -05:00
Technoboy10
a4c24b2c6c oops 2016-02-09 08:19:29 -07:00
Technoboy10
2666975508 removed padding 2016-02-09 08:14:59 -07:00
The_Grits
91f3de0682 link formatting in paragraphs 2016-02-08 14:50:56 -05:00
Technoboy10
f99472afe1 fixed horizontal scrollbar 2016-02-08 10:08:32 -07:00
The_Grits
53cf85a4c2 Update project count 
Updated the number with a more recent number, I wasn't sure if using a string like "Loading..." would damage anything.
 2016-02-08 10:04:38 -05:00
The_Grits
3939dde44e Update credits.scss 2016-02-08 08:10:41 -05:00