Commit graph

9379 commits

Author SHA1 Message Date
BryceLTaylor
6f9d98a3c2 circleci config turn off cron job 2020-12-02 17:00:31 -05:00
BryceLTaylor
e0355ed275 circleci config test full deploy 2020-12-02 16:03:03 -05:00
Colby Gutierrez-Kraybill
6dc8d5ec74
Update routes.json 2020-12-02 14:18:47 -05:00
Colby Gutierrez-Kraybill
c92f161fa1
Merge pull request #4717 from LLK/hotfix/gh-4708
[release] gh-4708
2020-12-02 13:50:22 -05:00
Colby Gutierrez-Kraybill
f151f8dfeb Missing end optional parameter regex in annual-report 2020-12-02 13:30:15 -05:00
Colby Gutierrez-Kraybill
4973ff4a5d Follow the pattern of other routes, like contact-us for parameter ignoring in annual-report route 2020-12-02 12:16:44 -05:00
Colby Gutierrez-Kraybill
fd6018a92f Allow extra parameters to match annual-report route 2020-12-02 12:07:12 -05:00
Paul Kaplan
191c881406
Merge pull request #4714 from LLK/develop
Merge develop into release branch
2020-12-02 09:42:23 -05:00
dependabot-preview[bot]
d73579c629
Merge pull request #4713 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201202090933 2020-12-02 11:07:04 +00:00
dependabot-preview[bot]
3e697caaf9
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201130040734 to 0.1.0-prerelease.20201202090933.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201130040734...0.1.0-prerelease.20201202090933)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-02 10:55:44 +00:00
dependabot-preview[bot]
68caea68d2
Merge pull request #4712 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201202031459 2020-12-02 03:33:57 +00:00
dependabot-preview[bot]
fbf9199c7b
Bump scratch-l10n from 3.10.20201201031116 to 3.10.20201202031459
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201201031116 to 3.10.20201202031459.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201201031116...3.10.20201202031459)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-02 03:23:44 +00:00
Paul Kaplan
7a44511591
Merge pull request #4709 from LLK/sec-language-update
Update the SeC page wording
2020-12-01 14:05:07 -05:00
Paul Kaplan
f315ea2f15
Update the SeC page wording
Replace the phrase "historically underrepresented in computing” with “ historically excluded from computing.”

Change requested from KO.
2020-12-01 13:32:36 -05:00
BryceLTaylor
2b881eb307 circleci config use install instead of ci 2020-12-01 10:11:56 -05:00
dependabot-preview[bot]
ee5495cf7c
Merge pull request #4706 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201201031116 2020-12-01 03:27:44 +00:00
dependabot-preview[bot]
3f547a8826
Bump scratch-l10n from 3.10.20201130031158 to 3.10.20201201031116
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201130031158 to 3.10.20201201031116.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201130031158...3.10.20201201031116)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-01 03:16:43 +00:00
picklesrus
b450d36a64 Redo time based on new requirements. 2020-11-30 16:16:52 -05:00
BryceLTaylor
1943adca5f circleci config reactivate cron job without newrelic 2020-11-30 14:33:33 -05:00
BryceLTaylor
73206a2d2a remove newrelic to fix circleci build 2020-11-30 14:32:16 -05:00
dependabot-preview[bot]
af3d250bdf
Merge pull request #4705 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201130040734 2020-11-30 11:43:53 +00:00
dependabot-preview[bot]
e881a4371a
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201126215853 to 0.1.0-prerelease.20201130040734.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201126215853...0.1.0-prerelease.20201130040734)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-30 11:34:16 +00:00
dependabot-preview[bot]
6549d60943
Merge pull request #4704 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201130031158 2020-11-30 03:49:22 +00:00
dependabot-preview[bot]
67bba07a6f
Bump scratch-l10n from 3.10.20201129031117 to 3.10.20201130031158
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201129031117 to 3.10.20201130031158.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201129031117...3.10.20201130031158)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-30 03:39:58 +00:00
dependabot-preview[bot]
88926c1859
Merge pull request #4703 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201129031117 2020-11-29 03:26:42 +00:00
dependabot-preview[bot]
517851a24c
Bump scratch-l10n from 3.10.20201127031123 to 3.10.20201129031117
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201127031123 to 3.10.20201129031117.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201127031123...3.10.20201129031117)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-29 03:16:51 +00:00
dependabot-preview[bot]
d3b6142ddf
Merge pull request #4700 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201126215853 2020-11-27 10:55:37 +00:00
dependabot-preview[bot]
14687ddaca
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201126064348 to 0.1.0-prerelease.20201126215853.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201126064348...0.1.0-prerelease.20201126215853)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-27 10:45:54 +00:00
dependabot-preview[bot]
5867c1795f
Merge pull request #4699 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201127031123 2020-11-27 03:34:26 +00:00
dependabot-preview[bot]
7e1c3b8c51
Bump scratch-l10n from 3.10.20201126030901 to 3.10.20201127031123
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201126030901 to 3.10.20201127031123.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201126030901...3.10.20201127031123)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-27 03:24:01 +00:00
dependabot-preview[bot]
ecd0814dee
Merge pull request #4697 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201126064348 2020-11-26 10:55:56 +00:00
dependabot-preview[bot]
7517006fda
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201125094839 to 0.1.0-prerelease.20201126064348.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201125094839...0.1.0-prerelease.20201126064348)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-26 10:46:22 +00:00
dependabot-preview[bot]
f0ccc851f7
Merge pull request #4696 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201126030901 2020-11-26 03:24:19 +00:00
dependabot-preview[bot]
1d14e3b0fa
Bump scratch-l10n from 3.10.20201125030848 to 3.10.20201126030901
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201125030848 to 3.10.20201126030901.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201125030848...3.10.20201126030901)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-26 03:14:27 +00:00
Sarah Otts
fec148ac74
Merge pull request #4682 from LLK/annual-report-video-spinner
Add loading spinner in Annual Report
2020-11-25 15:29:11 -05:00
Karishma Chadha
b08ea58f43
Merge pull request #4683 from kchadha/annual-report-pdf
Fix title metadata in financials pdf
2020-11-25 15:26:16 -05:00
picklesrus
0f83b0c7c8
Merge pull request #4655 from picklesrus/use-minutes
Disable comment box functionality when you've just been muted.
2020-11-25 10:18:41 -05:00
dependabot-preview[bot]
c8ea8c4cad
Merge pull request #4688 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201125094839 2020-11-25 10:55:20 +00:00
dependabot-preview[bot]
9401936925
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201124034300 to 0.1.0-prerelease.20201125094839.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201124034300...0.1.0-prerelease.20201125094839)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-25 10:45:53 +00:00
dependabot-preview[bot]
5a759e54d1
Merge pull request #4687 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201125030848 2020-11-25 03:23:50 +00:00
dependabot-preview[bot]
5aca086934
Bump scratch-l10n from 3.10.20201124030911 to 3.10.20201125030848
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201124030911 to 3.10.20201125030848.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201124030911...3.10.20201125030848)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-25 03:14:22 +00:00
Ben Wheeler
590873c765 switch educator registration checkusername endpoint from scratchr2 to api 2020-11-24 13:54:11 -05:00
dependabot-preview[bot]
49c8c818e6
Merge pull request #4685 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201124034300 2020-11-24 11:02:23 +00:00
dependabot-preview[bot]
6d31ca0598
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201122034707 to 0.1.0-prerelease.20201124034300.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201122034707...0.1.0-prerelease.20201124034300)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-24 10:52:57 +00:00
dependabot-preview[bot]
1f46fad3de
Merge pull request #4684 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201124030911 2020-11-24 03:24:17 +00:00
dependabot-preview[bot]
7dfbddd6e1
Bump scratch-l10n from 3.10.20201123030801 to 3.10.20201124030911
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201123030801 to 3.10.20201124030911.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201123030801...3.10.20201124030911)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-24 03:15:00 +00:00
Karishma Chadha
d19d4b2814
Merge pull request #4665 from zoebentley/teacher-accounts-guide-link
Change link to Teacher Account Setup Guide on Educators page
2020-11-23 13:30:52 -05:00
seotts
246798b69d Use “play” event listener; clean-up code 2020-11-23 12:17:12 -05:00
Karishma Chadha
e36e869317 Fix title metadata in financials pdf 2020-11-23 11:26:26 -05:00
seotts
785386b1c7 add newline to end of file 2020-11-23 11:15:44 -05:00