scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-16 02:22:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2951 commits 220 branches 1 tag 512 MiB
Commit graph

2951 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Taylor
f61fe17353 use birthOffset for age validation 
Fixes #1278
 2017-04-20 16:47:35 -04:00
jwzimmer
de78abbea2 Issue/gh 1167 test splash page (#1185) 
* automated tests for footer links

* renamed navbar test file and removed footer links to separate file

* run with make smoke

* added tests for join scratch and sign in in navbar

* fix linter errors & update www links

* addressed some of ray's comments

* fix failing test - projects row link

* maybe fix error?

* continue switching to click, convert so it runs with disabled selenium promise manager, and refactor to be less location dependent

* finish switching off of implicit reliance on selenium promise manager
 2017-04-19 17:14:02 -04:00
Matthew Taylor
76c46be17b Merge pull request #1269 from mewtaylor/issue/r2-4470 
Fix R2-4470: Only allows birthdays >= 13 yrs old for teacher reg
 2017-04-19 16:41:09 -04:00
Sarah Otts
1789720ba4 Add card translations (#1275) 
* Added pdfs; added translations for /cards

* Added spanish cards to ttt page

* Added catalan cards to ttt and /cards

* Added zh-tw cards to /cards and /go and fixed /cards link for Fashion cards for all languages

* Removed duplicate starter link for ca, remove starter links for zh-tw (no translation)

fixes #1276 (swedish)
 2017-04-19 16:40:57 -04:00
Matthew Taylor
9c50f31ce3 Merge pull request #1270 from TheGrits/patch-4 
Fix gh-728: Align Misaligned Nav-bar Dropdown
 2017-04-19 16:40:15 -04:00
Matthew Taylor
791d62b8fe Merge pull request #1273 from LLK/revert-1266-issue/temp-remove-custom-rows 
Revert "[Master] Temp Hotfix: remove custom rows"
 2017-04-18 06:41:31 -04:00
Matthew Taylor
f2e4858868 Revert "[Master] Temp Hotfix: remove custom rows" 2017-04-18 06:36:39 -04:00
Matthew Taylor
6b513f82e0 Merge pull request #1268 from mewtaylor/issue/gh-1265 
[Develop] Hotfix GH-1265: Update jobs route to include moderator
 2017-04-14 14:20:20 -04:00
Matthew Taylor
cd3fb9245a Only apply offset to teachers 
thanks @chrisgarrity!
 2017-04-14 14:18:32 -04:00
The_Grits
5cc8911b04 Thanks Travis 2017-04-14 11:13:46 -04:00
The_Grits
d7e63aadee Fix gh-875: Double Search Bar 2017-04-14 10:08:17 -04:00
The_Grits
7c9f6f4fad Fix gh-728 
Fixes mis-aligned nav-bar dropdown
 2017-04-14 06:46:50 -04:00
Matthew Taylor
cb7ce8c71d update language for age validation 
thanks @TheGrits!
 2017-04-13 07:41:47 -04:00
Matthew Taylor
2c472b607a Only allows birthdays > 13 yrs old for teacher reg 
Helps fix https://github.com/LLK/scratchr2/issues/4470 from the UX side of things
 2017-04-12 17:41:43 -04:00
Matthew Taylor
12e87df7c3 Merge pull request #1257 from TheGrits/patch-4 
Nit-picky Developer Class Type
 2017-04-11 12:58:09 -04:00
Matthew Taylor
a56c8d0b37 Update jobs route to include moderator 
Fixes #1265 by updating the logic for checking the route to include an optional moderator endpoint check
 2017-04-11 12:57:02 -04:00
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