Commit graph

8359 commits

Author SHA1 Message Date
dependabot-preview[bot]
37c7c9e2a0
build(deps-dev): bump scratch-l10n
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210714031604 to 3.13.20210715031457.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210714031604...3.13.20210715031457)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-15 03:30:45 +00:00
Sarah Otts
fc056b1394
Merge pull request #5731 from seotts/fix-sec-locations
Fix locations in SEC page
2021-07-14 15:55:22 -04:00
Sarah Otts
3c87da9a75
Merge pull request #5730 from seotts/fix-sec-locations
Fix locations in SEC
2021-07-14 15:53:42 -04:00
seotts
aa42941226 Fix locations in SEC page 2021-07-14 15:46:02 -04:00
ericrosenbaum
93eca0cdf8 Merge remote-tracking branch 'origin/develop' into release/2021-07-14 2021-07-14 15:15:42 +00:00
Paul Kaplan
d5d3107dc4
Merge pull request #5722 from paulkaplan/fix-failing-permissions-test
test(studios): fix failing permissions tests for studios
2021-07-14 09:04:53 -04:00
dependabot-preview[bot]
d0e92d6b6f
Merge pull request #5725 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210713200530 2021-07-14 11:01:45 +00:00
dependabot-preview[bot]
d6e6ba38b8
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210711035201 to 0.1.0-prerelease.20210713200530.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210711035201...0.1.0-prerelease.20210713200530)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-14 10:31:38 +00:00
dependabot-preview[bot]
e2c1d1d398
Merge pull request #5723 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210714031604 2021-07-14 04:00:59 +00:00
dependabot-preview[bot]
5b6ca65ffd
Bump scratch-l10n from 3.13.20210713031546 to 3.13.20210714031604
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210713031546 to 3.13.20210714031604.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210713031546...3.13.20210714031604)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-14 03:38:42 +00:00
Sarah Otts
3bf403e3c1
Merge pull request #5718 from zoebentley/sec-participating-orgs
Update SEC landing page with list of participating orgs and partner orgs
2021-07-13 17:01:51 -04:00
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
Zoë Bentley
66148879b3 Made org names and letter titles non-translated, fixed a CSS error, and removed unused strings 2021-07-13 10:53:33 -04:00
Zoë Bentley
a9aeda17cf lint 3 2021-07-13 09:30:03 -04:00
dependabot-preview[bot]
b20ca11a41
Merge pull request #5721 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210713031546 2021-07-13 03:57:32 +00:00
dependabot-preview[bot]
e22dabcb98
Bump scratch-l10n from 3.13.20210712031609 to 3.13.20210713031546
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210712031609 to 3.13.20210713031546.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210712031609...3.13.20210713031546)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-13 03:35:44 +00:00
Zoë Bentley
69a383ceb2 Added links and locations for partner organizations 2021-07-12 17:19:30 -04:00
Zoë Bentley
0149718c8d lint 2 2021-07-12 11:32:09 -04:00
Zoë Bentley
791b4c7cde lint 2021-07-12 11:31:49 -04:00
Zoë Bentley
15ad33aa05 Added ILCE to list of orgs 2021-07-12 11:16:16 -04:00
Zoë Bentley
f660af26eb Updated SEC page with 39 participating orgs and 6 partner orgs 2021-07-12 10:43:01 -04:00
dependabot-preview[bot]
0d3d956f4c
Merge pull request #5717 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210711035201 2021-07-12 12:23:46 +00:00
dependabot-preview[bot]
59feb6ba04
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210709233336 to 0.1.0-prerelease.20210711035201.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210709233336...0.1.0-prerelease.20210711035201)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-12 12:01:19 +00:00
dependabot-preview[bot]
9dea1a38f8
Merge pull request #5715 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210712031609 2021-07-12 04:07:22 +00:00
dependabot-preview[bot]
b4d6fc4b66
Bump scratch-l10n from 3.13.20210711031507 to 3.13.20210712031609
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210711031507 to 3.13.20210712031609.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210711031507...3.13.20210712031609)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-12 03:45:32 +00:00
dependabot-preview[bot]
591119823b
Merge pull request #5714 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210711031507 2021-07-11 03:43:57 +00:00
dependabot-preview[bot]
defea636b1
Bump scratch-l10n from 3.13.20210710031548 to 3.13.20210711031507
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210710031548 to 3.13.20210711031507.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210710031548...3.13.20210711031507)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-11 03:21:25 +00:00
dependabot-preview[bot]
fd9e3021b5
Merge pull request #5713 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210709233336 2021-07-10 04:45:02 +00:00
dependabot-preview[bot]
00109ab2ae
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210707095345 to 0.1.0-prerelease.20210709233336.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210707095345...0.1.0-prerelease.20210709233336)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-10 04:03:42 +00:00
dependabot-preview[bot]
02aa8f5fc8
Merge pull request #5712 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.13.20210710031548 2021-07-10 03:58:59 +00:00
dependabot-preview[bot]
fe1587a2d7
Bump scratch-l10n from 3.13.20210708031448 to 3.13.20210710031548
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.13.20210708031448 to 3.13.20210710031548.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.13.20210708031448...3.13.20210710031548)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-10 03:21:43 +00:00
Bryce Taylor
2a3a5052d6
Merge pull request #5711 from BryceLTaylor/studio-integration-test
check rate limit for studio creation integration test
2021-07-09 09:54:48 -04:00
BryceLTaylor
9f7fa72e9e check rate limit for studio creation integration test 2021-07-09 09:40:25 -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
Paul Kaplan
ce3313a05d
Merge pull request #5706 from LLK/release/2021-07-07
Master release/2021-07-07
2021-07-08 10:31:26 -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