Commit graph

5915 commits

Author SHA1 Message Date
dependabot-preview[bot]
54e5013976
Merge pull request #4226 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200722030735 2020-07-22 03:30:57 +00:00
dependabot-preview[bot]
3561813877
Bump scratch-l10n from 3.10.20200720182215 to 3.10.20200722030735
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200720182215 to 3.10.20200722030735.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200720182215...3.10.20200722030735)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-22 03:12:34 +00:00
DD Liu
eefb77c398
Merge pull request #4224 from fsih/updateGui
Update gui
2020-07-21 18:41:37 -04:00
DD Liu
9a76d4dfff Update gui 2020-07-21 17:30:25 -04:00
dependabot-preview[bot]
15c65a3072
Merge pull request #4222 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200720192905 2020-07-21 15:43:27 +00:00
dependabot-preview[bot]
91fb6b55ce
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200717030138 to 0.1.0-prerelease.20200720192905.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200717030138...0.1.0-prerelease.20200720192905)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-21 15:25:32 +00:00
dependabot-preview[bot]
3b2cf6796e
Merge pull request #4218 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200720182215 2020-07-20 19:40:02 +00:00
picklesrus
34c8652ffb Fix capitalization: cookie library we use requires sameSite in opts object to have a lowercase s. 2020-07-20 15:32:54 -04:00
picklesrus
10a4e92d21 Make the cookie library set the SamSite cookie value to strict by default. If callers want to set it to something else, they can pass it through the opts object like they can 'exprires'.
Also added a test file for jar.js so I could test the set method. The 
other methods remain untested.
2020-07-20 15:18:09 -04:00
dependabot-preview[bot]
39116c09e1
Bump scratch-l10n from 3.10.20200715030910 to 3.10.20200720182215
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200715030910 to 3.10.20200720182215.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200715030910...3.10.20200720182215)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-20 18:43:56 +00:00
dependabot-preview[bot]
c8aa7250fc
Merge pull request #4213 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200717030138 2020-07-17 15:46:50 +00:00
picklesrus
fc65622aa2
Merge pull request #4201 from LLK/release/2020-07-16
[develop] Release/2020 07 16
2020-07-17 11:44:24 -04:00
picklesrus
32d1d8561e
Merge branch 'develop' into release/2020-07-16 2020-07-17 11:42:45 -04:00
dependabot-preview[bot]
36119b1258
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200716152052 to 0.1.0-prerelease.20200717030138.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200716152052...0.1.0-prerelease.20200717030138)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-17 15:28:46 +00:00
picklesrus
c8bfab9522
Merge pull request #4202 from LLK/release/2020-07-16
Release/2020 07 16
2020-07-17 09:51:01 -04:00
picklesrus
aafc3d938d
Merge pull request #4210 from picklesrus/update-gui-version-716-release
Update gui version hotfix/rever-scratch-render branch version.
2020-07-16 17:22:29 -04:00
picklesrus
fbf1e6e1f6 Update gui version hotfix/rever-scratch-render branch version. 2020-07-16 17:14:29 -04:00
dependabot-preview[bot]
08d20a8293
Merge pull request #4208 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200716152052 2020-07-16 15:51:34 +00:00
dependabot-preview[bot]
46253cf528
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200715032543 to 0.1.0-prerelease.20200716152052.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200715032543...0.1.0-prerelease.20200716152052)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-16 15:32:56 +00:00
picklesrus
52bbb2c1dd
Merge pull request #4200 from LLK/develop
Merge develop into release
2020-07-15 09:41:23 -04:00
dependabot-preview[bot]
fb640fa872
Merge pull request #4198 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200715030910 2020-07-15 13:19:16 +00:00
dependabot-preview[bot]
e02aea1b54
Bump scratch-l10n from 3.10.20200708030815 to 3.10.20200715030910
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200708030815 to 3.10.20200715030910.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200708030815...3.10.20200715030910)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-15 12:42:28 +00:00
dependabot-preview[bot]
9feb052933
Merge pull request #4199 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200715032543 2020-07-15 12:38:16 +00:00
dependabot-preview[bot]
dfa11f969f
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200709205146 to 0.1.0-prerelease.20200715032543.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200709205146...0.1.0-prerelease.20200715032543)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-15 12:20:25 +00:00
picklesrus
930d22747a
Merge pull request #4197 from LLK/revert-4195-updateGui
Revert "Update gui"
2020-07-15 08:00:32 -04:00
picklesrus
08ef78e711
Revert "Update gui" 2020-07-15 07:59:33 -04:00
DD Liu
276e2136c4
Merge pull request #4195 from fsih/updateGui
Update gui
2020-07-14 19:38:17 -04:00
DD Liu
f105b52b62 Update gui 2020-07-14 19:37:05 -04:00
dependabot-preview[bot]
55b232dc9e
Merge pull request #4182 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200709205146 2020-07-10 15:34:54 +00:00
dependabot-preview[bot]
b43e85fbf9
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200709155647 to 0.1.0-prerelease.20200709205146.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200709155647...0.1.0-prerelease.20200709205146)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-10 15:18:05 +00:00
Benjamin Wheeler
9460ccf982
Merge pull request #3799 from apple502j/fix-meta-without-login
Fix editor title when not logged in
2020-07-09 20:42:08 -04:00
Benjamin Wheeler
21ccd45f9b
Merge pull request #4121 from apple502j/wiki-link
Set wiki link per user's selected language
2020-07-09 14:20:28 -04:00
Benjamin Wheeler
e0d96ccd28
Merge pull request #4144 from benjiwheeler/new-scratcher-blocks-image
updated blocks new scratcher sees
2020-07-09 14:18:06 -04:00
Ben Wheeler
7b2cdc73f0 updated blocks new scratcher sees 2020-07-09 14:16:52 -04:00
dependabot-preview[bot]
5034c42f20
Merge pull request #4180 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200709155647 2020-07-09 16:51:57 +00:00
dependabot-preview[bot]
4571841781
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200708034512 to 0.1.0-prerelease.20200709155647.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200708034512...0.1.0-prerelease.20200709155647)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-09 16:34:55 +00:00
chrisgarrity
e3e1ffabfc
Merge pull request #4178 from LLK/release/2020-07-08
[Develop] Release 2020-07-08
2020-07-09 10:09:22 -04:00
chrisgarrity
164e58e67e
Merge pull request #4177 from LLK/release/2020-07-08
[Master] Release 2020-07-08
2020-07-09 09:41:13 -04:00
Benjamin Wheeler
6ac738f74e
Merge pull request #4179 from benjiwheeler/fix-remix-credit-wrap
add overflow settings to css for remix credit
2020-07-08 16:37:30 -04:00
Ben Wheeler
e46737cbc6 add overflow settings to css for remix credit 2020-07-08 15:55:02 -04:00
chrisgarrity
e5d2fd668f
Merge pull request #4176 from LLK/develop
Update release branch from develop
2020-07-08 12:13:39 -04:00
dependabot-preview[bot]
9090aab64f
Merge pull request #4174 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200708034512 2020-07-08 11:29:17 +00:00
dependabot-preview[bot]
484d8a519a
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200630140429 to 0.1.0-prerelease.20200708034512.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200630140429...0.1.0-prerelease.20200708034512)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-08 11:13:23 +00:00
dependabot-preview[bot]
923d011cac
Merge pull request #4173 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200708030815 2020-07-08 03:30:34 +00:00
dependabot-preview[bot]
ff2743bb5c
Bump scratch-l10n from 3.10.20200624030914 to 3.10.20200708030815
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200624030914 to 3.10.20200708030815.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200624030914...3.10.20200708030815)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-08 03:14:02 +00:00
picklesrus
7eef29c358
Merge pull request #4156 from picklesrus/redirect-join
Redirect the old join flow to the new one.
2020-06-30 13:13:49 -04:00
dependabot-preview[bot]
4a2ce58b4a
Merge pull request #4161 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200630140429 2020-06-30 15:42:08 +00:00
dependabot-preview[bot]
e89705d4b7
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200627070731 to 0.1.0-prerelease.20200630140429.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200627070731...0.1.0-prerelease.20200630140429)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-30 15:26:23 +00:00
Chris Willis-Ford
996a80d93d
Merge pull request #4145 from LLK/hotfix/scratch-desktop-evergreen
[Develop] use 'evergreen' URLs for Scratch Desktop downloads
2020-06-29 13:29:14 -07:00
Chris Willis-Ford
5a09f9cdb6
Merge pull request #4146 from LLK/hotfix/scratch-desktop-evergreen
[Master] use 'evergreen' URLs for Scratch Desktop downloads
2020-06-29 13:29:07 -07:00