scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 09:35:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
8116 commits 216 branches 1 tag 474 MiB
Commit graph

8116 commits

This branch
This branch
All branches
Author SHA1 Message Date
picklesrus
d3e368bce2
Merge branch 'develop' into studio-comments-off 2021-06-17 13:47:03 -04:00
Eric Rosenbaum
bba5b69cb9
Merge pull request #5617 from LLK/release/2021-06-16 
Develop release/2021-06-16
 2021-06-17 13:17:50 -04:00
Karishma Chadha
f4b0bc8aee
Merge pull request #5621 from kchadha/studio-permissions-audit 
Studio creators and managers can delete their own comments
 2021-06-17 12:21:40 -04:00
Sarah Otts
3e6f0c70fd
Merge pull request #5625 from seotts/revert-muted-add-proj 
Revert "Merge pull request #5573 from seotts/muted-add-proj-via-proj-…
 2021-06-17 09:05:10 -04:00
seotts
5b7127a271 Revert "Merge pull request #5573 from seotts/muted-add-proj-via-proj-page" 
This reverts commit d468072552, reversing
changes made to 469878a2fc.
 2021-06-17 09:02:31 -04:00
dependabot-preview[bot]
230bd332f7
Merge pull request #5624 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210617035831 2021-06-17 11:01:42 +00:00
dependabot-preview[bot]
ef87bf238a
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210616035726 to 0.1.0-prerelease.20210617035831.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210616035726...0.1.0-prerelease.20210617035831)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-17 10:43:34 +00:00
dependabot-preview[bot]
1c2bf2bb16
Merge pull request #5623 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210617031540 2021-06-17 04:08:16 +00:00
dependabot-preview[bot]
8b784fc418
Bump scratch-l10n from 3.13.20210616143212 to 3.13.20210617031540 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210616143212 to 3.13.20210617031540.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210616143212...3.13.20210617031540)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-17 03:49:43 +00:00
Benjamin Wheeler
d8df10e288
Merge pull request #5594 from benjiwheeler/trouble-maintenance-icons 
update maintenance and trouble page static content
 2021-06-16 14:54:42 -04:00
dependabot-preview[bot]
d10a7ddcdd
Merge pull request #5616 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210616035726 2021-06-16 16:00:40 +00:00
Karishma Chadha
8821e0e865 Studio creators and managers can delete their own comments 2021-06-16 11:17:43 -04:00
dependabot-preview[bot]
b38386c56c
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210615041617 to 0.1.0-prerelease.20210616035726.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210615041617...0.1.0-prerelease.20210616035726)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-16 15:02:54 +00:00
dependabot-preview[bot]
dec7833123
Merge pull request #5619 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210616143212 2021-06-16 14:57:52 +00:00
dependabot-preview[bot]
f091fc9b3c
Bump scratch-l10n from 3.12.20210615031544 to 3.13.20210616143212 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.12.20210615031544 to 3.13.20210616143212.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.12.20210615031544...3.13.20210616143212)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-16 14:38:22 +00:00
ericrosenbaum
73b2c3f6ae Merge remote-tracking branch 'origin/develop' into release/2021-06-16 2021-06-16 14:35:40 +00:00
picklesrus
cda92f329d Fix lint 2021-06-15 17:34:05 -04:00
picklesrus
91f1c7ccf9 Merge branch 'studio-comments-off' of https://github.com/picklesrus/scratch-www into studio-comments-off 
resolve conflicts
 2021-06-15 17:25:22 -04:00
picklesrus
64f9d80c2a
Merge branch 'develop' into studio-comments-off 2021-06-15 17:24:43 -04:00
picklesrus
36516447cc Fix up tests from refactor and fix bug from refactor. 2021-06-15 17:22:32 -04:00
Bryce Taylor
8dc6f69b09
Merge pull request #5614 from BryceLTaylor/run-jest-tests-in-band 
run jest integration tests with --runInBand
 2021-06-15 16:41:13 -04:00
BryceLTaylor
a454686a92 run jest tests with --runInBand 2021-06-15 16:12:40 -04:00
Sarah Otts
d468072552
Merge pull request #5573 from seotts/muted-add-proj-via-proj-page 
Muted users can’t add projects to studio via project page
 2021-06-15 15:26:47 -04:00
Eric Rosenbaum
469878a2fc
Merge pull request #5608 from fsih/thumbWhiteBg 
Adjust thumbnail css
 2021-06-15 15:06:09 -04:00
Sarah Otts
a0ab492bd9
Merge branch 'develop' into muted-add-proj-via-proj-page 2021-06-15 14:50:15 -04:00
Eric Rosenbaum
6bbc62c5e3 thumbnail in report matches main thumbnail style 2021-06-15 12:16:33 -04:00
Eric Rosenbaum
a344f1280d style fixes 2021-06-15 12:16:04 -04:00
Sarah Otts
bf9622d924
Merge pull request #5577 from seotts/muted-errors-from-backend 
Show errors when studio edit gets a muted response from backend
 2021-06-15 11:04:05 -04:00
seotts
1a753dfde3 Put Add to Studio change behind session flag 2021-06-15 09:45:09 -04:00
seotts
56dc892ee5 Muted user can’t add proj to studio via proj page 2021-06-15 09:45:09 -04:00
dependabot-preview[bot]
dfbce650b9
Merge pull request #5610 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210615041617 2021-06-15 10:57:25 +00:00
dependabot-preview[bot]
24646958cb
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210615013557 to 0.1.0-prerelease.20210615041617.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210615013557...0.1.0-prerelease.20210615041617)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-15 10:38:51 +00:00
DD Liu
df19f1b421 Adjust thumbnail css 2021-06-15 03:49:41 -04:00
dependabot-preview[bot]
fe184bef96
Merge pull request #5606 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.12.20210615031544 2021-06-15 04:04:04 +00:00
dependabot-preview[bot]
ac41cd1d31
Bump scratch-l10n from 3.12.20210614210413 to 3.12.20210615031544 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.12.20210614210413 to 3.12.20210615031544.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.12.20210614210413...3.12.20210615031544)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-15 03:45:53 +00:00
dependabot-preview[bot]
016b7720f4
Merge pull request #5605 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210615013557 2021-06-15 02:30:32 +00:00
dependabot-preview[bot]
11ed09d763
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210614040305 to 0.1.0-prerelease.20210615013557.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210614040305...0.1.0-prerelease.20210615013557)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-15 02:13:16 +00:00
dependabot-preview[bot]
01a67690a3
Merge pull request #5604 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.12.20210614210413 2021-06-14 21:27:49 +00:00
picklesrus
6b4bab02d1 Move logic about whether session is fetched into selectors 2021-06-14 17:15:47 -04:00
dependabot-preview[bot]
3ecf94deb6
Bump scratch-l10n from 3.12.20210614183204 to 3.12.20210614210413 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.12.20210614183204 to 3.12.20210614210413.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.12.20210614183204...3.12.20210614210413)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-14 21:09:57 +00:00
Sarah Otts
a7dae0561b
Merge branch 'develop' into muted-errors-from-backend 2021-06-14 15:40:05 -04:00
dependabot-preview[bot]
eb2c963413
Merge pull request #5603 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.12.20210614183204 2021-06-14 18:56:13 +00:00
dependabot-preview[bot]
88211c2d1b
Bump scratch-l10n from 3.11.20210614031633 to 3.12.20210614183204 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210614031633 to 3.12.20210614183204.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210614031633...3.12.20210614183204)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-14 18:37:55 +00:00
Ray Schamp
a17919e561
Merge pull request #5496 from rschamp/rearrange-conference-2021 
Bump Conference 2020 to 2021 (Take 2)
 2021-06-14 09:01:51 -04:00
dependabot-preview[bot]
8a686311cd
Merge pull request #5600 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210614040305 2021-06-14 10:58:09 +00:00
dependabot-preview[bot]
01a93e3adf
Bump scratch-gui 
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210611035846 to 0.1.0-prerelease.20210614040305.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210611035846...0.1.0-prerelease.20210614040305)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-14 10:36:02 +00:00
dependabot-preview[bot]
cb2e9b22b2
Merge pull request #5597 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210614031633 2021-06-14 04:01:07 +00:00
dependabot-preview[bot]
4c9cc533d3
Bump scratch-l10n from 3.11.20210613031652 to 3.11.20210614031633 
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210613031652 to 3.11.20210614031633.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210613031652...3.11.20210614031633)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-14 03:41:51 +00:00
DD Liu
2d884eef64
Merge pull request #5578 from fsih/whiteButtons 
Make the default nav button state white
 2021-06-13 23:07:33 -04:00
DD Liu
deb1f5eb7e
Merge pull request #5580 from fsih/titleLimit 
Make the title scroll after a certain length, and long words wrap
 2021-06-13 23:07:23 -04:00