scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 15:47:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
1559 commits 216 branches 1 tag 464 MiB
Commit graph

1559 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Taylor
b7bfaec438 Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage 
Fix gh-979: TTT page
 2016-11-18 17:41:58 -05:00
Matthew Taylor
e6de0d0ba4 Merge pull request #1018 from mewtaylor/issue/gh-995 
Fix GH-995: Make cards tweaks
 2016-11-18 17:41:49 -05:00
Matthew Taylor
9ca54e83ce Merge pull request #1008 from mewtaylor/issue/gh-980 
Implement GH-980: add new TTT modal component
 2016-11-18 17:41:26 -05:00
Ray Schamp
36b28e69f4 Merge pull request #1004 from LLK/hotfix/hoc-url 
[Master] Allow querystring in /hoc URL
 2016-11-07 16:39:41 -05:00
Ray Schamp
0b6d87fa91 Update pattern so rewrite accepts querystring too 2016-11-07 12:14:50 -05:00
Ray Schamp
7be6704b51 Allow querystring in /hoc URL 
We should fix this for every URL, but that is too large of a change for a hotfix
 2016-11-07 11:13:32 -05:00
Ray Schamp
dacc51d1ae Merge pull request #992 from LLK/release/2.2.14 
[Master] Release 2.2.14
 2016-10-31 16:25:04 -04:00
Ray Schamp
8976349d47 Merge branch 'master' of github.com:LLK/scratch-www into release/2.2.14 2016-10-31 16:06:08 -04:00
Matthew Taylor
c6ccf78b2f Revert "Update requirement string" temporarily 
This reverts commit 9f93340539. This is temporary, and we will add it back in once the Windows tool is ready.
 2016-10-28 08:00:14 -04:00
Matthew Taylor
7e04ae1088 Add w/o slash to the whitelist paths 
as recommended in https://github.com/LLK/scratchr2/pull/4127#issuecomment-256484893
 2016-10-27 08:38:17 -04:00
chrisgarrity
fa1b6c6c00 Merge pull request #948 from TheGrits/patch-1 
Fix gh-924: Localize Developers Page
 2016-10-20 17:52:16 -04:00
Connor Hudson
dc890d6db8 Merge pull request #964 from technoboy10/gh899-searchbarundefined 
Fix GH-899: Re-searching should not search for 'undefined'
 2016-10-20 12:51:50 -07:00
Technoboy10
3777ab825c make fix simpler by using value instead of defaultValue 2016-10-20 13:17:23 -06:00
Matthew Taylor
f2b7d4fcf7 Merge pull request #976 from mewtaylor/issue/gh-856 
Implement GH-856: Add new cards and card thumbs to www
 2016-10-20 11:23:57 -04:00
Matthew Taylor
88a78480ba Back to hide-and-seek with new cards 2016-10-19 16:54:24 -04:00
Matthew Taylor
cdf8059995 Change name to “Hide and Show” 2016-10-19 16:39:51 -04:00
Matthew Taylor
dc48dbb34a use var not const 
We’re not at es6 yet. My baaaaaaaaaaddddd
 2016-10-19 15:41:56 -04:00
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
e01afa0161 Add new cards and card thumbs to www 
Fixes #856. This also updates the styling of the `cards.jsx` view to follow the trello style guide, as previously discussed.
 2016-10-19 13:45:37 -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
Matthew Taylor
67d62cc4c1 Merge pull request #961 from chrisgarrity/gh940-missing-i18n 
[Master] Hotfix - update build-locales script
 2016-10-16 22:36:51 -04:00
Ray Schamp
55179074c7 Merge pull request #969 from rschamp/bugfix/white-page-of-death 
[Master] Use no-cache so ETags are used
 2016-10-14 16:02:24 -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
Technoboy10
4a610296e2 Add check for undefined formData 2016-10-12 16:09:00 -06: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
The_Grits
8de70e8882 FormattedHTMLMessage fix 2016-10-11 20:38:01 -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
The_Grits
009b6eb75a Finish Localization and Implementation 2016-10-05 23:03:23 -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
The_Grits
e0026d5c44 Part 1 2016-10-05 00:05:03 -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