picklesrus
|
0d836101b4
|
Put back changes that shouldn't overwritten
I made some merge mistakes and selenium-helpers.js shouldn't have a diff.
|
2020-09-24 10:57:19 -04:00 |
|
picklesrus
|
aa5699956f
|
Merge pull request #4446 from LLK/release/2020-09-24
Release/2020 09 24
|
2020-09-24 10:32:08 -04:00 |
|
picklesrus
|
dbea248f4a
|
Merge pull request #4450 from LLK/revert-4435-stop-smoke-on-prs
Revert 4435 stop smoke on prs
|
2020-09-24 10:09:52 -04:00 |
|
picklesrus
|
3384e9f2f1
|
Back out unrelated changes.
|
2020-09-24 10:05:47 -04:00 |
|
picklesrus
|
a1593abd0f
|
Revert "Stop running smoke tests unless the branch pushes to prod or staging."
|
2020-09-24 09:59:28 -04:00 |
|
Bryce Taylor
|
6321e40eda
|
Merge pull request #4420 from BryceLTaylor/pin-remote-chrome
Pin chrome version for saucelabs to chromedriver version
|
2020-09-24 09:15:55 -04:00 |
|
BryceLTaylor
|
2e79da8a1c
|
Use const instead of let when finding chrome version
|
2020-09-23 17:06:13 -04:00 |
|
BryceLTaylor
|
a2d2eca54c
|
change chromedriver version to a const
|
2020-09-23 17:02:55 -04:00 |
|
BryceLTaylor
|
ebc54bb100
|
get chromedriver version from the package
|
2020-09-23 16:59:00 -04:00 |
|
picklesrus
|
6c8b0e89aa
|
Merge pull request #4444 from LLK/develop
Merge develop into release.
|
2020-09-23 12:23:10 -04:00 |
|
dependabot-preview[bot]
|
add1dd250e
|
Merge pull request #4443 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200923151703
|
2020-09-23 16:15:04 +00:00 |
|
dependabot-preview[bot]
|
8e53e4e7d4
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200923103548 to 0.1.0-prerelease.20200923151703.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200923103548...0.1.0-prerelease.20200923151703)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-09-23 16:01:15 +00:00 |
|
dependabot-preview[bot]
|
52a1864a65
|
Merge pull request #4441 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200923103548
|
2020-09-23 11:10:36 +00:00 |
|
dependabot-preview[bot]
|
13f7035671
|
Merge pull request #4440 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200923030814
|
2020-09-23 11:06:24 +00:00 |
|
dependabot-preview[bot]
|
df3a30b86a
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200918100203 to 0.1.0-prerelease.20200923103548.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200918100203...0.1.0-prerelease.20200923103548)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-09-23 11:01:43 +00:00 |
|
dependabot-preview[bot]
|
05e852d8a3
|
Bump scratch-l10n from 3.10.20200916030802 to 3.10.20200923030814
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200916030802 to 3.10.20200923030814.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200916030802...3.10.20200923030814)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-09-23 10:57:34 +00:00 |
|
picklesrus
|
a1cf882cdd
|
Merge pull request #4435 from LLK/stop-smoke-on-prs
Stop running smoke tests unless the branch pushes to prod or staging.
|
2020-09-22 17:18:42 -04:00 |
|
BryceLTaylor
|
01c920ece2
|
Update travis.yml to send environment variables for project page tests
|
2020-09-22 16:51:33 -04:00 |
|
BryceLTaylor
|
a5f0628751
|
Move project page tests to jest
|
2020-09-22 16:30:18 -04:00 |
|
dependabot-preview[bot]
|
fbfe0003a6
|
Merge pull request #4439 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200918100203
|
2020-09-19 10:35:42 +00:00 |
|
dependabot-preview[bot]
|
e804eb8d1b
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200917100214 to 0.1.0-prerelease.20200918100203.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200917100214...0.1.0-prerelease.20200918100203)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-09-19 10:19:41 +00:00 |
|
picklesrus
|
9730b10971
|
Stop running smoke tests except on unless we push or prod or staging.
Motivation: stop running them on dependapot branches/PRs since they
don't make sense.
|
2020-09-17 15:20:39 -04:00 |
|
Eric Rosenbaum
|
7c1fabf258
|
Merge pull request #4428 from LLK/release/2020-09-16
[Develop] Release 2020-09-16
|
2020-09-17 12:09:23 -04:00 |
|
Eric Rosenbaum
|
4d94d488d6
|
Merge pull request #4427 from LLK/release/2020-09-16
[Master] Release 2020-09-16
|
2020-09-17 10:15:40 -04:00 |
|
dependabot-preview[bot]
|
1ee7b7ea5b
|
Merge pull request #4429 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200917100214
|
2020-09-17 10:28:41 +00:00 |
|
dependabot-preview[bot]
|
a9e1ef9988
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200916123032 to 0.1.0-prerelease.20200917100214.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200916123032...0.1.0-prerelease.20200917100214)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-09-17 10:05:33 +00:00 |
|
Eric Rosenbaum
|
200e824047
|
Merge pull request #4426 from LLK/develop
merge from develop to release branch
|
2020-09-16 11:56:46 -04:00 |
|
picklesrus
|
cd27868b8c
|
Merge pull request #4425 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200916123032
Bump scratch-gui from 0.1.0-prerelease.20200915205011 to 0.1.0-prerelease.20200916123032
|
2020-09-16 09:39:46 -04:00 |
|
dependabot-preview[bot]
|
ba920132b2
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200915205011 to 0.1.0-prerelease.20200916123032.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200915205011...0.1.0-prerelease.20200916123032)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-09-16 13:08:55 +00:00 |
|
dependabot-preview[bot]
|
9a77d1060e
|
Merge pull request #4424 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200916030802
|
2020-09-16 11:05:32 +00:00 |
|
dependabot-preview[bot]
|
e6c88918ac
|
Bump scratch-l10n from 3.10.20200909030847 to 3.10.20200916030802
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200909030847 to 3.10.20200916030802.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200909030847...3.10.20200916030802)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-09-16 10:42:31 +00:00 |
|
dependabot-preview[bot]
|
e4f027003b
|
Merge pull request #4423 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200915205011
|
2020-09-15 21:49:03 +00:00 |
|
dependabot-preview[bot]
|
dff70f2194
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200915153607 to 0.1.0-prerelease.20200915205011.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200915153607...0.1.0-prerelease.20200915205011)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-09-15 21:33:07 +00:00 |
|
dependabot-preview[bot]
|
e1829943ef
|
Merge pull request #4422 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200915153607
|
2020-09-15 17:56:43 +00:00 |
|
dependabot-preview[bot]
|
3d597e1079
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200914181056 to 0.1.0-prerelease.20200915153607.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200914181056...0.1.0-prerelease.20200915153607)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-09-15 17:41:24 +00:00 |
|
dependabot-preview[bot]
|
2e4765981b
|
Merge pull request #4421 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200914181056
|
2020-09-15 02:16:08 +00:00 |
|
dependabot-preview[bot]
|
f2ab2ff994
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200910095745 to 0.1.0-prerelease.20200914181056.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200910095745...0.1.0-prerelease.20200914181056)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-09-15 01:59:30 +00:00 |
|
Benjamin Wheeler
|
b33bdfa306
|
Merge pull request #4291 from Accio1/Add-Redirects-for-2-Tutorials
Add redirects for Animate a Character and Video Sensing Tutorials
|
2020-09-14 15:42:04 -04:00 |
|
BryceLTaylor
|
8d5b139595
|
Pin chrome version for saucelabs to chromedriver version
|
2020-09-14 15:25:01 -04:00 |
|
dependabot-preview[bot]
|
da10257165
|
Merge pull request #4415 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200910095745
|
2020-09-11 10:10:55 +00:00 |
|
dependabot-preview[bot]
|
b29b410ffa
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200909212039 to 0.1.0-prerelease.20200910095745.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200909212039...0.1.0-prerelease.20200910095745)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-09-11 09:54:57 +00:00 |
|
dependabot-preview[bot]
|
3286ec6dc3
|
Merge pull request #4413 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200909212039
|
2020-09-10 10:19:45 +00:00 |
|
dependabot-preview[bot]
|
16bc62f4d0
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200908214811 to 0.1.0-prerelease.20200909212039.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200908214811...0.1.0-prerelease.20200909212039)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-09-10 09:56:19 +00:00 |
|
dependabot-preview[bot]
|
c2419743fd
|
Merge pull request #4412 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200909030847
|
2020-09-09 21:46:55 +00:00 |
|
dependabot-preview[bot]
|
3a32c9d3b2
|
Bump scratch-l10n from 3.10.20200902030719 to 3.10.20200909030847
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200902030719 to 3.10.20200909030847.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200902030719...3.10.20200909030847)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-09-09 21:30:25 +00:00 |
|
Karishma Chadha
|
9e95c121c1
|
Merge pull request #4409 from LLK/hotfix/update-blocks-translations
[Develop] Hotfix - Update Blocks Translations 2020-09-09
|
2020-09-09 14:40:56 -04:00 |
|
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 |
|