scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-12 08:41:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
6131 commits 221 branches 1 tag 507 MiB
Commit graph

6131 commits

This branch
This branch
All branches
Author SHA1 Message Date
Karishma Chadha
a2651b7493
Merge pull request #4279 from LLK/release/2020-08-05 
[Master] Release 2020-08-06
 2020-08-06 15:47:01 -04:00
DD Liu
a3b34b9ab5 Contains reverts in paint and render 2020-08-06 15:27:42 -04:00
picklesrus
7d470131d7 Add check for existence of messageTimeoutId before clearing the timeout. 2020-08-06 13:22:49 -04:00
picklesrus
25b9bacd0e Update comment to match code 2020-08-06 13:13:12 -04:00
picklesrus
6078c3653b Puts back the original change but sets the default to Lax instead of Strict. Scratchr2 needs these cookies sent on top level navigations. 2020-08-05 10:50:06 -04:00
Karishma Chadha
2b8aafb401
Merge pull request #4277 from LLK/develop 
Prepare release branch with latest changes from develop
 2020-08-05 10:26:33 -04:00
dependabot-preview[bot]
e4c517086e
Merge pull request #4276 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200805054801 2020-08-05 13:51:06 +00:00
dependabot-preview[bot]
cf66522117
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200804162018 to 0.1.0-prerelease.20200805054801.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200804162018...0.1.0-prerelease.20200805054801)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-05 13:36:18 +00:00
dependabot-preview[bot]
52efb59d58
Merge pull request #4275 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200805030706 2020-08-05 05:49:42 +00:00
dependabot-preview[bot]
3c0031284a
Bump scratch-l10n from 3.10.20200729030742 to 3.10.20200805030706 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200729030742 to 3.10.20200805030706.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200729030742...3.10.20200805030706)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-05 05:36:15 +00:00
Ray Schamp
5c4868fb44
Merge pull request #4274 from LLK/hotfix/fix-scss 
Fix bad variable interpolation/calculation in frameless scss
 2020-08-04 16:29:32 -04:00
dependabot-preview[bot]
de6d1bcbc8
Merge pull request #4270 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200804162018 2020-08-04 18:02:31 +00:00
dependabot-preview[bot]
484e58d517
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200731053101 to 0.1.0-prerelease.20200804162018.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200731053101...0.1.0-prerelease.20200804162018)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-04 17:44:29 +00:00
picklesrus
48590766de
Merge pull request #4258 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200731053101 
Bump scratch-gui from 0.1.0-prerelease.20200730115315 to 0.1.0-prerelease.20200731053101
 2020-08-04 13:30:49 -04:00
rschamp
01cf9ca5b5 Fix bad variable interpolation/calculation 
This used to work, even though it shouldn’t have. Upgrading node-sass caused our breakpoints to … break
 2020-08-04 13:04:25 -04:00
dependabot-preview[bot]
8c8fdf84fa
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200730115315 to 0.1.0-prerelease.20200731053101.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200730115315...0.1.0-prerelease.20200731053101)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-03 20:56:56 +00:00
picklesrus
133dd14cc9
Merge pull request #4267 from LLK/hotfix/cookie-rollback 
[Develop] Hotfix/cookie rollback
 2020-08-03 16:52:53 -04:00
picklesrus
aa6fa5eadf
Merge pull request #4266 from LLK/hotfix/cookie-rollback 
Hotfix/cookie rollback Revert samesite cookie change
 2020-08-03 16:36:53 -04:00
Bryce Taylor
1c486df202
Merge pull request #4265 from BryceLTaylor/update-node-version 
Update node version used by travis and node-sass
 2020-08-03 15:58:40 -04:00
picklesrus
a77366a0f1
Update package-lock to match what's on master. 2020-08-03 15:49:54 -04:00
BryceLTaylor
313b4f8955 Update node version used by travis and node-sass 2020-08-03 15:39:44 -04:00
Christopher Willis-Ford
5384ad71b9 finish renaming 'Scratch Desktop' to 'Scratch' 
- adjust macOS installation instructions to mention "Scratch" instead of
  "Scratch Desktop"
- edit the DMG screenshot to fix the app name, DMG title, and DMG icon
 2020-08-03 12:08:35 -07:00
picklesrus
40e6d0dae8
Merge pull request #4262 from LLK/revert-4219-update-cookie-jar 
Revert 4219 update cookie jar
 2020-08-03 14:54:15 -04:00
picklesrus
e375bfa099
Merge branch 'hotfix/cookie-rollback' into revert-4219-update-cookie-jar 2020-08-03 14:52:06 -04:00
picklesrus
e46177cb11
Update package.json 2020-08-03 14:48:20 -04:00
picklesrus
62629413a7
Revert "Make the cookie library set the SameSite cookie value to strict by default" 2020-08-03 14:45:34 -04:00
dependabot-preview[bot]
5cdc191b82
Merge pull request #4256 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200730115315 2020-07-30 18:57:39 +00:00
dependabot-preview[bot]
86f0beb1f2
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200729231141 to 0.1.0-prerelease.20200730115315.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200729231141...0.1.0-prerelease.20200730115315)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-07-30 18:38:18 +00:00
picklesrus
a67a34a06c remove stray debugger 2020-07-30 11:08:34 -04:00
picklesrus
0036550ae8 Move timeout id out of state to a member variable and add some unittests. 2020-07-30 10:55:18 -04:00
Benjamin Wheeler
770eea0857
Merge pull request #4248 from LLK/release/2020-07-30 
[Master] Release/2020-07-30
 2020-07-30 10:49:42 -04:00
dependabot-preview[bot]
3dc582f463
Merge pull request #4254 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200729231141 2020-07-30 11:58:42 +00:00
dependabot-preview[bot]
bf5f5c69fb
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200729205656 to 0.1.0-prerelease.20200729231141.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200729205656...0.1.0-prerelease.20200729231141)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-07-30 11:40:16 +00:00
dependabot-preview[bot]
4557b1b3e2
Merge pull request #4253 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200729205656 2020-07-29 21:43:50 +00:00
dependabot-preview[bot]
25939fc24b
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200729032223 to 0.1.0-prerelease.20200729205656.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200729032223...0.1.0-prerelease.20200729205656)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-07-29 21:22:20 +00:00
Ben Wheeler
965d19448b bump gui version so it has correct paint version 2020-07-29 17:22:19 -04:00
dependabot-preview[bot]
c997e1aa8d
Merge pull request #4252 from LLK/dependabot/npm_and_yarn/elliptic-6.5.3 2020-07-29 21:10:16 +00:00
dependabot-preview[bot]
f5743f5787
[Security] Bump elliptic from 6.5.0 to 6.5.3 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.0 to 6.5.3. **This update includes a security fix.**
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.0...v6.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-07-29 20:50:00 +00:00
Benjamin Wheeler
ec07227af9
Merge pull request #4250 from LLK/develop 
Pull in fix to footer test
 2020-07-29 14:51:11 -04:00
Benjamin Wheeler
e7a5605fd4
Merge pull request #4249 from BryceLTaylor/fix-footer-tests 
Remove tap.plan() from footer links test
 2020-07-29 14:50:29 -04:00
BryceLTaylor
ff9d15d24f Remove tap.plan() from footer links test 2020-07-29 14:45:42 -04:00
Benjamin Wheeler
0dadc58059
Merge pull request #4246 from LLK/develop 
Update release branch to include develop
 2020-07-29 14:20:20 -04:00
Bryce Taylor
4b95b32380
Merge pull request #4241 from BryceLTaylor/address-skipped-tests 
Removed skipped footer integration tests
 2020-07-29 11:18:27 -04:00
dependabot-preview[bot]
2d00bc2d2a
Merge pull request #4245 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200729032223 2020-07-29 14:11:19 +00:00
dependabot-preview[bot]
4e16484df2
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200728212904 to 0.1.0-prerelease.20200729032223.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200728212904...0.1.0-prerelease.20200729032223)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-07-29 13:52:22 +00:00
dependabot-preview[bot]
79b8efa9aa
Merge pull request #4244 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200729030742 2020-07-29 03:32:35 +00:00
dependabot-preview[bot]
26040885c7
Bump scratch-l10n from 3.10.20200722030735 to 3.10.20200729030742 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200722030735 to 3.10.20200729030742.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200722030735...3.10.20200729030742)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-07-29 03:12:42 +00:00
DD Liu
2af3627d45
Merge pull request #4243 from fsih/updateGui 
Update gui
 2020-07-28 18:08:50 -04:00
DD Liu
835526b058 Update gui 2020-07-28 18:07:11 -04:00
BryceLTaylor
b24fa33c8d Removed skipped footer integration tests 2020-07-28 16:59:41 -04:00