scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 23:57:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
7696 commits 217 branches 1 tag 464 MiB
Commit graph

7696 commits

This branch
This branch
All branches
Author SHA1 Message Date
dependabot-preview[bot]
47365ecf46
Bump scratch-l10n from 3.11.20210510031549 to 3.11.20210511031531 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210510031549 to 3.11.20210511031531.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210510031549...3.11.20210511031531)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-05-11 03:44:34 +00:00
Paul Kaplan
bf73950c16
Merge pull request #5346 from paulkaplan/bugfix/studio-playground-may5 
Bug fixes from studio playground test on May 5 2021
 2021-05-10 21:11:43 -04:00
Paul Kaplan
9904586a38 Merge branch 'develop' into bugfix/studio-playground-may5 2021-05-10 21:11:05 -04:00
Paul Kaplan
64ff2cffdd Move max image size to constant 2021-05-10 21:09:08 -04:00
Paul Kaplan
fbd8908a83 Fix lint 2021-05-10 21:06:31 -04:00
Paul Kaplan
6ac3012b8c Use formatted message 2021-05-10 21:02:20 -04:00
Paul Kaplan
62b1f8f3a5 Merge branch 'develop' into feature/studio-project-modal 2021-05-10 20:55:20 -04:00
Paul Kaplan
43eb9e4e91 Include if user projects are already in the studio 2021-05-10 20:46:38 -04:00
Karishma Chadha
a9d70b2cc0
Merge pull request #5370 from kchadha/studio-404-page 
Set up studios view with 404 page
 2021-05-10 17:49:30 -04:00
Sarah Otts
70f7a9ef73
Merge pull request #5331 from zoebentley/update-teacher-faq-and-devs-page-2021 
Changed Developers and Teacher FAQ pages
 2021-05-10 16:43:44 -04:00
zoebentley
dfa9b99728
Update src/views/developers/developers.jsx 
Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com>
 2021-05-10 16:40:48 -04:00
Benjamin Wheeler
4591c65e6f
Merge pull request #5345 from benjiwheeler/donate-banner 
add donate banner, make close button a mode of button component
 2021-05-10 16:14:26 -04:00
Eric Rosenbaum
790e433313 lint 2021-05-10 15:13:02 -04:00
Eric Rosenbaum
94d0f30b71 fix missing comma from merge 2021-05-10 14:45:00 -04:00
Eric Rosenbaum
f55d34aab8 Merge branch 'develop' of https://github.com/LLK/scratch-www into activity-feed-styles 
# Conflicts:
#	src/views/studio/l10n.json
#	src/views/studio/studio.scss
 2021-05-10 14:41:14 -04:00
Karishma Chadha
7876bc4fba
Merge pull request #5359 from kchadha/studio-translation-setup 
Add l10n file to studios view and replace text with formatted message.
 2021-05-10 14:19:40 -04:00
Paul Kaplan
f474525398 Remove unused loadMore functionality from infinite list because it was overly specific, now it is no longer being used by any component 2021-05-10 14:14:46 -04:00
Paul Kaplan
600e5846d0 Move activity loading to studio-activity-actions, include pagination 2021-05-10 14:14:19 -04:00
Karishma Chadha
1b2b595338 Get rid of extra piece of state being tracked in redux and update selector to tell if studio load failed. Use that to display 404 page instead. 2021-05-10 14:01:17 -04:00
Karishma Chadha
040350314b Set up studios view with 404 page 2021-05-10 13:16:15 -04:00
Eric Rosenbaum
cb3ba550d5 add alt text for icons 2021-05-10 13:01:20 -04:00
Eric Rosenbaum
188b51bbbe add icons 2021-05-10 12:14:51 -04:00
Paul Kaplan
e2dafff5b7 Include rate limit and 404 error types 2021-05-10 11:59:37 -04:00
Eric Rosenbaum
de85a25db1 use formatted messages for each activity notification 2021-05-10 11:44:39 -04:00
Paul Kaplan
968afdb412 Fix whitespace 2021-05-10 10:29:24 -04:00
Paul Kaplan
35dbcb07ba Add user projects modal 2021-05-10 10:24:21 -04:00
Paul Kaplan
f1fde9e5f8 Ensure project ID is always a number 2021-05-10 10:23:13 -04:00
Paul Kaplan
95766fd68a Add clear to infinite list, fixup tests 2021-05-10 10:22:18 -04:00
Karishma Chadha
51bf0d6c3d Fix lint error 2021-05-10 10:16:54 -04:00
dependabot-preview[bot]
dbec1c7a97
Merge pull request #5366 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210509040505 2021-05-10 12:18:57 +00:00
dependabot-preview[bot]
36cb172108
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210507041109 to 0.1.0-prerelease.20210509040505.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210507041109...0.1.0-prerelease.20210509040505)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-05-10 12:06:16 +00:00
dependabot-preview[bot]
1942e840b7
Merge pull request #5362 from LLK/dependabot/npm_and_yarn/formatjs/intl-locale-2.4.24 2021-05-10 04:58:11 +00:00
dependabot-preview[bot]
01d30818a3
Merge pull request #5364 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210510031549 2021-05-10 04:43:51 +00:00
dependabot-preview[bot]
e46429a02a
Merge pull request #5363 from LLK/dependabot/npm_and_yarn/formatjs/intl-pluralrules-4.0.18 2021-05-10 04:37:32 +00:00
dependabot-preview[bot]
174a94a381
Merge pull request #5361 from LLK/dependabot/npm_and_yarn/formatjs/intl-relativetimeformat-8.1.8 2021-05-10 04:36:47 +00:00
dependabot-preview[bot]
07f7de504f
Bump scratch-l10n from 3.11.20210509031637 to 3.11.20210510031549 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210509031637 to 3.11.20210510031549.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210509031637...3.11.20210510031549)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-05-10 04:27:15 +00:00
dependabot-preview[bot]
97959c489b
Bump @formatjs/intl-pluralrules from 4.0.17 to 4.0.18 
Bumps [@formatjs/intl-pluralrules](https://github.com/formatjs/formatjs) from 4.0.17 to 4.0.18.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-pluralrules@4.0.17...@formatjs/intl-pluralrules@4.0.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-05-10 04:25:30 +00:00
dependabot-preview[bot]
5692b72e1e
Bump @formatjs/intl-locale from 2.4.23 to 2.4.24 
Bumps [@formatjs/intl-locale](https://github.com/formatjs/formatjs) from 2.4.23 to 2.4.24.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-locale@2.4.23...@formatjs/intl-locale@2.4.24)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-05-10 04:24:59 +00:00
dependabot-preview[bot]
8cfa2fecf6
Bump @formatjs/intl-relativetimeformat from 8.1.7 to 8.1.8 
Bumps [@formatjs/intl-relativetimeformat](https://github.com/formatjs/formatjs) from 8.1.7 to 8.1.8.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-relativetimeformat@8.1.7...@formatjs/intl-relativetimeformat@8.1.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-05-10 04:24:28 +00:00
dependabot-preview[bot]
70d53e3e4c
Merge pull request #5360 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210509031637 2021-05-09 03:35:04 +00:00
dependabot-preview[bot]
b20a19e0fc
Bump scratch-l10n from 3.11.20210507031517 to 3.11.20210509031637 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210507031517 to 3.11.20210509031637.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210507031517...3.11.20210509031637)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-05-09 03:22:30 +00:00
Ben Wheeler
3dd69c287c Remove stale comments, remove extra space, add padding 2021-05-07 22:23:45 -04:00
Benjamin Wheeler
33e9c88217
Merge pull request #5252 from benjiwheeler/remove-unnecessary-page 
removed unnecessary Page component
 2021-05-07 18:37:32 -04:00
Karishma Chadha
b065ff86d4 Add l10n file to studios view and replace text with formatted message. 2021-05-07 17:04:14 -04:00
dependabot-preview[bot]
fa5c56c47a
Merge pull request #5358 from LLK/dependabot/npm_and_yarn/hosted-git-info-2.8.9 2021-05-07 20:08:03 +00:00
dependabot-preview[bot]
2df83577cd
[Security] Bump hosted-git-info from 2.7.1 to 2.8.9 
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.7.1 to 2.8.9. **This update includes a security fix.**
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.7.1...v2.8.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-05-07 19:56:20 +00:00
Benjamin Wheeler
6cc59b9b9a
Merge pull request #5357 from benjiwheeler/banned-page-list-2nd-try 
update method of checking goodlist of pages for banned user to see (2nd try)
 2021-05-07 13:19:30 -04:00
Ben Wheeler
3156976fee update method of checking goodlist of pages for banned user to see 2021-05-07 13:14:53 -04:00
Ben Wheeler
23f2135c17 add donate banner, make close button a mode of button component 2021-05-07 11:50:47 -04:00
dependabot-preview[bot]
fdf05f9430
Merge pull request #5356 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210507041109 2021-05-07 10:56:58 +00:00