Commit graph

6275 commits

Author SHA1 Message Date
dependabot-preview[bot]
3cf7cdac86
[Security] Bump elliptic from 6.5.0 to 6.5.3
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.0 to 6.5.3. **This update includes a security fix.**
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.0...v6.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-17 07:26:57 +00:00
dependabot-preview[bot]
0ca788dcc5
Merge pull request #3883 from LLK/dependabot/npm_and_yarn/handlebars-4.7.6 2020-10-17 06:33:40 +00:00
dependabot-preview[bot]
0a61c98938
Merge pull request #3886 from LLK/dependabot/npm_and_yarn/jquery-3.5.1 2020-10-17 06:31:32 +00:00
dependabot-preview[bot]
9116e7006e
[Security] Bump handlebars from 4.1.2 to 4.7.6
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.2 to 4.7.6. **This update includes a security fix.**
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.2...v4.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-17 06:25:18 +00:00
dependabot-preview[bot]
4a133bd0bd
[Security] Bump jquery from 3.4.1 to 3.5.1
Bumps [jquery](https://github.com/jquery/jquery) from 3.4.1 to 3.5.1. **This update includes security fixes.**
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.4.1...3.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-17 06:23:43 +00:00
dependabot-preview[bot]
3251d3cb2b
Merge pull request #4532 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201016181616 2020-10-17 02:08:58 +00:00
dependabot-preview[bot]
a402b17cac
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201016180922 to 0.1.0-prerelease.20201016181616.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201016180922...0.1.0-prerelease.20201016181616)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-17 01:46:07 +00:00
picklesrus
bd8850d7b9
Merge pull request #4530 from picklesrus/bump-gui-purify
Bump gui
2020-10-16 14:28:49 -04:00
picklesrus
24e6bb3f5c Bump gui 2020-10-16 14:20:21 -04:00
picklesrus
d7008e7a6a
Merge pull request #4523 from LLK/hotfix/purify-just-in-time
[develop]Hotfix/purify just in time
2020-10-16 13:06:37 -04:00
picklesrus
2d3146e7f4
Merge branch 'develop' into hotfix/purify-just-in-time 2020-10-16 12:13:25 -04:00
Bryce Taylor
9f6faee25b
Merge pull request #4479 from BryceLTaylor/move-footer-tests-to-jest
Move footer integration tests to jest
2020-10-16 09:46:13 -04:00
picklesrus
c28b989af5
Merge pull request #4522 from LLK/hotfix/purify-just-in-time
[Release] Hotfix release
2020-10-15 15:17:31 -04:00
Benjamin Wheeler
aa8ac45ec8
Merge pull request #4475 from JeffaloBob/patch-2
replace http links with https links on the 1.4 download page
2020-10-15 14:15:58 -04:00
Benjamin Wheeler
cda05817f9
Merge pull request #4473 from mxmou/fix-load-more-scrolling
Fix "Load more" scrolling
2020-10-15 14:04:07 -04:00
Benjamin Wheeler
11ad1aeac1
Merge pull request #4474 from JeffaloBob/patch-1
add missing space to teacher request form
2020-10-15 13:29:23 -04:00
picklesrus
b04633296a Bump Gui 2020-10-15 10:40:56 -04:00
dependabot-preview[bot]
4c32af9250
Merge pull request #4515 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201014121025 2020-10-14 13:27:52 +00:00
dependabot-preview[bot]
ea737097f2
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201012162052 to 0.1.0-prerelease.20201014121025.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201012162052...0.1.0-prerelease.20201014121025)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-14 13:03:16 +00:00
dependabot-preview[bot]
b5090d8e53
Merge pull request #4511 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201014030746 2020-10-14 11:25:16 +00:00
dependabot-preview[bot]
84e7ed841b
Bump scratch-l10n from 3.10.20201007030856 to 3.10.20201014030746
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201007030856 to 3.10.20201014030746.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201007030856...3.10.20201014030746)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-14 11:17:37 +00:00
Sarah Otts
7323ef06bd
Merge pull request #4477 from LLK/people-grid-component
Pull out the credit page's grid of people into a separate component
2020-10-13 11:26:24 -04:00
Bryce Taylor
c24dc24d28
Merge pull request #4496 from BryceLTaylor/skip-failing-project-page-test
Skip failing project page test
2020-10-13 11:06:25 -04:00
Benjamin Wheeler
8882840451
Merge pull request #4318 from Nambaseking01/patch-1
Minor grammar fix in FAQ
2020-10-13 11:02:08 -04:00
picklesrus
a567a593fe
Merge pull request #4495 from picklesrus/comment-status
Commenting status component.
2020-10-13 09:03:41 -04:00
picklesrus
966df020f2
Merge pull request #4482 from picklesrus/m-modal-draft
Initial skeleton of mute modal.
2020-10-13 09:02:47 -04:00
dependabot-preview[bot]
1521836550
Merge pull request #4507 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201012162052 2020-10-13 02:42:14 +00:00
dependabot-preview[bot]
e34e443341
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201009230915 to 0.1.0-prerelease.20201012162052.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201009230915...0.1.0-prerelease.20201012162052)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-13 02:31:10 +00:00
DD Liu
62df188684
Merge pull request #4497 from LLK/hotfix/remove-onerror
[Develop] Hotfix/remove onerror
2020-10-09 19:39:59 -04:00
DD Liu
ae2371c527
Merge pull request #4498 from LLK/hotfix/remove-onerror
[Master] Hotfix/remove onerror
2020-10-09 19:39:16 -04:00
DD Liu
b95686c7bd Update to hotfix gui version 2020-10-09 19:11:40 -04:00
BryceLTaylor
77280752c0 Update Chromedriver to 86 2020-10-09 11:46:02 -04:00
BryceLTaylor
d504fa3cb3 Skip project page copy link integration test 2020-10-09 11:45:01 -04:00
picklesrus
0e6e49759c Commenting status component. 2020-10-08 15:12:09 -04:00
Bryce Taylor
c3f59957d7
Merge pull request #4465 from BryceLTaylor/Move-project-page-tests
Move project page tests
2020-10-08 11:20:03 -04:00
chrisgarrity
8b6a4dd8fa
Merge pull request #4489 from LLK/release/2020-10-07
[Master] Release Oct 7 2020
2020-10-08 09:32:02 -04:00
picklesrus
a9e8f8176d
Merge pull request #4492 from LLK/develop
Re-pull develop into release to get new gui.
2020-10-07 15:42:07 -04:00
chrisgarrity
b35a72ad97
Merge pull request #4491 from chrisgarrity/updategui
force update of gui to 20201007191300
2020-10-07 15:41:08 -04:00
Chris Garrity
7ca8bf1a2c force update of gui to 20201007191300 2020-10-07 15:36:43 -04:00
dependabot-preview[bot]
7d6cadafe7
Merge pull request #4486 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201007030856 2020-10-07 15:21:31 +00:00
dependabot-preview[bot]
4930374d2d
Bump scratch-l10n from 3.10.20200930030848 to 3.10.20201007030856
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20200930030848 to 3.10.20201007030856.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20200930030848...3.10.20201007030856)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-07 14:53:07 +00:00
Paul Kaplan
657d08fc37
Merge pull request #4485 from LLK/develop
Merge develop to release/2020-10-07
2020-10-07 09:37:03 -04:00
dependabot-preview[bot]
a8be76f7ee
Merge pull request #4476 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201001151313 2020-10-07 13:07:20 +00:00
Bryce Taylor
b5e2ae705b
Note logged out tests in test/integration/project-page.test.js
Co-authored-by: Ray Schamp <rschamp@users.noreply.github.com>
2020-10-06 16:52:07 -04:00
Bryce Taylor
60c6bb8d2c
Add default project id to test/integration/project-page.test.js
Co-authored-by: Ray Schamp <rschamp@users.noreply.github.com>
2020-10-06 16:51:31 -04:00
Bryce Taylor
4072d479c3
Update README.md
Co-authored-by: Ray Schamp <rschamp@users.noreply.github.com>
2020-10-06 16:50:44 -04:00
BryceLTaylor
530fb1b87c update match in footer integration tests 2020-10-06 16:42:57 -04:00
Bryce Taylor
d8306f65ff
Merge pull request #4469 from BryceLTaylor/move-join-tests-to-jest
Move join integration tests to Jest, add some tests
2020-10-06 15:43:37 -04:00
BryceLTaylor
8c4303a5b4 match the whole pathname instead of just the end 2020-10-06 15:42:59 -04:00
picklesrus
abb0140088
Merge pull request #4456 from picklesrus/test-travis-int
Only run integration/smoke tests on specific branches
2020-10-06 13:54:31 -04:00