Commit graph

7571 commits

Author SHA1 Message Date
seotts
23f6ce281c remove duplicated css from credits page 2020-10-02 15:43:22 -04:00
seotts
204c532c4e connect PeopleGrid to css 2020-10-02 15:43:22 -04:00
seotts
74d18822e6 Make PeopleGrid component 2020-10-02 15:43:22 -04:00
picklesrus
6a6b90ebee
Merge pull request #4471 from LLK/release/2020-10-01
[Develop]Release/2020 10 01
2020-10-02 09:21:18 -04:00
dependabot-preview[bot]
8f808aef95
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200929205858 to 0.1.0-prerelease.20201001151313.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200929205858...0.1.0-prerelease.20201001151313)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-02 10:19:09 +00:00
Jeffalo
487c3f3dcd
the ubuntu one doesn't actually have http 2020-10-02 11:36:53 +02:00
Jeffalo
fb47e53fb6
make http into https 2020-10-02 11:33:37 +02:00
Jeffalo
03c6335fa5
added semicolon sorry 2020-10-02 08:16:04 +02:00
Jeffalo
c7f2f942d7
add non breaking space to real name warning 2020-10-02 07:14:23 +02:00
picklesrus
0288454aa6
Merge pull request #4472 from LLK/release/2020-10-01
Release/2020 10 01
2020-10-01 15:23:45 -04:00
Christopher Willis-Ford
4415f4249d update app name to 'Scratch 3', not 'Scratch' 2020-10-01 11:57:44 -07:00
Maxi-Mouse
6120339d26 Fix Load more scrolling 2020-10-01 20:17:27 +02:00
picklesrus
9ee2a4b04a
Merge pull request #4470 from LLK/develop
Merge develop into release
2020-09-30 15:24:46 -04:00
BryceLTaylor
7a50c04885 Move join integration tests to Jest, add some tests 2020-09-30 14:30:00 -04:00
dependabot-preview[bot]
63898a1b9d
Merge pull request #4467 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20200930030848 2020-09-30 10:18:37 +00:00
dependabot-preview[bot]
4772574984
Merge pull request #4466 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200929205858 2020-09-30 10:18:08 +00:00
dependabot-preview[bot]
21b2b3d26e
Bump scratch-l10n from 3.10.20200923030814 to 3.10.20200930030848
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200923030814 to 3.10.20200930030848.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200923030814...3.10.20200930030848)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-30 10:01:46 +00:00
dependabot-preview[bot]
fd7bd35413
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200928160206 to 0.1.0-prerelease.20200929205858.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200928160206...0.1.0-prerelease.20200929205858)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-30 09:59:46 +00:00
BryceLTaylor
02e3657bca Remove legacy project page tests 2020-09-29 10:57:18 -04:00
dependabot-preview[bot]
f00d4b0bfa
Merge pull request #4463 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200928160206 2020-09-29 01:49:37 +00:00
dependabot-preview[bot]
9785e9794d
Merge pull request #4462 from LLK/dependabot/npm_and_yarn/eslint-plugin-cypress-2.11.2 2020-09-29 01:47:23 +00:00
dependabot-preview[bot]
a5b66848a2
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200925102807 to 0.1.0-prerelease.20200928160206.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200925102807...0.1.0-prerelease.20200928160206)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-29 01:31:56 +00:00
dependabot-preview[bot]
eeecdb2353
Bump eslint-plugin-cypress from 2.11.1 to 2.11.2
Bumps [eslint-plugin-cypress](https://github.com/cypress-io/eslint-plugin-cypress) from 2.11.1 to 2.11.2.
- [Release notes](https://github.com/cypress-io/eslint-plugin-cypress/releases)
- [Commits](https://github.com/cypress-io/eslint-plugin-cypress/compare/v2.11.1...v2.11.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-29 01:30:28 +00:00
dependabot-preview[bot]
f3ca11e28d
Merge pull request #4460 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200925102807 2020-09-26 02:39:19 +00:00
dependabot-preview[bot]
da0fee8d2c
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200924105605 to 0.1.0-prerelease.20200925102807.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200924105605...0.1.0-prerelease.20200925102807)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-26 02:22:36 +00:00
picklesrus
cb9c81fbf1 Add regex to match branches we want to run on.
escape the forward slash

remove the slash altogether.

put slashes back

escape /

escape /'s properly.
2020-09-25 09:44:03 -04:00
dependabot-preview[bot]
79cffd366f
Merge pull request #4453 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200924105605 2020-09-25 10:17:45 +00:00
dependabot-preview[bot]
5109b9225a
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200923151703 to 0.1.0-prerelease.20200924105605.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200923151703...0.1.0-prerelease.20200924105605)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-25 10:00:15 +00:00
picklesrus
a23415f3e6
Merge pull request #4445 from LLK/release/2020-09-24
[Develop]Release/2020 09 24
2020-09-24 11:25:37 -04:00
picklesrus
d031797e11
Update selenium-helpers.js
Fix spacing
2020-09-24 10:58:09 -04:00
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