The_Grits
8ae401e861
Move mobile rule
2017-05-03 15:58:14 -04:00
Andrew Sliwinski
52b6ed9eb8
Merge pull request #1271 from TheGrits/patch-5
...
Fix gh-875: Double Search Bar
2017-05-03 14:37:02 -04:00
Matthew Taylor
b1e33a2933
Merge pull request #1299 from TheGrits/patch-9
...
Fix gh-1294: Unlocalize Browser Links
2017-05-03 14:33:50 -04:00
Matthew Taylor
3a27b1d2e2
Apply english strings as default translations
...
This fixes #1303 by ensuring that, if a language does not have a string, the default will be applied.
2017-05-03 14:21:27 -04:00
Matthew Taylor
787040b972
Merge pull request #1297 from TheGrits/patch-8
...
Fix gh-1296: Add DD Liu to Credits Page
2017-05-03 11:48:01 -04:00
Ray Schamp
ed2cd81a7a
Merge pull request #1300 from St19Galla/patch-1
...
Fix gh-1282 ~ Add "United States" to faq/educators page
2017-05-02 18:15:34 -04:00
Matthew Taylor
9195f21717
Merge pull request #1302 from LLK/release/10th-anniversary
...
[Develop] Release for 10th anniversary
2017-05-02 16:51:50 -04:00
Matthew Taylor
d33cd6cf4b
Merge pull request #1301 from LLK/release/10th-anniversary
...
[Master] Release for 10th anniversary
2017-05-02 16:51:41 -04:00
St19_Galla
f82d5f8341
add US to educators
2017-05-02 15:34:57 -04:00
St19_Galla
5083614f48
add US to faq
2017-05-02 15:33:31 -04:00
The_Grits
a837c05ac7
Remove localized Microsoft links
2017-05-02 15:29:00 -04:00
The_Grits
5822b2facb
Update Firefox Link
2017-05-02 13:38:00 -04:00
The_Grits
0a747f68bd
Add DD Liu
...
Resolves #1296
2017-05-01 11:24:55 -04:00
Matthew Taylor
00b80b40f3
Merge pull request #1295 from mewtaylor/issue/r2-4586
...
Implement r2-4586: Add anniversary banner
2017-05-01 07:35:31 -04:00
Matthew Taylor
d6f8b2fa9e
add card tutorial redirect
2017-04-28 13:43:18 -04:00
Matthew Taylor
a950c91725
Add studio link
2017-04-28 09:09:06 -04:00
Matthew Taylor
fc075aedaf
Add anniversary banner
2017-04-28 08:51:40 -04:00
The_Grits
83baa2ada6
import frameless
2017-04-26 23:14:50 -04:00
The_Grits
8f827d812a
Re-add min-width for mobile
2017-04-26 23:13:24 -04:00
Matthew Taylor
5152a337f0
Merge pull request #1290 from LLK/release/2.2.20
...
[Develop] Release 2.2.20
2017-04-26 22:20:16 -04:00
Matthew Taylor
aef7b5e834
Merge pull request #1291 from LLK/release/2.2.20
...
[Master] Release 2.2.20
2017-04-26 22:20:07 -04:00
Matthew Taylor
ff0c5eaa05
remove unused variable
2017-04-26 08:40:58 -04:00
Matthew Taylor
905fe8ac10
Remove setBucketNameHeader
...
Missed this one – it’s now covered in the custom vcl
2017-04-26 08:35:15 -04:00
Matthew Taylor
51036209f2
Merge pull request #1287 from mewtaylor/issue/fastly-config
...
Use custom VCL for Pass/!Pass conditions
2017-04-26 08:24:38 -04:00
Matthew Taylor
d563535ba5
Move string set methods out of fastly-extended
...
This also moves all helper methods in `configure-fastly` into a separate utility file, and adds some additional unit tests for those utilities now that they are separated.
2017-04-25 13:18:13 -04:00
Matthew Taylor
ca067fdc5e
Use custom VCL for Pass/!Pass conditions
...
We’ve now exceeded our max number of characters for a condition in the Fastly API, and we need to make it larger to accommodate regex conditionals that can match on any of the routes in www currently.
This fixes the issue by moving the conditions – and the states that are affected by it, like setting the backend or cache ttls – to two custom vcl files that are updated via the Fastly API. One is for the `vcl_rev` config, and one is for the `vcl_fetch` config.
2017-04-25 11:06:57 -04:00
Matthew Taylor
f511035450
Merge pull request #1279 from mewtaylor/issue/gh-1278
...
Fix GH-1278: Use birthOffset for age check
2017-04-24 16:51:36 -04:00
Matthew Taylor
aed3093bc0
Change invalidation to year
2017-04-21 07:51:03 -04:00
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
