scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-21 04:52:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
6392 commits 221 branches 1 tag 522 MiB
Commit graph

6392 commits

This branch
This branch
All branches
Author SHA1 Message Date
Karishma Chadha
a3482ac77a
Merge branch 'develop' into hotfix/update-blocks-translations 2020-09-09 14:40:32 -04:00
Karishma Chadha
195a5a1911
Merge pull request #4408 from LLK/hotfix/update-blocks-translations 
[Master] Hotfix - Update Blocks Translations 2020-09-09
 2020-09-09 14:13:46 -04:00
Karishma Chadha
ae60c71e51 Pull in gui hotfix changes 2020-09-09 13:18:49 -04:00
dependabot-preview[bot]
7fb34f0369
Merge pull request #4404 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200904104311 2020-09-04 13:52:38 +00:00
dependabot-preview[bot]
a16ff6ce43
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200903194013 to 0.1.0-prerelease.20200904104311.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200903194013...0.1.0-prerelease.20200904104311)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-04 13:34:15 +00:00
dependabot-preview[bot]
c470d3f705
Merge pull request #4399 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200903194013 2020-09-04 10:42:35 +00:00
dependabot-preview[bot]
935c5d85a3
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200902141518 to 0.1.0-prerelease.20200903194013.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200902141518...0.1.0-prerelease.20200903194013)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-04 10:22:25 +00:00
Benjamin Wheeler
59d8052ccd
Merge pull request #4398 from LLK/master 
Merge from master into develop
 2020-09-03 12:30:11 -04:00
Benjamin Wheeler
9928d62a64
Merge pull request #4388 from LLK/release/2020-09-03 
[Develop] Release/2020-09-03
 2020-09-03 12:07:23 -04:00
Ben Wheeler
52ee0f9aa5 updated package-lock 2020-09-03 12:06:26 -04:00
DD Liu
8d1fd0a910 Bring in video motion fix 2020-09-03 12:06:26 -04:00
dependabot-preview[bot]
fdced6bbbb Bump scratch-l10n from 3.10.20200826030836 to 3.10.20200902030719 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200826030836 to 3.10.20200902030719.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200826030836...3.10.20200902030719)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-03 12:06:26 -04:00
dependabot-preview[bot]
315487a292 Bump scratch-l10n from 3.10.20200819030716 to 3.10.20200826030836 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200819030716 to 3.10.20200826030836.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200819030716...3.10.20200826030836)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-03 11:30:42 -04:00
Benjamin Wheeler
45c9fae93d
Merge pull request #4389 from LLK/release/2020-09-03 
[Master] Release/2020-09-03
 2020-09-03 11:29:16 -04:00
Ben Wheeler
a366d9320a updated package-lock 2020-09-03 10:50:11 -04:00
DD Liu
b09ee9b467 Bring in video motion fix 2020-09-03 10:50:11 -04:00
dependabot-preview[bot]
d65067fba6 Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200901192704 to 0.1.0-prerelease.20200902141518.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200901192704...0.1.0-prerelease.20200902141518)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-03 10:50:11 -04:00
dependabot-preview[bot]
f478e86344 Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200831200304 to 0.1.0-prerelease.20200901192704.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200831200304...0.1.0-prerelease.20200901192704)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-03 10:50:11 -04:00
dependabot-preview[bot]
4fd3fb4051 Bump scratch-l10n from 3.10.20200826030836 to 3.10.20200902030719 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200826030836 to 3.10.20200902030719.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200826030836...3.10.20200902030719)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-03 10:50:10 -04:00
BryceLTaylor
bec30017da Update My-Stuff tests to correctly use ‘expect’ and remove sleeps 2020-09-03 10:49:21 -04:00
BryceLTaylor
629f3ddaaf Add waits to my-stuff tests so they’ll pass on saucelabs 2020-09-03 10:49:21 -04:00
BryceLTaylor
324d5d2ef8 Update Chrome version used by sauselabs in tests 2020-09-03 10:49:21 -04:00
Bryce Taylor
29a4cf5f1e Revert "Revert "Move my stuff tests to jest"" 2020-09-03 10:49:21 -04:00
DD Liu
660eaf84e8 Update gui 2020-09-03 10:49:21 -04:00
dependabot-preview[bot]
03aed2aba5 Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200827215238 to 0.1.0-prerelease.20200831200304.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200827215238...0.1.0-prerelease.20200831200304)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-03 10:49:21 -04:00
dependabot-preview[bot]
e917177f7e Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200826103200 to 0.1.0-prerelease.20200826185301.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200826103200...0.1.0-prerelease.20200826185301)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-03 10:44:29 -04:00
dependabot-preview[bot]
5ce5294f92 Bump scratch-l10n from 3.10.20200819030716 to 3.10.20200826030836 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200819030716 to 3.10.20200826030836.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200819030716...3.10.20200826030836)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-03 10:43:40 -04:00
DD Liu
0f4c632a76
Merge pull request #4375 from LLK/hotfix/videoMotionFix 
[Develop] Hotfix/video motion fix
 2020-09-02 16:20:05 -04:00
dependabot-preview[bot]
d87ca0db47
Merge pull request #4386 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200902141518 2020-09-02 16:42:15 +00:00
dependabot-preview[bot]
32e776e9b2
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200901192704 to 0.1.0-prerelease.20200902141518.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200901192704...0.1.0-prerelease.20200902141518)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-02 15:32:28 +00:00
dependabot-preview[bot]
b2e9dc826a
Merge pull request #4383 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200901192704 2020-09-02 13:58:43 +00:00
dependabot-preview[bot]
ec7881eb5f
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200831200304 to 0.1.0-prerelease.20200901192704.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200831200304...0.1.0-prerelease.20200901192704)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-02 13:20:31 +00:00
dependabot-preview[bot]
0f13271c85
Merge pull request #4384 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200902030719 2020-09-02 13:16:30 +00:00
dependabot-preview[bot]
d3b7313b8a
Bump scratch-l10n from 3.10.20200826030836 to 3.10.20200902030719 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200826030836 to 3.10.20200902030719.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200826030836...3.10.20200902030719)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-02 12:41:22 +00:00
Bryce Taylor
27844010f2
Merge pull request #4370 from LLK/revert-4356-revert-4261-move-my-stuff-tests-to-jest 
Revert "Revert "Move my stuff tests to jest""
 2020-09-01 16:14:57 -04:00
DD Liu
b85c590aaf
Merge pull request #4382 from fsih/20200901035827 
Update gui
 2020-09-01 14:35:48 -04:00
DD Liu
0a182e672a Update gui 2020-09-01 14:21:39 -04:00
dependabot-preview[bot]
d078d1d299
Merge pull request #4379 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200831200304 2020-09-01 03:47:27 +00:00
dependabot-preview[bot]
b9eaeca2bf
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200827215238 to 0.1.0-prerelease.20200831200304.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200827215238...0.1.0-prerelease.20200831200304)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-09-01 03:19:38 +00:00
DD Liu
89bb784a4d Merge hotfix commits into develop. Develop is ahead of hotfix so it shouldn't change anything, just keep master and develop in sync hopefully... 2020-08-31 13:54:50 -04:00
DD Liu
cfeba895fe
Merge pull request #4376 from LLK/hotfix/videoMotionFix 
[Master] Bring in video motion fix
 2020-08-31 13:49:14 -04:00
DD Liu
95844e176f Bring in video motion fix 2020-08-31 08:38:58 -04:00
Bryce Taylor
b06b3c27cc
Merge pull request #4371 from BryceLTaylor/fix-my-stuff-tests 
Fix my stuff tests
 2020-08-28 14:00:02 -04:00
Bryce Taylor
644774df24
Revert "Revert "Move my stuff tests to jest"" 2020-08-28 13:34:45 -04:00
DD Liu
f83a91a402
Merge pull request #4366 from fsih/updateGui 
Update GUI
 2020-08-27 22:51:14 -04:00
DD Liu
ddc9903666 Update GUI 2020-08-27 22:50:23 -04:00
picklesrus
d67dcdfbdf
Merge pull request #4364 from LLK/revert-4359-release/2020-08-27 
Revert "[Master] Release/2020-08-27"
 2020-08-27 15:41:49 -04:00
picklesrus
182a451982
Revert "[Master] Release/2020-08-27" 2020-08-27 15:40:31 -04:00
BryceLTaylor
e42ceaf78c Update My-Stuff tests to correctly use ‘expect’ and remove sleeps 2020-08-27 13:42:23 -04:00
DD Liu
ca623fe246
Merge pull request #4360 from LLK/release/2020-08-27 
[Develop] Release/2020-08-27
 2020-08-27 10:54:56 -04:00