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
1944 commits 217 branches 1 tag 479 MiB
Commit graph

1944 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Taylor
949a166c0f Merge pull request #1324 from mewtaylor/issue/api-250 
For api-250: Change explore endpoint
 2017-05-24 14:03:36 -04:00
jwzimmer
56b46fd861 Issue/gh 1013 remove end to end testing package dependencies from repo (#1319) 
* remove selenium from package.json

* Add package.json & README for the integration directory

* add newline at end of file

* add chromedriver dependency
 2017-05-24 10:12:37 -07:00
jwzimmer
bb5657587e Fix issue/gh 1313 by adding test to check for missing string ids (#1314) 
* test for missing string ids

* Switched to multiple tests (1 per intl page) and changed comment style

* Add back in comment I accidentally . Add comment for the function.

* Change variable names, call function in-line
 2017-05-24 10:11:07 -07:00
Matthew Taylor
a8cf1af73c Merge pull request #1316 from mewtaylor/issue/explore-projects 
Fix r2-3978: Use regex in express patterns to limit scope
 2017-05-24 12:49:09 -04:00
Matthew Taylor
79e778af7a make comment explanatory of new style 
Thanks @rschamp!
 2017-05-24 08:51:28 -04:00
Matthew Taylor
92cc4e22a3 Merge pull request #1323 from mewtaylor/issue/gh-1322 
Change conference date
 2017-05-24 08:43:23 -04:00
Matthew Taylor
373c7784c6 Change conference date 
Fixes #1322
 2017-05-24 08:42:25 -04:00
Matthew Taylor
332b17b429 Merge pull request #1321 from mewtaylor/issue/gh-1303-followup 
Fix 1303 Fallout: Apply defaults for untranslated pages too
 2017-05-23 13:22:55 -04:00
Matthew Taylor
bab863cd14 Apply defaults for untranslated pages too 
since we’ll need them for nav/footer strings
 2017-05-23 13:16:46 -04:00
Matthew Taylor
1a83b34387 Change explore endpoint 
For scratch-api#250
 2017-05-22 15:41:28 -04:00
Matthew Taylor
87da9f3d8a Use regex in express patterns to limit scope 
This fixes https://github.com/LLK/scratchr2/issues/3798 by using regex in expressjs patterns, and then also parsing those regex patterns for fastly, such that we can limit the scope of the regex created for a specific view
 2017-05-18 13:57:49 -04:00
Matthew Taylor
30bd5e435d Merge pull request #1305 from mewtaylor/issue/gh-1303 
Fix GH-1303: Apply english strings as defaults for views during builds
 2017-05-16 16:08:49 -04:00
Andrew Sliwinski
afe134a898 Merge pull request #1309 from thisandagain/hotfix/cm 
[Develop] Hotfix - Remove "Trust & Safety Manager" role from jobs page
 2017-05-15 11:37:38 -04:00
Matthew Taylor
5b3341673f Merge pull request #1312 from mewtaylor/hotfix/revert-birthday-banner 
[Develop] Hotfix: Remove 10th anniversary banner
 2017-05-15 11:23:41 -04:00
Matthew Taylor
ae53dcd746 Remove 10th banner 2017-05-15 11:08:15 -04:00
Andrew Sliwinski
042ae48408 Remove 'Trust & Safety Manager' role from jobs page 2017-05-14 12:52:53 -04:00
Matthew Taylor
a5281179cd Merge pull request #1293 from TheGrits/patch-4 
Fix gh-1292: Dropdown Mobile Un-Friendly
 2017-05-08 15:54:51 -04:00
The_Grits
f589ed0f4d Update dropdown.scss 2017-05-08 10:10:24 -04:00
Matthew Taylor
4967f315e8 Merge pull request #1139 from mewtaylor/cwillaim-feature/teacher-registration-flow-tests 
Tests for the teacher registration flow
 2017-05-04 08:39:08 -04:00
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