Commit graph

8276 commits

Author SHA1 Message Date
Paul Kaplan
51268695f2 test(studios): fix failing permissions tests for studios
there was a test that mutated global fixture data, causing future tests to fail
2021-07-13 14:01:30 -04:00
Paul Kaplan
8a495ee876
Merge pull request #5705 from LLK/release/2021-07-07
Develop release/2021-07-07
2021-07-08 12:01:15 -04:00
dependabot-preview[bot]
6ff43b5343
Merge pull request #5708 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210708031448 2021-07-08 04:00:10 +00:00
dependabot-preview[bot]
d7d1b3781a
Bump scratch-l10n from 3.13.20210704031505 to 3.13.20210708031448
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210704031505 to 3.13.20210708031448.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210704031505...3.13.20210708031448)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-08 03:37:55 +00:00
Paul Kaplan
dcf2682f09
Merge pull request #5662 from paulkaplan/test-studio-member-actions
Create detailed unit tests for studio-member-actions
2021-07-07 15:28:55 -04:00
paulkaplan
61a44889ac Merge remote-tracking branch 'origin/develop' into release/2021-07-07 2021-07-07 13:59:06 +00:00
Paul Kaplan
f84b142c93
Merge pull request #5697 from paulkaplan/load-full-rows
Load full rows for projects, curators, managers
2021-07-07 09:08:08 -04:00
dependabot-preview[bot]
b50ff21225
Merge pull request #5704 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210707095345 2021-07-07 10:53:56 +00:00
dependabot-preview[bot]
6aeddcfed3
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210703033613 to 0.1.0-prerelease.20210707095345.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210703033613...0.1.0-prerelease.20210707095345)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-07 10:31:56 +00:00
Paul Kaplan
ad386714a9 fix(studios): remove duplicate css for full width load more buttons
Remove the `display: content;` way of making the load more button full width, and reuse the existing
shared css class instead. Also change the markup back to the way it was originally, with the load
more button within the grid, since that is how it is meant to be used
2021-07-06 15:06:26 -04:00
Paul Kaplan
d693beb1b3 fix(studios): share css to make load more buttons full width
Changes the markup and css classes used by activity, curators, managers and projects grids to use a
shared full-width load more button
2021-07-06 14:51:16 -04:00
Paul Kaplan
4866d96da1 fix(studios): change the curators, projects and managers load count to 24
Changing from 20 to 24 will fix the issue where we are loading rows that aren't "full" on a 3-tile
row. Now it will always fill a row no matter the display breakpoint (1,2 or 3 tiles per row)
2021-07-06 14:36:12 -04:00
Paul Kaplan
9ad67dc297
Merge pull request #5684 from LLK/release/2021-06-30
Develop release/2021-06-30
2021-07-06 11:31:07 -04:00
Karishma Chadha
059f7ee4b6
Merge pull request #5685 from LLK/release/2021-06-30
Master release/2021-06-30
2021-07-06 11:06:33 -04:00
Paul Kaplan
e719d25e3d fix(studio): do not show mute error as if manager can edit info 2021-07-06 10:42:02 -04:00
Karishma Chadha
6dbf8d1bd5
Merge pull request #5692 from kchadha/manager-permissions
Update manager permissions for studios.
2021-07-06 09:22:59 -04:00
dependabot-preview[bot]
61e66acc88
Merge pull request #5690 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210703033613 2021-07-05 11:03:26 +00:00
dependabot-preview[bot]
b388047390
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210701034811 to 0.1.0-prerelease.20210703033613.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210701034811...0.1.0-prerelease.20210703033613)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-05 10:35:27 +00:00
dependabot-preview[bot]
52109c7e1f
Merge pull request #5689 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210704031505 2021-07-04 03:41:30 +00:00
dependabot-preview[bot]
88560a4dd7
Bump scratch-l10n from 3.13.20210703031554 to 3.13.20210704031505
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210703031554 to 3.13.20210704031505.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210703031554...3.13.20210704031505)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-04 03:20:48 +00:00
dependabot-preview[bot]
6afcbeec5f
Merge pull request #5688 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210703031554 2021-07-03 04:27:29 +00:00
dependabot-preview[bot]
9f2ba06d2a
Bump scratch-l10n from 3.13.20210701031453 to 3.13.20210703031554
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210701031453 to 3.13.20210703031554.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210701031453...3.13.20210703031554)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-03 03:21:53 +00:00
Paul Kaplan
54b9161dc0 fix(studio): prevent duplicate submissions on studio project browser modal 2021-07-01 13:36:29 -04:00
Paul Kaplan
e835cafc37 fix(studio): limit the max length of studio titles on the client side 2021-07-01 11:50:54 -04:00
dependabot-preview[bot]
d0509d4e9a
Merge pull request #5687 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210701034811 2021-07-01 11:36:37 +00:00
dependabot-preview[bot]
ecbedb78f1
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210629084355 to 0.1.0-prerelease.20210701034811.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210629084355...0.1.0-prerelease.20210701034811)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-01 10:40:21 +00:00
dependabot-preview[bot]
68ab824313
Merge pull request #5686 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210701031453 2021-07-01 03:57:19 +00:00
dependabot-preview[bot]
4bf7bd2112
Bump scratch-l10n from 3.13.20210630031503 to 3.13.20210701031453
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210630031503 to 3.13.20210701031453.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210630031503...3.13.20210701031453)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-01 03:37:06 +00:00
Paul Kaplan
0ca3431ec3 test: fix the new test for studio removeManager edge case 2021-06-30 11:26:54 -04:00
Paul Kaplan
e66a31abd8 test(studios): add missing test situations for studio-member-actions 2021-06-30 11:15:11 -04:00
chrisgarrity
4efbf000eb Merge remote-tracking branch 'origin/develop' into release/2021-06-30 2021-06-30 13:29:50 +00:00
dependabot-preview[bot]
40a015249f
Merge pull request #5683 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210630031503 2021-06-30 03:59:54 +00:00
dependabot-preview[bot]
2f4653b3a2
Bump scratch-l10n from 3.13.20210629031507 to 3.13.20210630031503
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210629031507 to 3.13.20210630031503.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210629031507...3.13.20210630031503)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-30 03:39:52 +00:00
dependabot-preview[bot]
e00088514e
Merge pull request #5682 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210629084355 2021-06-29 11:05:34 +00:00
dependabot-preview[bot]
106d27440b
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210628035957 to 0.1.0-prerelease.20210629084355.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210628035957...0.1.0-prerelease.20210629084355)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-29 10:39:47 +00:00
dependabot-preview[bot]
3f9933d20c
Merge pull request #5681 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210629031507 2021-06-29 04:04:54 +00:00
dependabot-preview[bot]
161d7d07c2
Bump scratch-l10n from 3.13.20210628031510 to 3.13.20210629031507
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210628031510 to 3.13.20210629031507.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210628031510...3.13.20210629031507)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-29 03:44:20 +00:00
Bryce Taylor
be38360443
Merge pull request #5671 from BryceLTaylor/studio-page-integration-tests
Studio page integration tests
2021-06-28 13:28:43 -04:00
BryceLTaylor
20b74ada3c update integration test for studio page to pass linting 2021-06-28 10:50:07 -04:00
Paul Kaplan
caeb6e476c Fixup incorrectly added code to test files 2021-06-28 09:54:53 -04:00
dependabot-preview[bot]
227b2d1ba5
Merge pull request #5677 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210628035957 2021-06-28 10:51:53 +00:00
dependabot-preview[bot]
d18fdf5504
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210625082409 to 0.1.0-prerelease.20210628035957.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210625082409...0.1.0-prerelease.20210628035957)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-28 10:32:47 +00:00
dependabot-preview[bot]
c240f25758
Merge pull request #5676 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210628031510 2021-06-28 04:05:02 +00:00
dependabot-preview[bot]
f2708330cf
Bump scratch-l10n from 3.13.20210626031455 to 3.13.20210628031510
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210626031455 to 3.13.20210628031510.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210626031455...3.13.20210628031510)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-28 03:44:58 +00:00
dependabot-preview[bot]
07258a9e07
Merge pull request #5675 from LLK/dependabot/npm_and_yarn/formatjs/intl-locale-2.4.33 2021-06-26 04:41:08 +00:00
dependabot-preview[bot]
603c54df6d
Merge pull request #5674 from LLK/dependabot/npm_and_yarn/formatjs/intl-pluralrules-4.0.28 2021-06-26 04:39:06 +00:00
dependabot-preview[bot]
b554adc687
Bump @formatjs/intl-locale from 2.4.32 to 2.4.33
Bumps [@formatjs/intl-locale](https://github.com/formatjs/formatjs) from 2.4.32 to 2.4.33.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-locale@2.4.32...@formatjs/intl-locale@2.4.33)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-26 04:19:28 +00:00
dependabot-preview[bot]
ecefaf6fcb
Bump @formatjs/intl-pluralrules from 4.0.27 to 4.0.28
Bumps [@formatjs/intl-pluralrules](https://github.com/formatjs/formatjs) from 4.0.27 to 4.0.28.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-pluralrules@4.0.27...@formatjs/intl-pluralrules@4.0.28)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-26 04:17:15 +00:00
dependabot-preview[bot]
5c65764249
Merge pull request #5672 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210626031455 2021-06-26 03:42:26 +00:00
dependabot-preview[bot]
546425cd26
Bump scratch-l10n from 3.13.20210625031500 to 3.13.20210626031455
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210625031500 to 3.13.20210626031455.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210625031500...3.13.20210626031455)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-26 03:20:45 +00:00