Commit graph

5993 commits

Author SHA1 Message Date
Benjamin Wheeler
150296af72
Revert "Add node12 support, Fix #4025" 2020-06-25 08:41:28 -04:00
Benjamin Wheeler
6a4ed0eaa9
Merge pull request #4026 from southwolf/fix-node12-support
Add node12 support, Fix #4025
2020-06-24 22:58:38 -04:00
Eric Rosenbaum
46b1872aee
Merge pull request #4138 from LLK/develop
merge from develop to release branch
2020-06-24 09:30:12 -04:00
dependabot-preview[bot]
a244280a6e
Merge pull request #4135 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200624030914 2020-06-24 07:30:56 +00:00
dependabot-preview[bot]
82fe6fe10e
Bump scratch-l10n from 3.10.20200622132359 to 3.10.20200624030914
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200622132359 to 3.10.20200624030914.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200622132359...3.10.20200624030914)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-24 07:10:37 +00:00
dependabot-preview[bot]
011567b0dc
Merge pull request #4130 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200622200348 2020-06-23 00:11:49 +00:00
dependabot-preview[bot]
ccf5502deb
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200622192120 to 0.1.0-prerelease.20200622200348.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200622192120...0.1.0-prerelease.20200622200348)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-22 23:50:43 +00:00
dependabot-preview[bot]
c2f835f687
Merge pull request #4129 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200622132359 2020-06-22 21:11:11 +00:00
dependabot-preview[bot]
4e8dddb429
Bump scratch-l10n from 3.10.20200617210158 to 3.10.20200622132359
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200617210158 to 3.10.20200622132359.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200617210158...3.10.20200622132359)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-22 20:10:55 +00:00
dependabot-preview[bot]
3e44014b62
Merge pull request #4127 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200622192120 2020-06-22 20:06:47 +00:00
dependabot-preview[bot]
a17ddd874b
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200618185940 to 0.1.0-prerelease.20200622192120.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200618185940...0.1.0-prerelease.20200622192120)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-22 19:41:04 +00:00
apple502j
927a4b915b
Fix welcomingcommittee mention link href 2020-06-20 16:31:01 +09:00
Benjamin Wheeler
dc79eb54c3
Merge pull request #3974 from benjiwheeler/move-to-country-data-lib
move country name lookup to library
2020-06-19 10:44:26 -04:00
Ben Wheeler
d388eef59f renamed lookupCountryInfo and lookupCountryName functions 2020-06-19 10:42:34 -04:00
dependabot-preview[bot]
7b76c19557
Merge pull request #4123 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200618185940 2020-06-19 14:11:45 +00:00
dependabot-preview[bot]
9a34de0903
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200618175748 to 0.1.0-prerelease.20200618185940.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200618175748...0.1.0-prerelease.20200618185940)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-19 13:50:18 +00:00
Karishma Chadha
c55ac9d750
Merge pull request #4120 from LLK/release/2020-06-17
[Develop] Release 2020-06-17
2020-06-18 15:54:45 -04:00
Karishma Chadha
50e67799aa
Merge pull request #4119 from LLK/release/2020-06-17
[Master] Release 2020-06-17
2020-06-18 15:31:06 -04:00
DD Liu
82e7273af4
Merge pull request #4122 from LLK/hotfix/revertInfGraphics
Pull in revert from vm via gui
2020-06-18 14:20:35 -04:00
DD Liu
420e3e5700 Pull in revert from vm via gui 2020-06-18 14:17:46 -04:00
apple502j
a903e3e9b2 Set wiki link per user's selected language 2020-06-18 20:22:22 +09:00
dependabot-preview[bot]
cdd33ffa1c
Merge pull request #3880 from LLK/dependabot/npm_and_yarn/extend-3.0.2 2020-06-18 03:19:18 +00:00
Karishma Chadha
fb46c113a8
Merge pull request #4118 from LLK/develop
Merge from develop to release branch
2020-06-17 23:19:16 -04:00
dependabot-preview[bot]
b730de7895
[Security] Bump extend from 3.0.0 to 3.0.2
Bumps [extend](https://github.com/justmoon/node-extend) from 3.0.0 to 3.0.2. **This update includes a security fix.**
- [Release notes](https://github.com/justmoon/node-extend/releases)
- [Changelog](https://github.com/justmoon/node-extend/blob/master/CHANGELOG.md)
- [Commits](https://github.com/justmoon/node-extend/compare/v3.0.0...v3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-18 02:58:35 +00:00
Karishma Chadha
7e8431e544
Merge pull request #4117 from kchadha/update-gui
Pull in latest scratch-gui
2020-06-17 22:56:42 -04:00
Karishma Chadha
f071f814c1 Pull in latest scratch-gui 2020-06-17 22:54:16 -04:00
dependabot-preview[bot]
dae630c5b4
Merge pull request #4115 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200617210158 2020-06-17 22:24:50 +00:00
dependabot-preview[bot]
359c1e8942
Bump scratch-l10n from 3.10.20200617135753 to 3.10.20200617210158
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200617135753 to 3.10.20200617210158.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200617135753...3.10.20200617210158)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-17 22:03:49 +00:00
dependabot-preview[bot]
6ed3ab2d90
Merge pull request #4113 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200617161753 2020-06-17 16:54:51 +00:00
dependabot-preview[bot]
90516db0e3
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200617042114 to 0.1.0-prerelease.20200617161753.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200617042114...0.1.0-prerelease.20200617161753)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-17 16:35:06 +00:00
dependabot-preview[bot]
5d0768e86e
Merge pull request #4112 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200617135753 2020-06-17 14:57:49 +00:00
dependabot-preview[bot]
ed10922ad7
Merge pull request #4111 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200617042114 2020-06-17 14:56:28 +00:00
dependabot-preview[bot]
ae478047d5
Bump scratch-l10n from 3.9.20200616200843 to 3.10.20200617135753
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.9.20200616200843 to 3.10.20200617135753.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.9.20200616200843...3.10.20200617135753)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-17 14:38:10 +00:00
dependabot-preview[bot]
fd4d0abdf3
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200616164225 to 0.1.0-prerelease.20200617042114.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200616164225...0.1.0-prerelease.20200617042114)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-17 14:36:31 +00:00
dependabot-preview[bot]
a65221d793
Merge pull request #4108 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.9.20200616200843 2020-06-17 04:21:12 +00:00
dependabot-preview[bot]
6332116214
Bump scratch-l10n from 3.9.20200615152937 to 3.9.20200616200843
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.9.20200615152937 to 3.9.20200616200843.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.9.20200615152937...3.9.20200616200843)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-17 03:51:58 +00:00
dependabot-preview[bot]
7a3e6aa79f
Merge pull request #4107 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200616164225 2020-06-16 19:13:40 +00:00
dependabot-preview[bot]
8fbf997c8e
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200610225210 to 0.1.0-prerelease.20200616164225.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200610225210...0.1.0-prerelease.20200616164225)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-16 18:53:39 +00:00
Benjamin Wheeler
2bf0071b3c
Merge pull request #4097 from LLK/hotfix/remove-opt-in
[Develop] remove email opt-in from join flow
2020-06-15 13:09:10 -04:00
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
dependabot-preview[bot]
8bdbe7ea3c
Merge pull request #4104 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.9.20200615152937 2020-06-15 16:21:01 +00:00
dependabot-preview[bot]
f4afefa1f6
Bump scratch-l10n from 3.9.20200609200912 to 3.9.20200615152937
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.9.20200609200912 to 3.9.20200615152937.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.9.20200609200912...3.9.20200615152937)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-15 15:58:11 +00:00
Boomer001
72d9ba25a9
Update splash.scss 2020-06-15 14:23:42 +02:00
Boomer001
a214ddbbde
Change to overflow-wrap 2020-06-14 12:05:42 +02:00
Boomer001
9b380e9ed4
Fix text overflow in what's happening 2020-06-14 11:18:50 +02:00
R4356th
997806a8a8
Fix Translators page URL 2020-06-13 18:22:24 +06:00
Ben Wheeler
924c862b9e remove email opt-in from join flow 2020-06-12 12:35:34 -04:00
DD Liu
2ee370473f
Merge pull request #4094 from LLK/master
Merge pull request #4085 from LLK/release/2020-06-11
2020-06-11 15:01:29 -04:00
DD Liu
24258070fc
Merge pull request #4084 from LLK/release/2020-06-11
[Develop] Release/2020-06-11
2020-06-11 14:43:01 -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