Commit graph

5733 commits

Author SHA1 Message Date
Benjamin Wheeler
1f1a8f1ceb
Merge pull request #4096 from LLK/hotfix/remove-opt-in
[Master] remove email opt-in from join flow
2020-06-15 13:09:03 -04:00
Ben Wheeler
924c862b9e remove email opt-in from join flow 2020-06-12 12:35:34 -04:00
DD Liu
d88105f5e1
Merge pull request #4085 from LLK/release/2020-06-11
[Master] Release/2020-06-11
2020-06-11 14:42:54 -04:00
DD Liu
cbebdd9586
Merge pull request #4087 from LLK/develop
Bring in revert svg-renderer
2020-06-10 20:34:14 -04:00
DD Liu
b64e5574dd
Merge pull request #4086 from fsih/updateGui
Update gui
2020-06-10 20:02:59 -04:00
DD Liu
1149e9ec71 Update gui 2020-06-10 20:01:42 -04:00
dependabot-preview[bot]
397f191993
Merge pull request #4081 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.9.20200609200912 2020-06-10 19:10:43 +00:00
DD Liu
8d06b4e79f
Merge pull request #4083 from LLK/develop
Merge develop
2020-06-10 14:43:53 -04:00
dependabot-preview[bot]
2be1dbec81
Bump scratch-l10n from 3.9.20200603151351 to 3.9.20200609200912
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.9.20200603151351 to 3.9.20200609200912.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.9.20200603151351...3.9.20200609200912)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-10 18:40:59 +00:00
DD Liu
2f1224e79b
Merge pull request #4082 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200610141359
Bump scratch-gui from 0.1.0-prerelease.20200609204212 to 0.1.0-prerelease.20200610141359
2020-06-10 14:36:58 -04:00
dependabot-preview[bot]
92cc61d669
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200609204212 to 0.1.0-prerelease.20200610141359.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200609204212...0.1.0-prerelease.20200610141359)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-10 14:25:20 +00:00
DD Liu
9f4ba05a27
Merge pull request #4080 from fsih/updateGui
Update gui
2020-06-09 17:31:51 -04:00
DD Liu
60608dbb39 Update gui 2020-06-09 16:57:21 -04:00
Benjamin Wheeler
77494f0370
Merge pull request #2518 from benjiwheeler/small-player-project-page
Fix page width by hiding overflow, letting stage width be flexible
2020-06-08 16:50:37 -04:00
Chris Willis-Ford
b9f19d30fb
Merge pull request #4070 from LLK/hotfix/release-scratch-desktop-3.11.1
[Develop] update scratch-desktop download links for 3.11.1
2020-06-08 12:48:42 -07:00
Chris Willis-Ford
d1d72f9ec2
Merge pull request #4071 from LLK/hotfix/release-scratch-desktop-3.11.1
[Master] update scratch-desktop download links for 3.11.1
2020-06-08 12:48:38 -07:00
dependabot-preview[bot]
a42ccd63f1
Merge pull request #4075 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200605203024 2020-06-08 17:12:31 +00:00
dependabot-preview[bot]
7e6ba273b7
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200603203751 to 0.1.0-prerelease.20200605203024.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200603203751...0.1.0-prerelease.20200605203024)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-08 16:52:23 +00:00
Christopher Willis-Ford
5d7df5c546 update scratch-desktop download links for 3.11.1 2020-06-05 15:52:06 -07:00
Benjamin Wheeler
1058414d63
Merge pull request #4064 from LLK/release/2020-06-03
[Master] Release/2020-06-03
2020-06-04 13:19:39 -04:00
Benjamin Wheeler
9fdd2e6207
Merge pull request #4063 from LLK/release/2020-06-03
[Develop] Release/2020-06-03
2020-06-04 13:19:29 -04:00
Benjamin Wheeler
3e31a20c49
Merge pull request #4061 from LLK/develop
merge from develop to release branch
2020-06-03 17:01:41 -04:00
DD Liu
5af694fdd8
Merge pull request #4062 from fsih/updateGui
Update gui
2020-06-03 17:01:29 -04:00
DD Liu
be999d7e4f Update gui 2020-06-03 17:00:17 -04:00
dependabot-preview[bot]
e5518abb72
Merge pull request #4058 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.9.20200603151351 2020-06-03 18:50:02 +00:00
dependabot-preview[bot]
18b0763faa
Bump scratch-l10n from 3.9.20200528181319 to 3.9.20200603151351
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.9.20200528181319 to 3.9.20200603151351.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.9.20200528181319...3.9.20200603151351)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-03 18:29:13 +00:00
dependabot-preview[bot]
464d862c15
Merge pull request #4057 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200602220926 2020-06-03 13:33:33 +00:00
dependabot-preview[bot]
499860d546
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200602161028 to 0.1.0-prerelease.20200602220926.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200602161028...0.1.0-prerelease.20200602220926)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-03 13:12:56 +00:00
dependabot-preview[bot]
3555e90b4b
Merge pull request #4056 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200602161028 2020-06-02 16:53:21 +00:00
dependabot-preview[bot]
475572d5b8
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200602042025 to 0.1.0-prerelease.20200602161028.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/commits/0.1.0-prerelease.20200602161028)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-02 16:34:07 +00:00
dependabot-preview[bot]
82d375d13b
Merge pull request #4055 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200602042025 2020-06-02 15:20:18 +00:00
dependabot-preview[bot]
adb3ad60c6
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200530204959 to 0.1.0-prerelease.20200602042025.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-02 15:01:15 +00:00
dependabot-preview[bot]
dd54d28760
Merge pull request #4053 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200530204959 2020-06-01 15:08:22 +00:00
dependabot-preview[bot]
68452dd322
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200528204019 to 0.1.0-prerelease.20200530204959.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200528204019...0.1.0-prerelease.20200530204959)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-01 14:50:21 +00:00
picklesrus
b38aae433a
Merge pull request #4030 from LLK/release/2020-05-28
[Develop] Release/2020 05 28
2020-05-29 10:37:20 -04:00
dependabot-preview[bot]
810ff308ca
Merge pull request #4049 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200528204019 2020-05-29 13:10:15 +00:00
dependabot-preview[bot]
dcc9505dcb
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200528151750 to 0.1.0-prerelease.20200528204019.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200528151750...0.1.0-prerelease.20200528204019)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-29 12:51:59 +00:00
dependabot-preview[bot]
ca95659334
Merge pull request #4047 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.9.20200528181319 2020-05-28 18:54:38 +00:00
picklesrus
e78cc8c559
Merge pull request #4029 from LLK/release/2020-05-28
[Master] Release/2020 05 28
2020-05-28 14:31:16 -04:00
dependabot-preview[bot]
0e76e30141
Bump scratch-l10n from 3.9.20200528120215 to 3.9.20200528181319
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.9.20200528120215 to 3.9.20200528181319.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.9.20200528120215...3.9.20200528181319)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-28 18:30:48 +00:00
Benjamin Wheeler
f2e376a90c
Merge pull request #4046 from LLK/benjiwheeler-readme-contributor-guidelines
Add README link to contributor guidelines
2020-05-28 14:10:28 -04:00
Benjamin Wheeler
1acd09ddd1
Add README link to contributor guidelines 2020-05-28 14:09:42 -04:00
Benjamin Wheeler
311f84b09a
Merge pull request #4045 from LLK/benjiwheeler-contributor-guidelines
Update contributor guidelines with new version
2020-05-28 14:07:20 -04:00
Benjamin Wheeler
d34c989934
Update contributor guidelines with new version from 3rd party contributor group 2020-05-28 14:06:30 -04:00
dependabot-preview[bot]
cfb4d85444
Merge pull request #4043 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200528151750 2020-05-28 16:31:05 +00:00
dependabot-preview[bot]
b9bdc96184
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200527204130 to 0.1.0-prerelease.20200528151750.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200527204130...0.1.0-prerelease.20200528151750)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-28 15:29:49 +00:00
dependabot-preview[bot]
db315da165
Merge pull request #4041 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.9.20200528120215 2020-05-28 15:25:38 +00:00
dependabot-preview[bot]
996bbb8795
Bump scratch-l10n from 3.9.20200527202656 to 3.9.20200528120215
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.9.20200527202656 to 3.9.20200528120215.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.9.20200527202656...3.9.20200528120215)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-28 15:05:00 +00:00
dependabot-preview[bot]
1f7b21fc4a
Merge pull request #4039 from LLK/dependabot/npm_and_yarn/eslint-plugin-cypress-2.11.1 2020-05-28 00:51:46 +00:00
dependabot-preview[bot]
a78852fe6b
Bump eslint-plugin-cypress from 2.11.0 to 2.11.1
Bumps [eslint-plugin-cypress](https://github.com/cypress-io/eslint-plugin-cypress) from 2.11.0 to 2.11.1.
- [Release notes](https://github.com/cypress-io/eslint-plugin-cypress/releases)
- [Commits](https://github.com/cypress-io/eslint-plugin-cypress/compare/v2.11.0...v2.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-28 00:33:57 +00:00