Commit graph

6866 commits

Author SHA1 Message Date
picklesrus
835a271be4 Show the comment status box on project page loads if the user is muted.
Don't show the compose box if they're muted, but do show it, but greyed 
out, if they just posted a comment that resulted in a mute.
2020-12-08 07:28:40 -05:00
dependabot-preview[bot]
5af560690c
Merge pull request #4739 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201208061839 2020-12-08 10:59:06 +00:00
dependabot-preview[bot]
e0373c970e
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201207040127 to 0.1.0-prerelease.20201208061839.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201207040127...0.1.0-prerelease.20201208061839)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-08 10:48:10 +00:00
dependabot-preview[bot]
57a5150cd1
Merge pull request #4738 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201208031649 2020-12-08 03:47:08 +00:00
dependabot-preview[bot]
eeab1a53ae
Bump scratch-l10n from 3.10.20201207031619 to 3.10.20201208031649
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201207031619 to 3.10.20201208031649.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201207031619...3.10.20201208031649)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-08 03:35:58 +00:00
picklesrus
c35e3be25b
Merge pull request #4635 from picklesrus/readable-time
Add a time formatting utility that formats a relative time in the future.
2020-12-07 16:48:50 -05:00
seotts
b7cf82494b Remove unused variable and fix spacing 2020-12-07 16:16:42 -05:00
picklesrus
f4f6b70f2e
Merge branch 'develop' into readable-time 2020-12-07 16:05:02 -05:00
picklesrus
b1d4c6d1b5 Add backup langauges and remove tests that aren't useful. 2020-12-07 15:38:58 -05:00
seotts
1d70ee243c Make borders smaller, show data for Eswatini 2020-12-07 12:45:01 -05:00
seotts
86650e1ce9 open link to Scratch Team member in new tab 2020-12-07 12:43:43 -05:00
BryceLTaylor
d72490ca24 circleci config actually turn off deploy and integration jobs in worflow 2020-12-07 10:23:24 -05:00
BryceLTaylor
c616e00595 circleci config turn off deploy and integration jobs 2020-12-07 10:14:09 -05:00
dependabot-preview[bot]
2888f469b9
Merge pull request #4734 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201207040127 2020-12-07 12:19:47 +00:00
dependabot-preview[bot]
8389384b39
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201204090129 to 0.1.0-prerelease.20201207040127.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201204090129...0.1.0-prerelease.20201207040127)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-07 12:08:21 +00:00
dependabot-preview[bot]
29d159802a
Merge pull request #4732 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201207031619 2020-12-07 03:52:04 +00:00
dependabot-preview[bot]
262c4dc186
Bump scratch-l10n from 3.10.20201206031447 to 3.10.20201207031619
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201206031447 to 3.10.20201207031619.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201206031447...3.10.20201207031619)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-07 03:41:06 +00:00
dependabot-preview[bot]
a91bd271d2
Merge pull request #4730 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201206031447 2020-12-06 03:31:33 +00:00
dependabot-preview[bot]
3370211e06
Bump scratch-l10n from 3.10.20201205031454 to 3.10.20201206031447
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201205031454 to 3.10.20201206031447.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201205031454...3.10.20201206031447)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-06 03:21:14 +00:00
dependabot-preview[bot]
17837af4fd
Merge pull request #4728 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201205031454 2020-12-05 03:31:31 +00:00
dependabot-preview[bot]
5ba480c038
Bump scratch-l10n from 3.10.20201204031520 to 3.10.20201205031454
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201204031520 to 3.10.20201205031454.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201204031520...3.10.20201205031454)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-05 03:20:29 +00:00
Paul Kaplan
02d4a6c9bf
Merge pull request #4725 from LLK/hotfix/sec-google-nolink
[hotfix/master] Include funding support on Education Collaborative intro
2020-12-04 10:11:17 -05:00
Karishma Chadha
7a7b8035ae
Merge pull request #4716 from LLK/release/2020-12-02
[Develop] Release/2020 12 02
2020-12-04 09:43:29 -05:00
Karishma Chadha
878965d00d
Merge branch 'develop' into release/2020-12-02 2020-12-04 09:32:10 -05:00
Paul Kaplan
591b3ce6a2 Add Google.org to intro paragraph on SEC 2020-12-04 09:13:02 -05:00
dependabot-preview[bot]
a18096d9ac
Merge pull request #4724 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201204090129 2020-12-04 10:53:47 +00:00
dependabot-preview[bot]
c0c03391b9
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201203084644 to 0.1.0-prerelease.20201204090129.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201203084644...0.1.0-prerelease.20201204090129)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-04 10:42:35 +00:00
dependabot-preview[bot]
05950fe1a4
Merge pull request #4723 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201204031520 2020-12-04 03:47:40 +00:00
dependabot-preview[bot]
3bf3572d36
Bump scratch-l10n from 3.10.20201203031604 to 3.10.20201204031520
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201203031604 to 3.10.20201204031520.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201203031604...3.10.20201204031520)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-04 03:37:40 +00:00
BryceLTaylor
ba7e3804be circleci config remove comment 2020-12-03 11:07:31 -05:00
Karishma Chadha
bf1ab7b68a
Merge pull request #4715 from LLK/release/2020-12-02
[Master] Release 2020 12 02
2020-12-03 10:32:02 -05:00
Karishma Chadha
0b6d7b605a Revert version of gui to what's on production 2020-12-03 10:11:47 -05:00
BryceLTaylor
eb515205ce circleci config fix release filter for integration job 2020-12-03 10:10:44 -05:00
BryceLTaylor
a5a641863f circleci config clean up for release 2020-12-03 09:38:04 -05:00
dependabot-preview[bot]
53a5ea096a
Merge pull request #4720 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201203084644 2020-12-03 10:49:55 +00:00
dependabot-preview[bot]
089777d93b
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201202090933 to 0.1.0-prerelease.20201203084644.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201202090933...0.1.0-prerelease.20201203084644)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-03 10:39:20 +00:00
dependabot-preview[bot]
590f454058
Merge pull request #4719 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.10.20201203031604 2020-12-03 03:42:10 +00:00
dependabot-preview[bot]
0c6b5ae218
Bump scratch-l10n from 3.10.20201202031459 to 3.10.20201203031604
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20201202031459 to 3.10.20201203031604.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20201202031459...3.10.20201203031604)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-03 03:30:07 +00:00
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