Commit graph

5681 commits

Author SHA1 Message Date
picklesrus
e78cc8c559
Merge pull request #4029 from LLK/release/2020-05-28
[Master] Release/2020 05 28
2020-05-28 14:31:16 -04:00
DD Liu
82ed186c26
Merge pull request #4037 from LLK/develop
Update gui to pull in latest scratch-vm and l10n changes
2020-05-27 17:08:36 -04:00
DD Liu
41ee110bd9
Merge pull request #4036 from fsih/updateGui
Update gui to pull in latest VM
2020-05-27 17:07:18 -04:00
DD Liu
b634b660fe Update gui to pull in latest VM 2020-05-27 17:06:12 -04:00
dependabot-preview[bot]
3b75f35bf7
Merge pull request #4034 from LLK/dependabot/npm_and_yarn/eslint-plugin-cypress-2.11.0 2020-05-27 20:56:57 +00:00
dependabot-preview[bot]
a0cac71a0c
Merge pull request #4033 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.9.20200527200321 2020-05-27 20:47:55 +00:00
dependabot-preview[bot]
79f5164f17
Bump eslint-plugin-cypress from 2.10.3 to 2.11.0
Bumps [eslint-plugin-cypress](https://github.com/cypress-io/eslint-plugin-cypress) from 2.10.3 to 2.11.0.
- [Release notes](https://github.com/cypress-io/eslint-plugin-cypress/releases)
- [Commits](https://github.com/cypress-io/eslint-plugin-cypress/compare/v2.10.3...v2.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-27 20:39:07 +00:00
dependabot-preview[bot]
aca066fd86
Bump scratch-l10n from 3.9.20200527185330 to 3.9.20200527200321
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.9.20200527185330 to 3.9.20200527200321.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/commits/3.9.20200527200321)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-27 20:18:24 +00:00
dependabot-preview[bot]
f0d93319e8
Merge pull request #4031 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.9.20200527185330 2020-05-27 20:11:15 +00:00
dependabot-preview[bot]
de9b047029
Bump scratch-l10n from 3.9.20200526213608 to 3.9.20200527185330
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.9.20200526213608 to 3.9.20200527185330.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-27 19:51:58 +00:00
picklesrus
bf73ad231f
Merge pull request #4028 from LLK/develop
Merge develop into release 2020-05-28
2020-05-27 15:19:10 -04:00
dependabot-preview[bot]
cd310587bb
Merge pull request #4022 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200526230527 2020-05-27 12:24:40 +00:00
dependabot-preview[bot]
983e190a01
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200522205519 to 0.1.0-prerelease.20200526230527.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200522205519...0.1.0-prerelease.20200526230527)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-27 12:07:16 +00:00
dependabot-preview[bot]
73a68505ea
Merge pull request #4021 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.9.20200526213608 2020-05-26 22:01:14 +00:00
dependabot-preview[bot]
f0e3c543d1
Bump scratch-l10n from 3.9.20200519213537 to 3.9.20200526213608
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.9.20200519213537 to 3.9.20200526213608.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-26 21:41:03 +00:00
picklesrus
25428e1247
Merge pull request #3902 from LLK/dependabot/npm_and_yarn/cookie-0.4.1
Bump cookie from 0.2.2 to 0.4.1
2020-05-26 10:06:33 -04:00
dependabot-preview[bot]
f7cb247ea1
Merge pull request #4018 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200522205519 2020-05-25 16:59:22 +00:00
dependabot-preview[bot]
fb8fe821eb
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200520192204 to 0.1.0-prerelease.20200522205519.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200520192204...0.1.0-prerelease.20200522205519)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-25 16:41:50 +00:00
chrisgarrity
cc7cfef7bb
Merge pull request #4010 from LLK/release/2020-05-21
[Develop] Release 2020-05-21
2020-05-21 14:11:36 -04:00
chrisgarrity
f431577068
Merge pull request #4011 from LLK/release/2020-05-21
[Master] Release 2020-05-21
2020-05-21 14:11:20 -04:00
chrisgarrity
efffb4dc01
Merge pull request #4009 from LLK/develop
Update release branch with develop changes
2020-05-20 16:36:32 -04:00
dependabot-preview[bot]
a5d1bd3283
Merge pull request #4008 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200520192204 2020-05-20 20:19:59 +00:00
dependabot-preview[bot]
6fc311b9dc
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200520185723 to 0.1.0-prerelease.20200520192204.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200520185723...0.1.0-prerelease.20200520192204)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-20 19:52:17 +00:00
chrisgarrity
68fcf18496
Merge pull request #4007 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200520185723
Update scratch-gui to the latest version 🚀
2020-05-20 15:41:02 -04:00
greenkeeper[bot]
aa26f7be9d
chore(package): update lockfile package-lock.json 2020-05-20 19:08:30 +00:00
greenkeeper[bot]
fba6376297
chore(package): update scratch-gui to version 0.1.0-prerelease.20200520185723 2020-05-20 19:08:26 +00:00
dependabot-preview[bot]
6e81447e70
Merge pull request #3999 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.9.20200519213537 2020-05-19 22:27:01 +00:00
dependabot-preview[bot]
287d4d931e
Bump scratch-l10n from 3.9.20200512220101 to 3.9.20200519213537
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.9.20200512220101 to 3.9.20200519213537.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-19 22:04:55 +00:00
dependabot-preview[bot]
6b0028f9a9
Merge pull request #3996 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200519024705 2020-05-19 12:21:36 +00:00
dependabot-preview[bot]
61158977bc
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200517055834 to 0.1.0-prerelease.20200519024705.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200517055834...0.1.0-prerelease.20200519024705)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-19 12:04:10 +00:00
DD Liu
4f1dcaf7f3
Merge pull request #3994 from LLK/master
Merge pull request #3984 from LLK/hotfix/stretchyPaint
2020-05-18 16:09:52 -04:00
DD Liu
ee6b462421
Merge pull request #3983 from LLK/hotfix/stretchyPaint
[Develop] Hotfix/stretchy paint
2020-05-18 16:08:54 -04:00
DD Liu
c067d4fcf5
Merge branch 'develop' into hotfix/stretchyPaint 2020-05-18 16:08:39 -04:00
DD Liu
64753b79e9
Merge pull request #3984 from LLK/hotfix/stretchyPaint
[Master] Hotfix/stretchy paint
2020-05-18 16:06:39 -04:00
dependabot-preview[bot]
5547b2b9f5
Merge pull request #3992 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200517055834 2020-05-18 14:44:02 +00:00
dependabot-preview[bot]
02e8e1c772
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200514184528 to 0.1.0-prerelease.20200517055834.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/commits/0.1.0-prerelease.20200517055834)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-18 14:26:38 +00:00
Sarah Otts
6904f50718
Merge pull request #3973 from seotts/add-disrespectful-report
Add disrespectful report option, reorder options
2020-05-15 10:43:29 -04:00
dependabot-preview[bot]
4014297716
Merge pull request #3988 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200514184528 2020-05-15 13:22:28 +00:00
dependabot-preview[bot]
542cb25c90
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200514133224 to 0.1.0-prerelease.20200514184528.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-15 13:04:08 +00:00
DD Liu
68710c0480
Merge pull request #3982 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200514184528
Update scratch-gui to the latest version 🚀
2020-05-14 15:32:35 -04:00
Eric Rosenbaum
abe43a13c5
Merge pull request #3978 from LLK/release/2020-05-14
[Develop] Release 2020-05-14
2020-05-14 15:18:23 -04:00
greenkeeper[bot]
10ee3bd893
chore(package): update lockfile package-lock.json 2020-05-14 18:57:42 +00:00
greenkeeper[bot]
dd89f2d5cb
chore(package): update scratch-gui to version 0.1.0-prerelease.20200514184528 2020-05-14 18:57:38 +00:00
Eric Rosenbaum
5d062c9955
Merge pull request #3977 from LLK/release/2020-05-14
[Master] Release 2020-05-14
2020-05-14 14:38:59 -04:00
dependabot-preview[bot]
3a58289e00
Merge pull request #3981 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200514133224 2020-05-14 16:44:30 +00:00
dependabot-preview[bot]
ac33a3136e
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200513040928 to 0.1.0-prerelease.20200514133224.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200513040928...0.1.0-prerelease.20200514133224)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-14 16:27:29 +00:00
Eric Rosenbaum
d96bf4444a
Merge pull request #3976 from LLK/develop
merge from develop to release branch
2020-05-13 15:49:49 -04:00
Chris Willis-Ford
1bab2bb59a
Merge pull request #3856 from cwillisf/day1-student-country-default
default student's country to educator's during reg
2020-05-13 11:11:18 -07:00
Ben Wheeler
4bd813629f safer referencing of teacher country 2020-05-13 13:20:36 -04:00
seotts
52b8dff59a Add disrespectful report option, reorder options 2020-05-13 11:41:05 -04:00