scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-30 02:56:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
1819 commits 217 branches 1 tag 479 MiB
Commit graph

1819 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Taylor
3ea65161de Merge pull request #1259 from mewtaylor/release/april-fools-rollback 
[Master] Hotfix: Revert those changes we did last week
 2017-04-03 15:05:40 -04:00
Matthew Taylor
9affc8441c Revert "Merge pull request #1255 from LLK/release/branch" 
This reverts commit c36bde2c30, reversing
changes made to becae19f6f.
 2017-04-03 14:32:38 -04:00
Ray Schamp
c36bde2c30 Merge pull request #1255 from LLK/release/branch 
[Master] Hotfix: Weekend banner updates
 2017-03-31 12:11:04 -04:00
Matthew Taylor
d8ef3110e2 don’t apply to top banners 2017-03-31 10:26:56 -04:00
Matthew Taylor
0e645ce954 Reset banner on new login 2017-03-31 10:00:40 -04:00
Matthew Taylor
d66e11fced Banner updates 2017-03-31 09:02:54 -04:00
Matthew Taylor
becae19f6f Merge pull request #1221 from LLK/release/2.2.18 
[Master] Release 2.2.18
 2017-02-24 11:51:51 -05:00
Matthew Taylor
35490386d6 Merge pull request #1226 from mewtaylor/issue/gh-translations 
Use `scratchr2_translations` for language files
 2017-02-24 08:53:02 -05:00
Matthew Taylor
4621b25ed8 remove transifex module 
no longer use this, since we removed our dependency on pulling translations from transifex during builds
 2017-02-24 08:41:17 -05:00
Matthew Taylor
37fae8fe86 Merge pull request #1225 from chrisgarrity/add-new-activity-guides 
Add Guide PDFs for new activities
 2017-02-24 07:59:58 -05:00
Matthew Taylor
0912fca5f2 Use scratchr2_translations for language files 
Adjusts the translation system to go back to using a github repo to store snapshots of transltions, but continues to use new `.json` formatted files
 2017-02-24 07:58:50 -05:00
chrisgarrity
d94349b8d2 Add Guide PDFs for new activities 2017-02-23 16:21:19 -05:00
Matthew Taylor
8516c3a361 Merge pull request #1219 from mewtaylor/issue/gh-1196-follow-up 
GH-1196 Follow Up: Update `otherDisabled` check
 2017-02-23 11:02:35 -05:00
Matthew Taylor
eb56b27a88 Update otherDisabled check 
Fall out from #1217. We should likely change the way this is set up, it seems not ideal. But not sure the best way atm.
 2017-02-23 10:57:27 -05:00
Matthew Taylor
abcb92243b Merge pull request #1217 from mewtaylor/issue/gh-1196 
Fix GH-1196: Don’t localize an empty string
 2017-02-23 09:58:59 -05:00
Matthew Taylor
f59774bd0d Don’t localize an empty string 2017-02-23 09:52:33 -05:00
Matthew Taylor
df88daea36 Merge pull request #1216 from mewtaylor/issue/conference-tweaks 
Some additional tweaks for conference 2017
 2017-02-23 09:50:34 -05:00
Matthew Taylor
7a2e7cc949 Some additional tweaks for conference 2017 
1. Updates svgs for formatting
2. Makes the font size of the title smaller

Fixes #1211, 5-6 in #1206
 2017-02-23 09:39:57 -05:00
Matthew Taylor
efa00b95db Merge pull request #1212 from mewtaylor/issue/svg-ie11 
Fix GH-1208: add height to svg
 2017-02-22 16:46:38 -05:00
Matthew Taylor
e13fa6dc4b add height to svg 
needed by ie11 to render correctly. fixes #1208
 2017-02-22 16:37:57 -05:00
The_Grits
f7d9086296 credits typo 
Should fix #1201
 2017-02-22 11:14:32 -05:00
The_Grits
e0a81c50c3 Lowercase P 
Should fix #1202
 2017-02-22 11:14:26 -05:00
Matthew Taylor
7bd97802ab Merge pull request #1200 from mewtaylor/issue/conference-footer 
Add language chooser to conf footer
 2017-02-22 10:57:55 -05:00
Matthew Taylor
dd940235cd Add language chooser to conf footer 
thanks @jwzimmer!
 2017-02-22 10:31:40 -05:00
Matthew Taylor
1b0de13d63 Merge pull request #1192 from mewtaylor/issue/conference-fixes 
Bugfix: Some copy fixes for new conference page
 2017-02-22 09:25:56 -05:00
Matthew Taylor
b139f0a606 Additional conference fixes 
1. border on flags
2. `Conferences` in nav
3. mailto for costa rica
 2017-02-22 08:03:16 -05:00
Ray Schamp
201b2ad152 Merge pull request #1193 from rschamp/bugfix/1189 
Search view fixes
 2017-02-21 19:01:58 -05:00
Ray Schamp
6019726453 Fix argument name 
Thanks @mewtaylor!
 2017-02-21 09:42:34 -05:00
Matthew Taylor
4cf3b890fd Update ordering and text size for “Learn More” 2017-02-21 08:37:05 -05:00
Ray Schamp
405763246d Wait for the search term before searching 
Fixes #1189
 2017-02-20 11:08:36 -05:00
Ray Schamp
0313346fed Encode term from search view's search bar 
Same fix as #1175, but for the form on the search page.
 2017-02-20 11:08:05 -05:00
Ray Schamp
d6093f19b0 Fix React key warnings 
The number of warnings was locking up my browser, making it hard to test things out.
 2017-02-20 11:04:41 -05:00
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