scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-24 08:08:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
6631 commits 216 branches 1 tag 465 MiB
Commit graph

6631 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
5b80590b8b
Merge pull request #3913 from LLK/dependabot/npm_and_yarn/lodash.defaultsdeep-4.6.1 
[Security] Bump lodash.defaultsdeep from 3.10.0 to 4.6.1
 2020-11-09 14:13:23 -05:00
dependabot-preview[bot]
3a36d27c08
[Security] Bump lodash.defaultsdeep from 3.10.0 to 4.6.1 
Bumps [lodash.defaultsdeep](https://github.com/lodash/lodash) from 3.10.0 to 4.6.1. **This update includes a security fix.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/3.10.0...4.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-09 19:13:07 +00:00
Ray Schamp
efa75e8412
Merge pull request #3914 from LLK/dependabot/npm_and_yarn/lodash.mergewith-4.6.2 
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2
 2020-11-09 14:11:07 -05:00
dependabot-preview[bot]
170359db61
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 
Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 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-11-09 19:10:07 +00:00
dependabot-preview[bot]
a3497fda2e
Merge pull request #3915 from LLK/dependabot/npm_and_yarn/react-dom-16.2.1 2020-11-09 19:09:30 +00:00
dependabot-preview[bot]
339524ecb7
Merge pull request #3945 from LLK/dependabot/npm_and_yarn/lodash.merge-4.6.2 2020-11-09 19:08:07 +00:00
BryceLTaylor
534c60bf78 circleCI config fix fastly api key environment variables 2020-11-09 12:00:17 -05:00
Karishma Chadha
f89d1313e0 Break out supporters lists into json file and dynamically create lists of supporters. 2020-11-09 11:37:31 -05:00
BryceLTaylor
190e2bb550 circleCI config remove path line 2020-11-09 11:24:23 -05:00
BryceLTaylor
4b69b92bb9 circleCI config update cache keys 2020-11-09 11:10:27 -05:00
picklesrus
e5f97d1f18 Skeleton of code to show mute modal and comment status. 
Still todo:
- l10n
- Time needs formatting
- Compose box needs to be shown/formatted correctly based on mute status
- Blue comment status box need to be sticky
 2020-11-09 11:01:42 -05:00
BryceLTaylor
227795b81a circleCI confi fix underscore in save_cache 2020-11-09 10:57:19 -05:00
BryceLTaylor
83253daca4 circleCI config fix underscores 2020-11-09 10:52:27 -05:00
BryceLTaylor
0d1729985b CircleCI config setup environment variables, caching, and workflow 2020-11-09 10:42:54 -05:00
Karishma Chadha
c3accb0111 Add link to annual report from about page 2020-11-09 10:20:11 -05:00
Karishma Chadha
3ed2ed1447
Merge pull request #4599 from LLK/release/2020-11-04 
[Develop] Release/2020 11 04
 2020-11-05 14:46:50 -05:00
Karishma Chadha
927d629e5d
Merge pull request #4600 from LLK/release/2020-11-04 
[Master] Release/2020 11 04
 2020-11-05 11:13:49 -05:00
Karishma Chadha
40c139b9f8
Merge pull request #4605 from LLK/revert-4602-revert-4595-dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201104042153 
Revert "Revert "Bump scratch-gui from 0.1.0-prerelease.20201025103629 to 0.1.…"
 2020-11-05 09:42:11 -05:00
Benjamin Wheeler
69efc1afea
Merge pull request #4287 from R4356th/patch-11 
Replace "Tips Page" with "Ideas Page"
 2020-11-05 09:41:48 -05:00
Karishma Chadha
b1464277dd
Revert "Revert "Bump scratch-gui from 0.1.0-prerelease.20201025103629 to 0.1.…" 2020-11-05 09:40:30 -05:00
dependabot-preview[bot]
7602bf2d5a
Merge pull request #4604 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201105040602 2020-11-05 12:19:01 +00:00
dependabot-preview[bot]
d01af1c16f
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201104042153 to 0.1.0-prerelease.20201105040602.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201104042153...0.1.0-prerelease.20201105040602)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-05 10:44:05 +00:00
Karishma Chadha
7b95375db0
Merge pull request #4602 from LLK/revert-4595-dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201104042153 
Revert "Bump scratch-gui from 0.1.0-prerelease.20201025103629 to 0.1.…
 2020-11-04 16:38:45 -05:00
Karishma Chadha
8d20bea167
Revert "Bump scratch-gui from 0.1.0-prerelease.20201025103629 to 0.1.0-prerelease.20201104042153" 2020-11-04 16:35:11 -05:00
Eric Rosenbaum
c1c3458332
Merge pull request #4598 from LLK/develop 
merge from develop to release branch
 2020-11-04 12:40:22 -05:00
Karishma Chadha
adb772ce49
Merge pull request #4587 from LLK/hotfix/annual-report-fix 
[Develop] Hotfix minor changes to annual report
 2020-11-04 12:38:38 -05:00
Eric Rosenbaum
71c0ee5ef0
Merge pull request #4595 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201104042153 
Bump scratch-gui from 0.1.0-prerelease.20201025103629 to 0.1.0-prerelease.20201104042153
 2020-11-04 12:36:07 -05:00
dependabot-preview[bot]
d255d01d1c
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201025103629 to 0.1.0-prerelease.20201104042153.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201025103629...0.1.0-prerelease.20201104042153)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-04 10:56:09 +00:00
Karishma Chadha
126b5f4597
Merge pull request #4588 from LLK/hotfix/annual-report-fix 
[Master] Hotfix minor changes to annual report
 2020-11-02 15:06:20 -05:00
BryceLTaylor
b98d4ab360 circleci config add space to fix build error 2020-11-02 12:07:37 -05:00
BryceLTaylor
ea60f28dad circleci config fix step naming error 2020-11-02 12:05:14 -05:00
BryceLTaylor
18a26e131a circleci config split setup into different run steps 2020-11-02 12:03:10 -05:00
seotts
fd8324eb0e fix community growth graph 2020-11-02 11:20:04 -05:00
BryceLTaylor
50c70436e2 circleCI config fix cache alias 2020-10-30 17:23:11 -04:00
BryceLTaylor
26de139975 circleCI config install pip 2020-10-30 17:19:48 -04:00
BryceLTaylor
ff74a82544 circleCI config create integration job 2020-10-30 17:19:09 -04:00
BryceLTaylor
4277567a03 circleci config setup npm cache 2020-10-30 17:18:40 -04:00
picklesrus
495edd1820 A few small upates: 
- Add images and update styles to match.  
- Add timeMuted prop so it can display how long the user is muted for. 
- Text updates

This still needs localization.
 2020-10-30 10:07:43 -04:00
BryceLTaylor
beba1638df add working directory line to circleci config 2020-10-30 09:41:30 -04:00
BryceLTaylor
6ab03f132a circleci config remove npm install 2020-10-29 16:10:03 -04:00
BryceLTaylor
7349ee8d75 circleci config add checkout remove pip stuff 2020-10-29 16:05:28 -04:00
BryceLTaylor
cba5ca9d4c remove brew commands from circleci config 2020-10-29 16:05:28 -04:00
BryceLTaylor
dd9b878b4e add install pyenv to enable pip command in circleci config 2020-10-29 16:05:28 -04:00
BryceLTaylor
c78d4f8b42 indent commands in circleci config 2020-10-29 16:05:28 -04:00
BryceLTaylor
c9cb5faef8 undo previous change in circleci config 2020-10-29 16:05:28 -04:00
BryceLTaylor
f746c444d7 fix commands for setup in circleci config 2020-10-29 16:05:28 -04:00
BryceLTaylor
b76ea5701a add install steps to circleci.config 2020-10-29 16:05:28 -04:00
BryceLTaylor
133256b3ac circleci config change run to mapping in setup job 2020-10-29 16:05:28 -04:00
BryceLTaylor
b2c4f7c5ce setup circleci config 2020-10-29 16:05:28 -04:00
BryceLTaylor
5e42b57a92 Only run on circleci-project-setup branch 2020-10-29 16:05:28 -04:00