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

7575 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Bryce Taylor
23027f0b88
Merge pull request #5218 from BryceLTaylor/studios-playground-to-routes 
Move the studio route from routes-dev.json to routes.json
 2021-04-01 10:57:25 -04:00
Paul Kaplan
6026ededd3 Only pass explicit props to prepare for better permission selectors 2021-04-01 09:41:52 -04:00
Paul Kaplan
8434a06a90 Remove extra check for logged in 2021-04-01 09:29:52 -04:00
Paul Kaplan
8bc6e4ee77 Remove unneeded debug info 2021-04-01 09:24:13 -04:00
Paul Kaplan
1ad53aeb23 Add postURI which was left off by mistake 2021-04-01 09:23:59 -04:00
Paul Kaplan
ead57013e3 Use useCallback instead of binding anonymous function 2021-04-01 09:23:42 -04:00
Paul Kaplan
b8b56fff61 Destructure props to clean up the code 2021-04-01 09:23:16 -04:00
Karishma Chadha
073c14e6da Add UI for composing a comment and seeing the list of comments on the studio comments tab. Starting to fill in some additional state information like logged in state 2021-03-31 16:38:44 -04:00
BryceLTaylor
11c773deb4 Move the studio route from routes-dev.json to routes.json 2021-03-31 16:23:00 -04:00
Karishma Chadha
4d5fdf6094 Generalize comment components for use with projects and studios by taking passing in the POST URI as a prop. Update project page to accommodate the new prop. 2021-03-31 16:19:19 -04:00
Karishma Chadha
9c83271af7 Create studio comment action creators. Add comments reducer and initial studio comment actions to studio comments view. Display preliminary data fetching. 2021-03-31 14:41:49 -04:00
Karishma Chadha
9c06f27c7e
Merge pull request #5216 from LLK/hotfix/totally-normal-2021 
[Master] Hotfix/totally normal 2021
 2021-03-31 11:56:30 -04:00
Eric Rosenbaum
4a7d909671
Merge pull request #5211 from ericrosenbaum/more-components 
Add more components to the components page
 2021-03-31 11:36:56 -04:00
Bryce Taylor
80258f4b40
Merge pull request #5212 from BryceLTaylor/update-get-pip-url 
circleci update get-pip link
 2021-03-31 09:45:52 -04:00
dependabot-preview[bot]
4089b56758
Merge pull request #5215 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210331035658 2021-03-31 11:01:03 +00:00
dependabot-preview[bot]
bdc1d50d71
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210330054904 to 0.1.0-prerelease.20210331035658.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210330054904...0.1.0-prerelease.20210331035658)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-31 10:45:29 +00:00
dependabot-preview[bot]
5d6e39da18
Merge pull request #5213 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210331031557 2021-03-31 03:41:20 +00:00
dependabot-preview[bot]
ce0ce87472
Bump scratch-l10n from 3.11.20210330031505 to 3.11.20210331031557 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210330031505 to 3.11.20210331031557.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210330031505...3.11.20210331031557)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-31 03:32:32 +00:00
BryceLTaylor
b6a16aa864 circleci update get-pip link 2021-03-30 17:59:41 -04:00
Eric Rosenbaum
542c416ea7 lint 2021-03-30 15:49:33 -04:00
Eric Rosenbaum
ec0f41286d lint 2021-03-30 15:44:41 -04:00
Eric Rosenbaum
eec9b29516 add text area 2021-03-30 15:41:52 -04:00
Bryce Taylor
13f2c3eeaf
Merge pull request #5177 from BryceLTaylor/switch-to-circle-for-develop 
circleci deploy to staging with circle instead of travis
 2021-03-30 14:39:10 -04:00
Eric Rosenbaum
2ff5e8d8fb styling 2021-03-30 10:53:06 -04:00
Eric Rosenbaum
33b7d87840 update grid json 2021-03-30 10:52:57 -04:00