Commit graph

6099 commits

Author SHA1 Message Date
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
dependabot-preview[bot]
07b9489c5e
Merge pull request #4331 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200819030716 2020-08-19 04:16:13 +00:00
dependabot-preview[bot]
5c9491f617
Bump scratch-l10n from 3.10.20200812030801 to 3.10.20200819030716
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200812030801 to 3.10.20200819030716.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200812030801...3.10.20200819030716)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-19 04:02:33 +00:00
dependabot-preview[bot]
8ea1b233d1
Merge pull request #4330 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200818201221 2020-08-18 21:39:19 +00:00
dependabot-preview[bot]
af5c41520e
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200818184355 to 0.1.0-prerelease.20200818201221.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200818184355...0.1.0-prerelease.20200818201221)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-18 21:25:53 +00:00
BryceLTaylor
25355d053f Update README with information about usernames for integration tests. 2020-08-18 16:53:10 -04:00
BryceLTaylor
abd54491e9 Move My Stuff tests to Jest. Unskip some tests. 2020-08-18 16:53:10 -04:00
Ray Schamp
b1d5246eea
Merge pull request #4216 from R4356th/patch-8
Add overflow, white-space and text-overflow CSS elements
2020-08-18 16:26:47 -04:00
dependabot-preview[bot]
3f4258c468
Merge pull request #4329 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200818184355 2020-08-18 20:13:09 +00:00
dependabot-preview[bot]
7d22f8cda4
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200817211010 to 0.1.0-prerelease.20200818184355.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200817211010...0.1.0-prerelease.20200818184355)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-18 19:59:25 +00:00
dependabot-preview[bot]
f28091d441
Merge pull request #4328 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200817211010 2020-08-18 12:55:59 +00:00
dependabot-preview[bot]
e53d27aa83
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200817184434 to 0.1.0-prerelease.20200817211010.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200817184434...0.1.0-prerelease.20200817211010)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-18 12:42:46 +00:00
dependabot-preview[bot]
2f063ed3f4
Merge pull request #4327 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200817184434 2020-08-17 19:19:13 +00:00
dependabot-preview[bot]
814f4ae4d0
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200814024313 to 0.1.0-prerelease.20200817184434.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200814024313...0.1.0-prerelease.20200817184434)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-17 19:05:01 +00:00
dependabot-preview[bot]
36110cb79f
Merge pull request #4319 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200814024313 2020-08-14 20:11:09 +00:00
dependabot-preview[bot]
2fae70de8b
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200812071833 to 0.1.0-prerelease.20200814024313.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200812071833...0.1.0-prerelease.20200814024313)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-14 19:57:47 +00:00
Eric Rosenbaum
d536fe7017
Merge pull request #4307 from LLK/release/2020-08-12
[Develop] Release 2020-08-12
2020-08-13 11:22:29 -04:00
Eric Rosenbaum
61b6b118d8
Merge pull request #4306 from LLK/release/2020-08-12
[Master] Release 2020-08-12
2020-08-13 11:22:14 -04:00
Eric Rosenbaum
a4527abf80
Merge pull request #4305 from LLK/develop
merge from develop to release branch
2020-08-12 11:40:22 -04:00