Commit graph

5700 commits

Author SHA1 Message Date
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
dependabot-preview[bot]
7a6661230b
Merge pull request #3972 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200513040928 2020-05-13 13:26:00 +00:00
dependabot-preview[bot]
86be0f1ea8
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200512134106 to 0.1.0-prerelease.20200513040928.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200512134106...0.1.0-prerelease.20200513040928)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-13 13:09:17 +00:00
dependabot-preview[bot]
3a66df50fd
Merge pull request #3970 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.9.20200512220101 2020-05-12 22:33:46 +00:00
dependabot-preview[bot]
1abcc5f7d9
Bump scratch-l10n from 3.9.20200512112117 to 3.9.20200512220101
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.9.20200512112117 to 3.9.20200512220101.
- [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-12 22:05:50 +00:00
chrisgarrity
7231569dae
Merge pull request #3871 from chrisgarrity/contact-us/handle-ios
Enable Help widget
2020-05-12 15:25:25 -04:00
dependabot-preview[bot]
c2dd7abe2d
Merge pull request #3968 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200512134106 2020-05-12 14:37:01 +00:00
dependabot-preview[bot]
ed402c5673
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200512121336 to 0.1.0-prerelease.20200512134106.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200512121336...0.1.0-prerelease.20200512134106)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-12 14:12:18 +00:00
dependabot-preview[bot]
96d75c818d
Merge pull request #3966 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200512121336 2020-05-12 13:47:45 +00:00
dependabot-preview[bot]
8c19d0de98
Merge pull request #3965 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.9.20200512112117 2020-05-12 13:42:40 +00:00
dependabot-preview[bot]
e38796afab
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200511210757 to 0.1.0-prerelease.20200512121336.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200511210757...0.1.0-prerelease.20200512121336)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-12 13:26:29 +00:00
dependabot-preview[bot]
82fb84bdfe
Bump scratch-l10n from 3.8.20200505213509 to 3.9.20200512112117
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.8.20200505213509 to 3.9.20200512112117.
- [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-12 13:25:29 +00:00
dependabot-preview[bot]
b20850f0b9
Merge pull request #3955 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20200511210757 2020-05-12 01:31:36 +00:00
dependabot-preview[bot]
00a854b2c3
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200509162610 to 0.1.0-prerelease.20200511210757.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200509162610...0.1.0-prerelease.20200511210757)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-11 23:38:08 +00:00
dependabot-preview[bot]
2c569ed256
Merge pull request #3932 from LLK/dependabot/npm_and_yarn/redux-mock-store-1.5.4 2020-05-11 23:18:07 +00:00
dependabot-preview[bot]
1c68e76dfa
Merge pull request #3928 from LLK/dependabot/npm_and_yarn/eslint-plugin-cypress-2.10.3 2020-05-11 22:55:08 +00:00
dependabot-preview[bot]
209f09dbbc
Bump redux-mock-store from 1.5.3 to 1.5.4
Bumps [redux-mock-store](https://github.com/arnaudbenard/redux-mock-store) from 1.5.3 to 1.5.4.
- [Release notes](https://github.com/arnaudbenard/redux-mock-store/releases)
- [Commits](https://github.com/arnaudbenard/redux-mock-store/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-11 21:30:44 +00:00
dependabot-preview[bot]
31197a3a0f
Merge pull request #3876 from LLK/dependabot/npm_and_yarn/concat-stream-1.6.2 2020-05-11 21:28:03 +00:00
dependabot-preview[bot]
3b8ab920af
Bump eslint-plugin-cypress from 2.2.1 to 2.10.3
Bumps [eslint-plugin-cypress](https://github.com/cypress-io/eslint-plugin-cypress) from 2.2.1 to 2.10.3.
- [Release notes](https://github.com/cypress-io/eslint-plugin-cypress/releases)
- [Commits](https://github.com/cypress-io/eslint-plugin-cypress/compare/v2.2.1...v2.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-11 21:27:15 +00:00
Eric Rosenbaum
d2b237ec44
Merge pull request #3911 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200509162610
update scratch-gui
2020-05-11 14:34:24 -04:00
dependabot-preview[bot]
85cf841ad5
Bump cookie from 0.2.2 to 0.4.1
Bumps [cookie](https://github.com/jshttp/cookie) from 0.2.2 to 0.4.1.
- [Release notes](https://github.com/jshttp/cookie/releases)
- [Changelog](https://github.com/jshttp/cookie/blob/master/HISTORY.md)
- [Commits](https://github.com/jshttp/cookie/compare/v0.2.2...v0.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-11 15:38:01 +00:00
dependabot-preview[bot]
28cec76e12
[Security] Bump concat-stream from 1.5.1 to 1.6.2
Bumps [concat-stream](https://github.com/maxogden/concat-stream) from 1.5.1 to 1.6.2. **This update includes security fixes.**
- [Release notes](https://github.com/maxogden/concat-stream/releases)
- [Commits](https://github.com/maxogden/concat-stream/compare/v1.5.1...v1.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-11 15:18:37 +00:00
greenkeeper[bot]
5e357cfc8a
chore(package): update lockfile package-lock.json 2020-05-09 16:36:35 +00:00
greenkeeper[bot]
62f6018baa
chore(package): update scratch-gui to version 0.1.0-prerelease.20200509162610
Closes #3873
2020-05-09 16:36:31 +00:00
Benjamin Wheeler
ad6900d30c
Merge pull request #3872 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200508190247
Update scratch-gui
2020-05-08 15:54:45 -04:00
greenkeeper[bot]
140d9d0e15
chore(package): update lockfile package-lock.json 2020-05-08 19:14:13 +00:00
greenkeeper[bot]
fd6f488a90
chore(package): update scratch-gui to version 0.1.0-prerelease.20200508190247
Closes #3868
2020-05-08 19:14:09 +00:00
Chris Garrity
3c744bed4c Enable Help widget
Enable Helpwidget, but keep showing the form for iOS 10 and lower.
2020-05-08 13:02:07 -04:00
Karishma Chadha
3a2efeffe5
Merge pull request #3863 from LLK/release/2020-05-09
[Develop] Release 2020-05-07
2020-05-07 17:32:52 -04:00
Karishma Chadha
44a22e5589
Merge pull request #3862 from LLK/release/2020-05-09
[Master] Release 2020-05-07
2020-05-07 14:26:08 -04:00
Karishma Chadha
6aaf239df8
Merge pull request #3867 from chrisgarrity/revert-help-feature-flag
Put new help widget back behind feature flag
2020-05-07 13:37:47 -04:00
Chris Garrity
f600cad373 Put new help widget back behind feature flag 2020-05-07 12:30:50 -04:00