scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-20 20:42:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
12535 commits 221 branches 1 tag 521 MiB
Commit graph

12535 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Taylor
f379ff4be1 Merge pull request #1266 from mewtaylor/issue/temp-remove-custom-rows 
[Master] Temp Hotfix: remove custom rows
 2017-04-11 09:33:46 -04:00
Matthew Taylor
5ca5c149f3 temporarily remove custom homepage rows 
redis emptied when mc1 restarted, so this is all going to mysql at the moment
 2017-04-11 09:27:19 -04:00
Ray Schamp
d3dd889dc4 Merge pull request #1263 from LLK/release/2.2.19 
[Develop] Release 2.2.19
 2017-04-10 09:55:04 -04:00
Ray Schamp
194ac12b44 Merge pull request #1264 from LLK/release/2.2.19 
[Master] Release 2.2.19
 2017-04-10 09:54:02 -04:00
The_Grits
6dbf66d59d Patches and Styling 2017-04-06 10:40:46 -04:00
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
b2e827f752 Merge pull request #1260 from mewtaylor/release/april-fools-rollback 
[Develop] Hotfix: Revert those changes we did last week
 2017-04-03 14:51:29 -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
The_Grits
94dec64045 Thanks Travis 
Gotta love missing semicolons
 2017-04-01 13:06:45 -04:00
The_Grits
68d10ffe32 Patch 3 wip (#30) 2017-04-01 10:55:47 -04:00
The_Grits
6255f989b0 Nit-picky Developer Class Type 
Just noticed that the type on this page was copied over from the About page. Non-blocking issue, just me being nit-picky.
 2017-04-01 10:06:40 -04:00
The_Grits
0f87a65622 importy 2017-03-31 19:35:33 -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
7522be4c03 Merge pull request #1253 from TheGrits/patch-4 
Fix gh-1194: Remove Scratch Day from Localization
 2017-03-22 08:41:51 -04:00
Matthew Taylor
3a299e06f7 Merge pull request #1240 from TheGrits/patch-3 
Fix gh-1239: Update Conference Dates
 2017-03-22 08:32:54 -04:00
Matthew Taylor
306efd1af3 Merge pull request #1241 from mewtaylor/issue/gh-1199 
Fix GH-1199: iterate over languages for views without l10n files
 2017-03-22 08:31:15 -04:00
The_Grits
77bdd356d8 Remove Scratch Day from Localization File 2017-03-20 11:06:28 -04:00
The_Grits
bc43e89d36 Remove localization of Scratch Day 2017-03-20 11:05:52 -04:00
Matthew Taylor
e9f7748fdf Merge pull request #1243 from TheGrits/patch-4 
Fix gh-1242: Update Credits Page
 2017-03-16 11:57:11 -04:00
Matthew Taylor
0bb60700ba Merge pull request #1244 from mewtaylor/issue/opt-in 
[Develop] Hotfix: re-add checkbox to opt-in to email list for teacher
 2017-03-15 10:15:16 -04:00
Matthew Taylor
63c6bf59f2 Merge pull request #1149 from mewtaylor/issue/r2-4092 
For R2-4092: Add checkbox to opt-in to teacher emails
 2017-03-15 10:08:35 -04:00
The_Grits
c45663e966 Add Juanita Buitrago to Previous Members 2017-03-13 17:09:08 -04:00
The_Grits
f1880e47d5 Remove Juanita Buitrago 2017-03-13 17:08:39 -04:00
The_Grits
7e9a6ef410 Add, remove, and resort! (2) 2017-03-13 16:17:12 -04:00
The_Grits
b5cebffe11 Add, remove, resort! 2017-03-13 16:06:37 -04:00
Matthew Taylor
1b4c14b333 Exit on error in translation building 
thanks @chrisgarrity !
 2017-03-13 11:51:31 -04:00
Matthew Taylor
5ca880d16a still iterate over languages for views without l10n 
Fixes #1199 by continuing the iteration over languages even if a view doesn’t have an l10n file. The issue was that only the `en` language object was getting added when the view didn’t have an l10n file, because of the `hasOwnProperty` check. This adjusts it to iterate over languages anyways, and only ouput the `No translations for…` message if it’s for a language of a view that does have an l10n file.
 2017-03-13 10:00:30 -04:00
The_Grits
715b05fbdf whoops 
12th not 15th
 2017-03-08 18:20:28 -05:00
The_Grits
1794b30079 Update dates 
Costa Rica dates were updated, plus fixed a gotcha with the China dates
 2017-03-08 18:18:22 -05:00
Matthew Taylor
5634e993e9 Merge pull request #1237 from TheGrits/patch-3 
Fix gh-1232: Footer Links space-between
 2017-03-07 10:14:16 -05:00
chrisgarrity
91af38b8f0 Fixed Sardinian (#1236) 
Added sc to custom-locales with parent Italian (it).
 2017-03-07 09:41:11 -05:00
The_Grits
86b5e462c6 Between, not Around 2017-03-06 16:34:21 -05:00
Matthew Taylor
f76707381a Merge pull request #1235 from TheGrits/patch-3 
Fix gh-1234: Update China Conference
 2017-03-06 11:10:03 -05:00
Matthew Taylor
56bf384459 Merge pull request #1233 from mewtaylor/issue/max-chars 
Match `routeAlias` with that of `/jobs` route
 2017-03-06 10:23:44 -05:00
Matthew Taylor
8d2a43530e Merge pull request #1205 from TheGrits/patch-2 
Fix gh-1183: Remove slashes
 2017-03-06 10:11:43 -05:00
The_Grits
46a3cea40c Fix gh-1234: Update China Conference 2017-03-02 22:14:26 -05:00
Matthew Taylor
2954d0916b match routeAlias with that of /jobs route 
this `routeAlias` is being added as it’s own path pattern since it’s not matching the other one, causing us to hit our 512 char limit.
 2017-02-28 09:55:16 -05:00
Matthew Taylor
a170aec6d2 Merge pull request #1220 from TheGrits/patch-4 
Fix gh-1218: Community Moderator Page
 2017-02-28 09:38:44 -05:00
The_Grits
82af7786a0 Put back some slashes 2017-02-28 09:38:43 -05:00
The_Grits
c26e42f715 Change parenthesis 2017-02-28 09:34:20 -05:00
The_Grits
8772ab5605 Fix jobs-moderator route 2017-02-28 09:33:18 -05:00
Matthew Taylor
184947d3d9 Merge pull request #1215 from TheGrits/patch-3 
Fix gh-1214: Lowercase F in Family
 2017-02-24 13:40:53 -05:00
Ray Schamp
4e67f95577 Merge pull request #1229 from LLK/release/2.2.18 
[Develop] Release 2.2.18
 2017-02-24 12:05:06 -05: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