Commit graph

6863 commits

Author SHA1 Message Date
Karishma Chadha
79d0bef2a0 Beginning work on financials section 2020-10-22 11:50:43 -04:00
seotts
32686c8896 more progress on responsive subnavbar 2020-10-22 11:50:43 -04:00
seotts
8838687b96 initial work on subnav responsiveness 2020-10-22 11:50:43 -04:00
seotts
17224c6d37 more progress on subnav 2020-10-22 11:50:43 -04:00
seotts
9812e959d3 work on subnav 2020-10-22 11:50:43 -04:00
Karishma Chadha
98a7841a50 More progress on donate section 2020-10-22 11:50:43 -04:00
seotts
13c9837ebf add donate image 2020-10-22 11:50:43 -04:00
seotts
b6dc0365ee continued work on donate section 2020-10-22 11:50:43 -04:00
seotts
ba8e4705b5 add beginning of a sub-navigation bar 2020-10-22 11:50:43 -04:00
seotts
a4ea33288d route for annual-report 2020-10-22 11:50:43 -04:00
Karishma Chadha
6bd8aea7b7 Add support for a world map component, and an example page that displays it. 2020-10-22 11:50:43 -04:00
Benjamin Wheeler
adc8d10d37
Merge pull request #4550 from LLK/release/2020-10-22
[Develop] Release/2020-10-22
2020-10-22 10:30:52 -04:00
Benjamin Wheeler
d53ae21757
Merge pull request #4551 from LLK/release/2020-10-22
[Master] Release/2020-10-22
2020-10-22 10:30:38 -04:00
Sarah Otts
6e7e91ee0e
Merge pull request #4554 from LLK/credits-spacing-patch
Add padding on top of people grid on credits page
2020-10-22 09:22:49 -04:00
seotts
6d2508041f add padding on top of people grid on credits page 2020-10-22 09:18:29 -04:00
dependabot-preview[bot]
9ce419ac4f
Merge pull request #4553 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201022003512 2020-10-22 01:14:07 +00:00
dependabot-preview[bot]
5410f6189e
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201021170733 to 0.1.0-prerelease.20201022003512.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201021170733...0.1.0-prerelease.20201022003512)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-22 00:51:28 +00:00
GrahamSH
5a7cb21ea5
Add "FloralSunset" to Credits Page 2020-10-21 15:03:13 -04:00
GrahamSH
b9a81559d1
Merge pull request #1 from LLK/develop
Merge
2020-10-21 14:59:08 -04:00
Benjamin Wheeler
582c1bcc72
Merge pull request #4549 from LLK/develop
merge from develop to release branch
2020-10-21 14:07:10 -04:00
Benjamin Wheeler
e5943252c9
Merge pull request #4548 from LLK/update-gui-manually
updated gui to latest release
2020-10-21 14:04:54 -04:00
Ben Wheeler
c840681bc2 updated gui to latest release 2020-10-21 13:34:59 -04:00
dependabot-preview[bot]
9e40360294
Merge pull request #4542 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201020113821 2020-10-20 12:09:15 +00:00
dependabot-preview[bot]
6d41094957
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201019142030 to 0.1.0-prerelease.20201020113821.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201019142030...0.1.0-prerelease.20201020113821)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:01:17 +00:00
dependabot-preview[bot]
19edd363c5
Merge pull request #4539 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201019142030 2020-10-19 14:51:15 +00:00
dependabot-preview[bot]
08d7ad61fa
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201017074151 to 0.1.0-prerelease.20201019142030.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201017074151...0.1.0-prerelease.20201019142030)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-19 14:42:33 +00:00
dependabot-preview[bot]
17bac22040
Merge pull request #4535 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201017074151 2020-10-18 07:12:18 +00:00
dependabot-preview[bot]
40a52d4a93
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201016181616 to 0.1.0-prerelease.20201017074151.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201016181616...0.1.0-prerelease.20201017074151)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-18 07:05:07 +00:00
dependabot-preview[bot]
5e5d273fd8
Merge pull request #3878 from LLK/dependabot/npm_and_yarn/eslint-utils-1.4.3 2020-10-17 09:17:47 +00:00
dependabot-preview[bot]
3a65659ab5
Merge pull request #4268 from LLK/dependabot/npm_and_yarn/elliptic-6.5.3 2020-10-17 09:12:21 +00:00
dependabot-preview[bot]
426bf506e8
[Security] Bump eslint-utils from 1.4.0 to 1.4.3
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.4.0 to 1.4.3. **This update includes security fixes.**
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.4.0...v1.4.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-17 07:27:33 +00:00
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]
9968bbbf11
[Security] Bump lodash.merge from 3.3.2 to 4.6.2
Bumps [lodash.merge](https://github.com/lodash/lodash) from 3.3.2 to 4.6.2. **This update includes a security fix.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-17 07:07:23 +00:00
dependabot-preview[bot]
eee2b64e14
[Security] Bump react-dom from 16.2.0 to 16.2.1
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.2.0 to 16.2.1. **This update includes a security fix.**
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/HEAD/packages/react-dom)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-17 06:52:23 +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
Purple-Hacker
4aa1bd1c25
Update dmca.jsx 2020-10-16 12:28:08 +01: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