Commit graph

8091 commits

Author SHA1 Message Date
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
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
dependabot-preview[bot]
70acd3b225
Merge pull request #5596 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210613031652 2021-06-13 03:42:44 +00:00
dependabot-preview[bot]
e97921cf8d
Bump scratch-l10n from 3.11.20210612031607 to 3.11.20210613031652
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210612031607 to 3.11.20210613031652.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210612031607...3.11.20210613031652)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-13 03:23:39 +00:00
dependabot-preview[bot]
f3718d6763
Merge pull request #5595 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210612031607 2021-06-12 03:40:15 +00:00
dependabot-preview[bot]
46150c9980
Bump scratch-l10n from 3.11.20210611210725 to 3.11.20210612031607
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210611210725 to 3.11.20210612031607.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210611210725...3.11.20210612031607)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-12 03:21:56 +00:00
dependabot-preview[bot]
0c635fb0d1
Merge pull request #5593 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210611210725 2021-06-11 21:31:12 +00:00
dependabot-preview[bot]
b6328ee0de
Bump scratch-l10n from 3.11.20210611031724 to 3.11.20210611210725
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210611031724 to 3.11.20210611210725.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210611031724...3.11.20210611210725)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-11 21:13:16 +00:00
Karishma Chadha
8ab13436c0
Merge pull request #5588 from kchadha/manager-limit
Studio Manager Limit
2021-06-11 16:39:27 -04:00
Karishma Chadha
85beabad19 Remove unneded redux connect code 2021-06-11 15:58:22 -04:00
Karishma Chadha
c773018c8e Update managerCount in redux when promoting a curator or removing a manager. 2021-06-11 15:55:28 -04:00
Eric Rosenbaum
4864913658
Merge pull request #5585 from ericrosenbaum/add-to-studio-empty-states-and-done-btn
"Add to studio" modal empty states and done button
2021-06-11 15:04:19 -04:00
Karishma Chadha
75687e52f7 Remove commented out CSS styling 2021-06-11 14:17:21 -04:00
Paul Kaplan
0bc9a92c4f
Merge pull request #5575 from LLK/release/2021-06-09
Develop release/2021-06-09
2021-06-11 10:38:34 -04:00
dependabot-preview[bot]
ad4c52da84
Merge pull request #5591 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210611035846 2021-06-11 11:01:33 +00:00
dependabot-preview[bot]
5d94af2dc4
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210610000654 to 0.1.0-prerelease.20210611035846.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210610000654...0.1.0-prerelease.20210611035846)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-11 10:44:25 +00:00
dependabot-preview[bot]
fdbdc9e7ca
Merge pull request #5589 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210611031724 2021-06-11 03:46:45 +00:00
dependabot-preview[bot]
b6c769bd46
Bump scratch-l10n from 3.11.20210610031613 to 3.11.20210611031724
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210610031613 to 3.11.20210611031724.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210610031613...3.11.20210611031724)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-11 03:29:21 +00:00
Karishma Chadha
6486f119a3 fix trailing space issue 2021-06-10 19:40:53 -04:00
Karishma Chadha
9fc2f8167d Fix prop warning in the studio curator invite box. 2021-06-10 19:24:54 -04:00
Karishma Chadha
96aeabd255 Display info to managers/studio creator about how close the studio is to reaching the manager limit when over a threshold. Display info about removing managers when a studio has reached the limit. 2021-06-10 19:24:25 -04:00
Karishma Chadha
40b8f5a5c9 Update styling of promote modal so that if we get a network or other server error while trying to promote, we see the error message in the modal (and closer to the promote button). 2021-06-10 19:22:22 -04:00
Karishma Chadha
51858167c9 Display manager limit modal in two scenarios: if the frontend already knows that the manager limit has been reached, and if we have the promote modal up, but we got response from the server that the manager limit has been reached. 2021-06-10 19:20:51 -04:00