scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-30 10:58:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2149 commits 216 branches 1 tag 480 MiB
Commit graph

2149 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Taylor
674270483d Fix title for conference in China 
Also add 2017 to date
 2017-02-17 17:28:51 -05:00
Matthew Taylor
06ebc88287 Change footer for 2017 
Take out sponsors
 2017-02-17 13:13:03 -05:00
Matthew Taylor
9669527eb8 Some copy fixes for new conference page 
Thanks @kaschm!
 2017-02-17 11:46:27 -05:00
Matthew Taylor
6a733a33f2 Merge pull request #1190 from mewtaylor/issue/conference-icons 
Add new icons
 2017-02-16 17:06:41 -05:00
Matthew Taylor
509d8e84d7 Add new icons 
and format accordingly
 2017-02-16 16:58:27 -05:00
Matthew Taylor
a4fa9ffa94 Add transifex config for new files 
These files are new this iteration, so need to be added to the tx config
 2017-02-16 16:44:38 -05:00
Matthew Taylor
cbde14e626 Merge pull request #1186 from chrisgarrity/tx-import 
New scripts to generate translations from Transifex
 2017-02-16 08:15:12 -05:00
Matthew Taylor
4e65e34275 Merge pull request #1184 from mewtaylor/issue/gh-1086 
Conference 2017: add new landing page, and archive old site
 2017-02-16 07:56:21 -05:00
chrisgarrity
3b4a07c7b8 Adding Fashion and Story activities to Things to Try (#1176) 
Added Fashion and Story activities between Hide and Pong.
Updated description text.
Note that Cards and Guide locations were already included in l10n-static.json
 2017-02-15 23:21:27 -05:00
chrisgarrity
82785435bf New scripts to generate translations from Transifex 
Added tx-import, expects TX_TOKEN environment variable to be set to an API token for Transifex. If no API token exists it’ll just use the default English strings for everything.

Removed the localization spot checks because they were checking tha json got built from po files. With Tx-import the files are already json, and may possibly be missing.
 2017-02-15 22:51:15 -05:00
Matthew Taylor
ff1410ee6f Merge pull request #1180 from TheGrits/patch-4 
Fix gh-1178: 24 hours => one day
 2017-02-15 14:33:57 -05:00
Matthew Taylor
00ba8b2b2a Merge pull request #1148 from TheGrits/patch-5 
Fix gh-959: Localize Credits Page
 2017-02-15 14:29:40 -05:00
Matthew Taylor
c1a474fe8b Remove name after feedback 2017-02-15 10:51:13 -05:00
Matthew Taylor
19757ef730 Update details uri to have 2016 path 2017-02-15 08:44:28 -05:00
Matthew Taylor
8b772737a3 Add 2017 conference site 2017-02-15 08:35:10 -05:00
Matthew Taylor
67a39e4870 Archive 2016 site 
move to a subfolder, do some css shuffling and add some trello style guide stylings to help scope for also adding 2017
 2017-02-15 08:34:46 -05:00
Ray Schamp
5697a87cb7 Merge pull request #1175 from rschamp/bugfix/1153 
URI-encode search string on form submit
 2017-02-14 19:42:31 -05:00
The_Grits
7f148f1a47 Remove MIT Scratch Team from Localization 2017-02-14 14:01:54 -05:00
The_Grits
574e2134da 24 hours => one day 2017-02-14 13:36:39 -05:00
The_Grits
7a9f213cfb 24 hours => one day 2017-02-14 13:35:54 -05:00
Ray Schamp
c8a7d3cdc7 Clean up usage of Redux for searchTerm 
Now that the search term is encoded, we need to be sure both the search fields get a decoded string. Parse, decode and set this string via Redux in componentDidMount, and use it in both places.
 2017-02-10 18:54:20 -05:00
Ray Schamp
05adcde88d URI-encode search string on form submit 
This prevents the search form from setting an invalid URL.

Resolves #1153
 2017-02-10 18:51:42 -05:00
The_Grits
1d47e0ef6a Add Organizations Back In 2017-02-08 09:12:14 -05:00
Matthew Taylor
9255185716 Merge pull request #1164 from LLK/release/2.2.17 
[Develop] Release 2.2.17
 2017-02-08 08:37:42 -05:00
Matthew Taylor
2ea8eace6a Merge pull request #1166 from TheGrits/patch-3 
Fix gh-1157: Search Redirect
 2017-02-08 08:37:21 -05:00
The_Grits
e4ffcf00c3 Remove ajax 2017-02-06 17:00:48 -05:00
Matthew Taylor
8878726084 Merge pull request #1010 from TheGrits/patch-2 
Fix gh-1009: Add Tutorials Button
 2017-02-06 09:51:53 -05:00
Matthew Taylor
53fd63804c Merge pull request #1163 from LLK/release/2.2.17 
[Master] Release 2.2.17
 2017-02-02 22:29:13 -05:00
The_Grits
1cc8083137 Travis Fix 2017-02-01 16:15:18 -05:00
The_Grits
ee2cb185bd Search Redirect 2017-02-01 15:57:04 -05:00
Ray Schamp
22802f87e8 Merge pull request #1160 from TheGrits/patch-3 
Fix gh-1159: Add 2017 to Teacher Registration
 2017-02-01 12:44:23 -05:00
Andrew Sliwinski
c2991fb185 Merge pull request #1155 from TheGrits/patch-4 
Fix gh-1154: Join Us Section on Developers Page
 2017-02-01 10:44:41 -05:00
The_Grits
e42cf6f25b Fix FormattedHTMLMessage 2017-02-01 09:41:19 -05:00
Matthew Taylor
ca0985571e Revert "Merge pull request #1149 from mewtaylor/issue/r2-4092" 
This reverts commit 8e82398255, reversing
changes made to e1a0e9fece.
 2017-01-31 11:38:50 -05:00
Ray Schamp
624bdde84c Merge pull request #1160 from TheGrits/patch-3 
Fix gh-1159: Add 2017 to Teacher Registration
 2017-01-31 11:08:16 -05:00
The_Grits
32bd01ab88 Automagic Year 2017-01-31 11:01:22 -05:00
The_Grits
d19d0844a9 Add 2017 
Resolves #1159
 2017-01-31 10:10:05 -05:00
The_Grits
79639cb454 Change Search Term and Add "Tutorials" String 2017-01-26 10:10:49 -05:00
The_Grits
4fa2d24601 Add join section 2017-01-23 07:38:58 -05:00
The_Grits
6bc8dc5947 Update l10n.json 2017-01-23 07:34:28 -05:00
Matthew Taylor
6363a16b47 Merge pull request #1151 from mewtaylor/issue/r2-4219 
For r2-4451: Change password reset anchor text
 2017-01-20 07:49:34 -05:00
Matthew Taylor
b2c32c465a Merge pull request #1138 from mewtaylor/issue/gh-1097 
Fix GH-1097: Don’t validate username server side unless it passes client-side checks
 2017-01-20 07:48:49 -05:00
Matthew Taylor
8e82398255 Merge pull request #1149 from mewtaylor/issue/r2-4092 
For R2-4092: Add checkbox to opt-in to teacher emails
 2017-01-19 18:37:11 -05:00
Matthew Taylor
7cfc29f2dc Update content 
Thanks @kaschm!
 2017-01-19 18:36:28 -05:00
chrisgarrity
e1a0e9fece Fix GH 1102: Don’t allow duplicate strings in a single l10n file (#1150) 
* Don’t allow duplicate strings in a single l10n file

Added check_duplicate_strings to test for duplicates in a single file.
removed duplicates - tried to keep the more generic ‘key’

* revised test case for safer file reads
 2017-01-19 18:23:56 -05:00
Matthew Taylor
e1665c2b34 Change password reset anchor text 
This is part of https://github.com/LLK/scratchr2/pull/4451
 2017-01-19 11:12:54 -05:00
Matthew Taylor
4c6522ff9d Merge pull request #1132 from TheGrits/patch-3 
Fix gh-1130: Update Flash Link
 2017-01-19 10:42:14 -05:00
chrisgarrity
9e4ef5fb1b Tx import (#1143) 
* Transifex transition

Scripts and configuration for transition to Transifex for translation.

* Transifex transition update

changed the name of the place where translations are saved from ‘translations’ to localizations so that we can have a consistent name in both scratchr2, and scratch-www.

A couple of other little clean-ups to make sure that it’s ES5 compliant.
- don’t use const
- don’t use template strings (backticks)
 2017-01-18 12:57:14 -05:00
Matthew Taylor
313f267cfe Add checkbox to opt-in to teacher emails 2017-01-17 15:57:15 -05:00
The_Grits
3f4e40ef5c Localize Credits Page 2017-01-14 00:38:16 -05:00