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

7600 commits

This branch
This branch
All branches
Author SHA1 Message Date
dependabot-preview[bot]
a0c59bc716
Merge pull request #5251 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210412041818 2021-04-12 12:53:26 +00:00
dependabot-preview[bot]
ebbda12481
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210407220130 to 0.1.0-prerelease.20210412041818.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210407220130...0.1.0-prerelease.20210412041818)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-04-12 12:44:24 +00:00
dependabot-preview[bot]
137d688ab1
Merge pull request #5250 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210412031607 2021-04-12 04:01:01 +00:00
dependabot-preview[bot]
1d233a0c53
Bump scratch-l10n from 3.11.20210410031537 to 3.11.20210412031607 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210410031537 to 3.11.20210412031607.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210410031537...3.11.20210412031607)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-04-12 03:48:45 +00:00
dependabot-preview[bot]
43fc242323
Merge pull request #5249 from LLK/dependabot/npm_and_yarn/formatjs/intl-relativetimeformat-8.1.5 2021-04-12 03:13:44 +00:00
dependabot-preview[bot]
1549d8afe8
Merge pull request #5248 from LLK/dependabot/npm_and_yarn/formatjs/intl-pluralrules-4.0.14 2021-04-12 03:12:41 +00:00
dependabot-preview[bot]
f8745dc6e5
Merge pull request #5247 from LLK/dependabot/npm_and_yarn/formatjs/intl-locale-2.4.22 2021-04-12 03:11:40 +00:00
dependabot-preview[bot]
ff64fadcaf
Bump @formatjs/intl-relativetimeformat from 8.1.4 to 8.1.5 
Bumps [@formatjs/intl-relativetimeformat](https://github.com/formatjs/formatjs) from 8.1.4 to 8.1.5.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-relativetimeformat@8.1.4...@formatjs/intl-relativetimeformat@8.1.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-04-12 03:04:01 +00:00
dependabot-preview[bot]
41ad41f711
Bump @formatjs/intl-pluralrules from 4.0.13 to 4.0.14 
Bumps [@formatjs/intl-pluralrules](https://github.com/formatjs/formatjs) from 4.0.13 to 4.0.14.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-pluralrules@4.0.13...@formatjs/intl-pluralrules@4.0.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-04-12 03:03:03 +00:00
dependabot-preview[bot]
d6e4ca5302
Bump @formatjs/intl-locale from 2.4.21 to 2.4.22 
Bumps [@formatjs/intl-locale](https://github.com/formatjs/formatjs) from 2.4.21 to 2.4.22.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-locale@2.4.21...@formatjs/intl-locale@2.4.22)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-04-12 03:02:52 +00:00
dependabot-preview[bot]
46260a0d5c
Merge pull request #5246 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210410031537 2021-04-10 03:35:01 +00:00
dependabot-preview[bot]
1b21d04c85
Bump scratch-l10n from 3.11.20210409031547 to 3.11.20210410031537 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210409031547 to 3.11.20210410031537.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210409031547...3.11.20210410031537)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-04-10 03:24:54 +00:00
picklesrus
1b00523996
Merge pull request #5243 from LLK/revert-5234-release/2021-04-07 
Revert "[master] Release 2021-04-07"
 2021-04-09 08:38:42 -04:00
picklesrus
2dcbeb4661
Revert "[master] Release 2021-04-07" 2021-04-09 08:34:55 -04:00
dependabot-preview[bot]
a4462b964c
Merge pull request #5240 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210409031547 2021-04-09 03:37:33 +00:00
dependabot-preview[bot]
aa0e7a28e7
Bump scratch-l10n from 3.11.20210405031550 to 3.11.20210409031547 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210405031550 to 3.11.20210409031547.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210405031550...3.11.20210409031547)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-04-09 03:28:21 +00:00
Paul Kaplan
2b4cd0e96d
Merge pull request #5235 from LLK/release/2021-04-07 2021-04-08 11:14:17 -04:00
Paul Kaplan
7c4871c19b Remove unused reference 2021-04-08 10:57:28 -04:00
Paul Kaplan
97acafc446
Merge pull request #5234 from LLK/release/2021-04-07 
[master] Release 2021-04-07
 2021-04-08 10:39:20 -04:00
Paul Kaplan
74a29a62a0 Hook up delete restore and report actions for studio comments 2021-04-08 10:38:34 -04:00
Paul Kaplan
810eadd258 Remove params from studio comment actions that can be retrieved from state 2021-04-08 10:37:45 -04:00
Paul Kaplan
11794d885a Add permissions selectors and tests for studio comments 2021-04-08 10:36:56 -04:00
Paul Kaplan
7a8f2b61dc
Merge pull request #5231 from paulkaplan/use-getstate-in-thunks 
Use getState in thunks instead of passing props around
 2021-04-08 09:14:57 -04:00
dependabot-preview[bot]
71bb3a7665
Merge pull request #5236 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210407220130 2021-04-08 11:31:19 +00:00
dependabot-preview[bot]
955bd415f6
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210401231322 to 0.1.0-prerelease.20210407220130.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210401231322...0.1.0-prerelease.20210407220130)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-04-08 11:19:20 +00:00
Paul Kaplan
5ee776eea7
Merge pull request #5233 from LLK/develop 
Merge develop to release/2021-04-07
 2021-04-07 10:03:19 -04:00
BryceLTaylor
8d3243d195 Move deploy and integration tests to circle 2021-04-05 11:04:41 -04:00
Paul Kaplan
bd279fe557 Stop passing around admin/token info in studio comment component. 
Instead of getting data out of redux just to pass it back to a dispatch,
use getState in the thunk to get the data we need. This allows the
component to not care about admin/token info, since it is not related
to rendering.
 2021-04-05 10:41:19 -04:00
Paul Kaplan
c6b0493e08 Stop passing around studio id and user info for getting studio data 
Insteaad of passing in the studio id and user data into the component
just to have it used for fetching data, get that data directly from
the redux store from within the thunk. This simplifies the components
and lets them be concerned more with what they render.
 2021-04-05 10:32:47 -04:00
Paul Kaplan
f0adda4e3b Include studio id in the store default data 2021-04-05 10:31:19 -04:00
Paul Kaplan
6ea071e8df Reorder and add selector for studio id 2021-04-05 10:30:35 -04:00
dependabot-preview[bot]
02173caf19
Merge pull request #5229 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210405031550 2021-04-05 06:11:14 +00:00
dependabot-preview[bot]
585e1e4e74
Bump scratch-l10n from 3.11.20210403031529 to 3.11.20210405031550 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210403031529 to 3.11.20210405031550.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210403031529...3.11.20210405031550)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-04-05 06:02:07 +00:00
dependabot-preview[bot]
ff2f30f969
Merge pull request #5228 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210403031529 2021-04-03 03:32:44 +00:00
dependabot-preview[bot]
bf2e5de030
Bump scratch-l10n from 3.11.20210402031543 to 3.11.20210403031529 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210402031543 to 3.11.20210403031529.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210402031543...3.11.20210403031529)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-04-03 03:22:41 +00:00
Paul Kaplan
41484b64b6
Merge pull request #5176 from paulkaplan/studio-selectors 
Add initial selectors for studio permissions
 2021-04-02 12:51:29 -04:00
Paul Kaplan
8267dcf16a Fix TODO and add selector for studio comment capability 2021-04-02 12:43:32 -04:00
Paul Kaplan
dc460fffde Merge branch 'develop' into studio-selectors 2021-04-02 12:36:44 -04:00
Paul Kaplan
cd8ae4b197 Use lodash.get to simplify permissions, move test data into fixtures for better testing 2021-04-02 12:33:18 -04:00
Karishma Chadha
0bc081294c
Merge pull request #5227 from LLK/revert-5216-hotfix/totally-normal-2021 
Revert "[Master] Hotfix/totally normal 2021"
 2021-04-02 11:40:00 -04:00
Karishma Chadha
6397ac8ab3
Revert "[Master] Hotfix/totally normal 2021" 2021-04-02 10:30:54 -04:00
dependabot-preview[bot]
f4e95aba13
Merge pull request #5225 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210401231322 2021-04-02 11:09:08 +00:00
dependabot-preview[bot]
f7a76242a4
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210331035658 to 0.1.0-prerelease.20210401231322.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210331035658...0.1.0-prerelease.20210401231322)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-04-02 10:45:26 +00:00
dependabot-preview[bot]
b965b7b3f5
Merge pull request #5222 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210402031543 2021-04-02 06:47:01 +00:00
dependabot-preview[bot]
ed6327d75e
Bump scratch-l10n from 3.11.20210331031557 to 3.11.20210402031543 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210331031557 to 3.11.20210402031543.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210331031557...3.11.20210402031543)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-04-02 03:31:05 +00:00
apple502j
9a3fc9876c
Add privacy policy and terms of use to allowlist 2021-04-02 04:28:27 +09:00
Paul Kaplan
75a9e6552e
Merge pull request #5219 from paulkaplan/fix-on-add-comment 
Include onAddComment for studio comments
 2021-04-01 15:10:29 -04:00
Paul Kaplan
3a9dde404e Include onAddComment for studio comments 2021-04-01 14:05:22 -04:00
Benjamin Wheeler
3a62fa3a51
Merge pull request #5017 from JoelGritter/patch-1 
Fix gh-4913: MacOS version string update
 2021-04-01 13:31:57 -04:00
Karishma Chadha
7eb583a867
Merge pull request #5217 from kchadha/studio-comments-fetching 
Studio Comments Fetching & Initial UI
 2021-04-01 12:36:55 -04:00