Commit graph

6169 commits

Author SHA1 Message Date
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
DD Liu
264b16fa03
Merge pull request #4359 from LLK/release/2020-08-27
[Master] Release/2020-08-27
2020-08-27 10:54:30 -04:00
dependabot-preview[bot]
ac46dee2a0
Merge pull request #4363 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200826185301 2020-08-27 10:19:24 +00:00
dependabot-preview[bot]
ec5372af1a
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-08-27 10:05:41 +00:00
dependabot-preview[bot]
4cb62deb2d
Merge pull request #4353 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200826030836 2020-08-26 16:44:58 +00:00
dependabot-preview[bot]
6226c95e28
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-08-26 16:19:46 +00:00
DD Liu
f6ef0d427d
Merge pull request #4358 from LLK/develop
Release 2020-08-27
2020-08-26 12:18:12 -04:00
DD Liu
4d8dd47a7e
Merge pull request #4355 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200826103200
Bump scratch-gui from 0.1.0-prerelease.20200819123712 to 0.1.0-prerelease.20200826103200
2020-08-26 12:15:42 -04:00
DD Liu
0184a09312
Update .travis.yml
Remove those travis changes cuuuz I don't know what I'm doing
2020-08-26 12:01:15 -04:00
DD Liu
73bbf1fd33 Merge branch 'develop' into bumpGui 2020-08-26 11:57:34 -04:00
DD Liu
bc3245ec1c
Update .travis.yml
Try 2 to do the previous thing
2020-08-26 11:45:11 -04:00
Bryce Taylor
27991d5114
Merge pull request #4356 from LLK/revert-4261-move-my-stuff-tests-to-jest
Revert "Move my stuff tests to jest"
2020-08-26 11:40:33 -04:00
DD Liu
ff6fecc694
Update .travis.yml
Try to run smoke tests only on certain branches
2020-08-26 11:27:55 -04:00
Bryce Taylor
dfea370787
Revert "Move my stuff tests to jest" 2020-08-26 11:23:49 -04:00
dependabot-preview[bot]
d8525ab9fe
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200819123712 to 0.1.0-prerelease.20200826103200.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200819123712...0.1.0-prerelease.20200826103200)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-26 12:34:40 +00:00
BryceLTaylor
78c0720793 Add waits to my-stuff tests so they’ll pass on saucelabs 2020-08-21 10:12:12 -04:00
BryceLTaylor
1aa55ca5a2 Update Chrome version used by sauselabs in tests 2020-08-21 10:11:14 -04:00
picklesrus
9b910d900e
Merge pull request #4334 from LLK/release/2020-08-20
[Develop]Release/2020 08 20
2020-08-20 10:40:52 -04:00
Bryce Taylor
25dccfd9a6
Merge pull request #4261 from BryceLTaylor/move-my-stuff-tests-to-jest
Move my stuff tests to jest
2020-08-20 10:30:08 -04:00
picklesrus
f0694677ed
Merge pull request #4335 from LLK/release/2020-08-20
[master]Release/2020 08 20
2020-08-20 09:50:23 -04:00
picklesrus
6353a6c225
Merge pull request #4333 from LLK/develop
Merge develop into release
2020-08-19 09:57:14 -04:00
dependabot-preview[bot]
49560397d2
Merge pull request #4332 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200819123712 2020-08-19 13:49:36 +00:00
dependabot-preview[bot]
5e6ecead53
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200818201221 to 0.1.0-prerelease.20200819123712.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200818201221...0.1.0-prerelease.20200819123712)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-19 13:35:36 +00:00