Commit graph

7165 commits

Author SHA1 Message Date
dependabot-preview[bot]
b385288e39
Merge pull request #4155 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200627070731 2020-06-29 11:47:55 +00:00
dependabot-preview[bot]
cf50ee4d02
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200625213046 to 0.1.0-prerelease.20200627070731.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200625213046...0.1.0-prerelease.20200627070731)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-29 11:26:48 +00:00
GrahamSH-LLK
1b58769224
Update l10n.json 2020-06-28 14:08:33 -04:00
Ben Wheeler
374af98b3c revert guiPlayer switch to max-width 2020-06-26 15:25:10 -04:00
Ben Wheeler
3527e42529 use overflow auto in different place 2020-06-26 15:11:08 -04:00
dependabot-preview[bot]
0fe41b459d
Merge pull request #4148 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200625213046 2020-06-26 14:55:57 +00:00
dependabot-preview[bot]
220cdf4e73
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200625185338 to 0.1.0-prerelease.20200625213046.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200625185338...0.1.0-prerelease.20200625213046)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-26 14:40:17 +00:00
Christopher Willis-Ford
2088cf2276 use 'evergreen' URLs for Scratch Desktop downloads 2020-06-25 15:00:38 -07:00
dependabot-preview[bot]
6098ed842a
Merge pull request #4143 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200625185338 2020-06-25 20:30:43 +00:00
dependabot-preview[bot]
7c05ebf9e4
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200622200348 to 0.1.0-prerelease.20200625185338.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200622200348...0.1.0-prerelease.20200625185338)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-25 20:13:58 +00:00
Benjamin Wheeler
2a16790cb3
Merge pull request #3776 from apple502j/patch-15
Always apply min-height: 0
2020-06-25 16:10:54 -04:00
Benjamin Wheeler
08e8bb043c
Merge pull request #4125 from apple502j/patch-21
Fix welcomingcommittee mention link href
2020-06-25 14:45:03 -04:00
Benjamin Wheeler
a5e0fbc1ec
Merge pull request #4065 from GrahamSH-LLK/develop
Update Credits Page
2020-06-25 14:41:18 -04:00
Benjamin Wheeler
9766d84145
Merge pull request #4101 from BoomerScratch/patch-1
Fix text overflow in what's happening
2020-06-25 14:36:38 -04:00
Benjamin Wheeler
03c5f7f02c
Merge pull request #4099 from R4356th/patch-4
Update Translators page URL
2020-06-25 14:26:56 -04:00
Ben Wheeler
a635cd932c make scratchWikiLink prop 2020-06-25 14:09:32 -04:00
Benjamin Wheeler
b6270812a9
Merge pull request #4002 from R4356th/patch-1
Change the way usernames are handled
2020-06-25 13:44:17 -04:00
Benjamin Wheeler
75dbbd02bb
Merge pull request #4000 from apple502j/patch-17
Add iconAltText
2020-06-25 13:24:03 -04:00
Eric Rosenbaum
7d8536a7ad
Merge pull request #4140 from LLK/release/2020-06-24
[Develop] Release 2020-06-24
2020-06-25 11:23:58 -04:00
Eric Rosenbaum
4b1e8e85e6
Merge pull request #4139 from LLK/release/2020-06-24
[Master] Release 2020-06-24
2020-06-25 09:56:23 -04:00
Benjamin Wheeler
9dd8775e0b
Merge pull request #4142 from LLK/revert-4026-fix-node12-support
Revert "Add node12 support, Fix #4025"
2020-06-25 08:42:07 -04:00
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