scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 09:35:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
1535 commits 216 branches 1 tag 474 MiB
Commit graph

1535 commits

This branch
This branch
All branches
Author SHA1 Message Date
chrisgarrity
991ce989be Merge pull request #929 from tmickel/feature/developers-scratchjr 
Add ScratchJr to developers page
 2016-10-19 15:29:25 -04:00
Matthew Taylor
252b7b3405 Merge pull request #973 from mewtaylor/issue/scratch-flash-1165 
Remove Khmer from language list
 2016-10-18 16:35:35 -04:00
Matthew Taylor
f8a6d975c7 Merge pull request #951 from mewtaylor/issue/ban-whitelist 
Don’t redirect banned user on community guidelines
 2016-10-18 16:35:08 -04:00
Matthew Taylor
505c581864 Remove Khmer from language list 
This language needs some updates on the editor/block translations before we can add it back in – see https://github.com/LLK/scratch-flash/issues/1165
 2016-10-17 16:37:46 -04:00
Ray Schamp
3c7c758903 Merge pull request #970 from rschamp/bugfix/white-page-of-death 
[Develop] Use no-cache so ETags are used
 2016-10-14 15:17:28 -04:00
Ray Schamp
1fea24fd5c Use no-cache so ETags are used 
From https://developers.google.com/web/fundamentals/performance/optimizing-content-efficiency/http-caching

> "no-cache" indicates that the returned response can't be used to satisfy a subsequent request to the same URL without first checking with the server if the response has changed. As a result, if a proper validation token (ETag) is present, no-cache incurs a roundtrip to validate the cached response, but can eliminate the download if the resource has not changed.

This is what we want to happen.
 2016-10-14 15:08:34 -04:00
Ray Schamp
b88a965f18 Merge pull request #967 from St19Galla/patch-1 
Fix gh-965 - Projects Curated by space
 2016-10-13 17:49:44 -04:00
St19_Galla
bb20fa3375 single quotes whoops! 2016-10-13 17:31:57 -04:00
St19_Galla
5775cedc7a add space 2016-10-13 17:26:46 -04:00
St19_Galla
d6680f129f Update l10n.json 2016-10-13 17:25:44 -04:00
St19_Galla
e3452e3ea1 Add space in curator row 2016-10-13 15:51:17 -04:00
chrisgarrity
4074b986c2 Merge pull request #960 from chrisgarrity/gh940-missing-i18n 
Fix gh-940: missing translations
 2016-10-12 16:28:34 -04:00
chrisgarrity
29b104741f Added tests for duplicate strings in build-locales merge 
Also took out default messages for strings that are in the l10n json files.
 2016-10-12 09:41:06 -04:00
Matthew Taylor
ffb84874f2 Merge pull request #953 from mewtaylor/issue/smarty-streets-strict 
[Master] Hotfix: loosen restrictions on smartystreets check
 2016-10-11 23:04:18 -04:00
chrisgarrity
5b2ff1a4ca Update md5map fixtures for tests 
Also cleaned up comments from @mewtaylor
 2016-10-11 19:28:13 -04:00
Matthew Taylor
36992e7d8d Merge pull request #939 from TheGrits/patch-2 
Fix gh-938: Update Privacy Policy
 2016-10-11 15:12:18 -04:00
chrisgarrity
1339683a73 Fix #940 
Most problems were due to strings being duplicated and overwriting each other. Updated the build-locales script to keep track of duplicates.
Project Curated by on the splash page was just missing the formatMessage call.
 2016-10-11 12:33:31 -04:00
The_Grits
9f93340539 Fix #930: Update requirement string 2016-10-11 12:33:30 -04:00
Matthew Taylor
cd9720f0f1 Merge pull request #954 from mewtaylor/issue/smarty-streets-strict 
[Develop] Hotfix: loosen restrictions on smartystreets check
 2016-10-06 16:46:57 -04:00
Matthew Taylor
7540ee45e3 loosen restrictions on smartystreets check 
re-fixes #828 by loosening restrictions on the check once again (see https://smartystreets.com/docs/us-street-api#match-strategy)
 2016-10-06 16:36:27 -04:00
Andrew Sliwinski
e058ed6d7c Merge pull request #952 from St19Galla/patch-1 
Add Travis-CI
 2016-10-06 16:23:28 -04:00
St19_Galla
b83a3825e9 Add Travis-CI 2016-10-06 15:55:00 -04:00
The_Grits
dd4550899b unbold 2016-10-06 10:44:08 -04:00
Matthew Taylor
e1e9455866 Don’t redirect banned user on comm. guideliens 
Goes along with https://github.com/LLK/scratchr2/pull/4127.
 2016-10-05 17:49:18 -04:00
Matthew Taylor
603a1336ce Merge pull request #931 from TheGrits/patch-1 
Fix gh-930: Update requirement string
 2016-10-04 20:47:58 -04:00
Ray Schamp
4083479c9e Merge pull request #944 from LLK/release/2.2.13 
[Develop] Release 2.2.13
 2016-10-04 15:48:24 -04:00
Ray Schamp
040d1a4d6f Merge pull request #943 from LLK/release/2.2.13 
[Master] Release 2.2.13
 2016-10-04 15:48:11 -04:00
Matthew Taylor
6bcc7eeae3 Update make it fly hoc image to be higher res 
Higher res AND SMALLER FILE SIZE?!?! This really is 2016. We live in an amazing time.
 2016-10-03 16:40:57 -04:00
The_Grits
53e3e34a52 Update link, add reviewed date 2016-10-03 16:12:14 -04:00
Matthew Taylor
c44742e668 Slight content edits to hoc page 
updates the studio links, and also fixes a link issue for the dance activity. Thanks @jwzimmer!
 2016-10-03 16:04:19 -04:00
Ray Schamp
d3452ad256 Merge pull request #937 from rschamp/update-credits 
Move Randy Jou to previous Scratch Team section
 2016-10-03 11:40:11 -04:00
Ray Schamp
6fa1c13cfb Move Randy Jou to previous Scratch Team section 2016-10-03 11:39:21 -04:00
Matthew Taylor
5c3cba2a89 Merge pull request #935 from mewtaylor/issue/gh-933 
Fix GH-933: Put label for “Not Required” above input
 2016-10-02 11:46:02 -04:00
Matthew Taylor
99cedec978 Put label for “Not Required” above input 
Fixes #933
 2016-09-30 15:02:05 -04:00
The_Grits
4413213caa Fix #930: Update requirement string 2016-09-28 08:10:11 -04:00
Tim Mickel
aea35c5b8c
Add ScratchJr to developers page 2016-09-26 11:57:52 -04:00
Ray Schamp
bf10176313 Merge pull request #926 from rschamp/hotfix/deploy-cache 
[Master] Add Cache-Control header to all S3 uploads
 2016-09-21 17:01:35 -04:00
Ray Schamp
1e7bd97987 Merge pull request #910 from rschamp/bugfix/787 
Add Cache-Control header to all S3 uploads
 2016-09-21 16:51:38 -04:00
jwzimmer
5245e93176 Merge pull request #920 from jwzimmer/issue/gh-590-initial-automated-test 
Fix GH-590: initial automated test
 2016-09-21 14:13:03 -04:00
jwzimmer
7b59953d84 removed console log statement accidentally left from testing 2016-09-21 10:45:55 -04:00
jwzimmer
e06cf2b134 simplify checking that the href is at the end of the url with ray's suggestion 2016-09-21 10:41:24 -04:00
Matthew Taylor
42b6e59443 Merge pull request #921 from mewtaylor/issue/gh-903-hoc 
Implement GH-903: Update hoc page with new tutorials
 2016-09-21 08:21:03 -04:00
Ray Schamp
162aa25856 Merge pull request #923 from LLK/hotfix/session-cookie 
Remove interactions with session cookie
 2016-09-20 19:52:08 -04:00
Matthew Taylor
0156fe8c77 Add cards for fly and make music 2016-09-19 15:59:40 -04:00
jwzimmer
867c95b382 travis checks 2016-09-19 13:11:24 -04:00
jwzimmer
57ab628337 check only the href, not the URL. i'm not sure this is a good way to do this. may be too convoluted. 2016-09-19 13:02:16 -04:00
Ray Schamp
2d22f6fa3d Merge pull request #912 from rschamp/bugfix/http-only-session 
Remove interactions with session cookie
 2016-09-19 12:04:17 -04:00
jwzimmer
579ec72818 removed ^ prefix from selenium dev dependency 2016-09-15 14:10:47 -04:00
jwzimmer
eaaa2faf2a replaced tab with 4 spaces 2016-09-15 13:28:17 -04:00
jwzimmer
eb788acac0 require statements on separate lines and travis check failires 2016-09-15 13:22:53 -04:00