scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-11 00:02:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
6403 commits 221 branches 1 tag 504 MiB
Commit graph

6403 commits

This branch
This branch
All branches
Author SHA1 Message Date
picklesrus
87d3d7845b
Merge pull request #4630 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201112102118 
Bump scratch-gui from 0.1.0-prerelease.20201105040602 to 0.1.0-prerelease.20201112102118
 2020-11-12 06:58:27 -05:00
dependabot-preview[bot]
94d7e9cc93
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201105040602 to 0.1.0-prerelease.20201112102118.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201105040602...0.1.0-prerelease.20201112102118)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-12 10:45:47 +00:00
picklesrus
2005b23777
Merge pull request #4616 from picklesrus/mute-behavior 
Skeleton of code to show mute modal and comment status.
 2020-11-10 10:24:04 -05:00
picklesrus
b8b0f5d10c
Merge pull request #4580 from picklesrus/modal-image-updates 
A few small upates to the muting modal
 2020-11-10 09:52:41 -05:00
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
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
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
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
seotts
fd8324eb0e fix community growth graph 2020-11-02 11:20:04 -05: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
Karishma Chadha
3b63aa5e08
Merge pull request #4574 from LLK/hotfix/studio-link 
[Develop] Hotfix Studio Link
 2020-10-29 10:47:12 -04:00
Karishma Chadha
5eab77c97c
Merge pull request #4568 from LLK/hotfix/annual-report 
[Develop] Hotfix Annual Report 2020-10-29
 2020-10-29 10:46:31 -04:00
Karishma Chadha
56675449ee
Merge branch 'develop' into hotfix/annual-report 2020-10-29 10:45:34 -04:00
Karishma Chadha
ab698070e2
Merge pull request #4573 from LLK/hotfix/studio-link 
Fix BLM studio link
 2020-10-29 09:49:14 -04:00
Karishma Chadha
4369899813 Fix BLM studio link 2020-10-29 09:43:10 -04:00
picklesrus
811844f231
Merge pull request #4567 from LLK/hotfix/annual-report 
[Master] Hotfix Annual Report 2020-10-29
 2020-10-29 06:00:28 -04:00
Karishma Chadha
4f6828bde8 Update board member section 2020-10-28 18:31:10 -04:00
seotts
b3cdc0ebcd fix Mahmoud’s image 2020-10-28 18:17:07 -04:00
seotts
729739c222 fix typo in project title 2020-10-28 18:04:51 -04:00
Karishma Chadha
412de9dbda Fix typos in content 2020-10-28 17:08:36 -04:00
Karishma Chadha
c2f0c1edbe Hopefully the right package-lock.json updates. 2020-10-28 13:30:54 -04:00
Karishma Chadha
8d722d454f Update l10n to remove unused strings from financials section 2020-10-28 13:06:44 -04:00
seotts
367ada3452 remove middle of financials section 2020-10-28 12:57:20 -04:00
Karishma Chadha
b673d718d4 Minor content update 2020-10-28 10:34:41 -04:00
Karishma Chadha
9a5560bdf5 Don't show scratch-jr-transition images on small screens. Fix lint issue. 2020-10-27 16:43:21 -04:00
seotts
a8058aa0bf remove comments; add new lines 2020-10-27 15:29:50 -04:00
seotts
5e075a2feb make financials button responsive 2020-10-27 14:23:34 -04:00
seotts
23736463f8 make map key even more responsive 2020-10-27 14:16:42 -04:00
seotts
f88fd8279a make map key responsive 2020-10-27 13:55:10 -04:00
Karishma Chadha
73cf337ac2 Map title update 2020-10-27 12:55:16 -04:00
Karishma Chadha
5771444811 Some content/copy changes. 2020-10-27 12:26:25 -04:00
seotts
90650ff5d8 fix community guidelines bullet points 2020-10-27 12:12:59 -04:00
carljbowman
2db15df51e Tweaks to the map container 
- Ajust border radius
- Remove bottom padding to make the map flush with the bottom, which required adding `overflow: hidden` to maintain the bottom border radius.
 2020-10-27 11:51:27 -04:00
seotts
ae16b8638b un-yoda-fy some country names (eg “Korea, Rep..”) 2020-10-27 11:49:00 -04:00