Karishma Chadha
|
0663a1ca74
|
Merge pull request #5270 from kchadha/release/2021-04-15
Fix merge conflicts on release branch for 04/15/2021
|
2021-04-21 12:58:21 -04:00 |
|
Karishma Chadha
|
1c4b1add76
|
Merge branch 'develop' into release/2021-04-15
|
2021-04-21 12:54:09 -04:00 |
|
Paul Kaplan
|
64fecf28bb
|
Merge pull request #5237 from paulkaplan/studio-comment-more-actions
Hook up remaining comment actions for studio comments
|
2021-04-20 13:11:14 -04:00 |
|
picklesrus
|
2367d8e143
|
Merge pull request #5262 from LLK/release/2021-04-15
[Master] Release 2021-04-15
|
2021-04-20 10:58:33 -04:00 |
|
dependabot-preview[bot]
|
8fa0b9779b
|
Merge pull request #5265 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210415094805
|
2021-04-15 11:15:07 +00:00 |
|
dependabot-preview[bot]
|
c7148f2e5b
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210413191604 to 0.1.0-prerelease.20210415094805.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210413191604...0.1.0-prerelease.20210415094805)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-04-15 11:05:09 +00:00 |
|
dependabot-preview[bot]
|
8787327219
|
Merge pull request #5264 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210415031450
|
2021-04-15 06:39:30 +00:00 |
|
dependabot-preview[bot]
|
3a562fc05b
|
Bump scratch-l10n from 3.11.20210413031556 to 3.11.20210415031450
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210413031556 to 3.11.20210415031450.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210413031556...3.11.20210415031450)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-04-15 06:28:56 +00:00 |
|
Eric Rosenbaum
|
ed425a3320
|
roll back GUI
|
2021-04-14 10:33:51 -04:00 |
|
Eric Rosenbaum
|
45a57ad968
|
Merge pull request #5261 from LLK/develop
merge from develop to release branch
|
2021-04-14 10:22:49 -04:00 |
|
Eric Rosenbaum
|
7bcd7cca51
|
Merge pull request #5260 from LLK/revert-5243-revert-5234-release/2021-04-07
Revert "Revert "[master] Release 2021-04-07"" (re-apply last week's changes)
|
2021-04-14 10:20:56 -04:00 |
|
Eric Rosenbaum
|
eb3c65d078
|
Revert "Revert "[master] Release 2021-04-07""
|
2021-04-14 10:18:08 -04:00 |
|
dependabot-preview[bot]
|
4f3082cd16
|
Merge pull request #5259 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210413191604
|
2021-04-14 11:44:32 +00:00 |
|
dependabot-preview[bot]
|
af7f8d844a
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210413041110 to 0.1.0-prerelease.20210413191604.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210413041110...0.1.0-prerelease.20210413191604)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-04-14 11:34:41 +00:00 |
|
dependabot-preview[bot]
|
dd5850ded8
|
Merge pull request #5256 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210413041110
|
2021-04-13 10:52:04 +00:00 |
|
dependabot-preview[bot]
|
0fa561ca6e
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210412041818 to 0.1.0-prerelease.20210413041110.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210412041818...0.1.0-prerelease.20210413041110)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-04-13 10:41:53 +00:00 |
|
dependabot-preview[bot]
|
af1bfb14cb
|
Merge pull request #5255 from LLK/dependabot/npm_and_yarn/webpack-bundle-analyzer-4.4.1
|
2021-04-13 09:38:07 +00:00 |
|
dependabot-preview[bot]
|
1860431c21
|
Bump webpack-bundle-analyzer from 4.4.0 to 4.4.1
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 4.4.0 to 4.4.1.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v4.4.0...v4.4.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-04-13 09:28:56 +00:00 |
|
dependabot-preview[bot]
|
c90a253805
|
Merge pull request #5254 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210413031556
|
2021-04-13 03:51:18 +00:00 |
|
dependabot-preview[bot]
|
3a6dcc703b
|
Bump scratch-l10n from 3.11.20210412031607 to 3.11.20210413031556
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210412031607 to 3.11.20210413031556.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210412031607...3.11.20210413031556)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-04-13 03:42:12 +00:00 |
|
Ben Wheeler
|
e80a343211
|
removed unnecessary Page component
|
2021-04-12 15:15:17 -04:00 |
|
dependabot-preview[bot]
|
a0c59bc716
|
Merge pull request #5251 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210412041818
|
2021-04-12 12:53:26 +00:00 |
|
dependabot-preview[bot]
|
ebbda12481
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210407220130 to 0.1.0-prerelease.20210412041818.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210407220130...0.1.0-prerelease.20210412041818)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-04-12 12:44:24 +00:00 |
|
dependabot-preview[bot]
|
137d688ab1
|
Merge pull request #5250 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210412031607
|
2021-04-12 04:01:01 +00:00 |
|
dependabot-preview[bot]
|
1d233a0c53
|
Bump scratch-l10n from 3.11.20210410031537 to 3.11.20210412031607
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210410031537 to 3.11.20210412031607.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210410031537...3.11.20210412031607)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-04-12 03:48:45 +00:00 |
|
dependabot-preview[bot]
|
43fc242323
|
Merge pull request #5249 from LLK/dependabot/npm_and_yarn/formatjs/intl-relativetimeformat-8.1.5
|
2021-04-12 03:13:44 +00:00 |
|
dependabot-preview[bot]
|
1549d8afe8
|
Merge pull request #5248 from LLK/dependabot/npm_and_yarn/formatjs/intl-pluralrules-4.0.14
|
2021-04-12 03:12:41 +00:00 |
|
dependabot-preview[bot]
|
f8745dc6e5
|
Merge pull request #5247 from LLK/dependabot/npm_and_yarn/formatjs/intl-locale-2.4.22
|
2021-04-12 03:11:40 +00:00 |
|
dependabot-preview[bot]
|
ff64fadcaf
|
Bump @formatjs/intl-relativetimeformat from 8.1.4 to 8.1.5
Bumps [@formatjs/intl-relativetimeformat](https://github.com/formatjs/formatjs) from 8.1.4 to 8.1.5.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-relativetimeformat@8.1.4...@formatjs/intl-relativetimeformat@8.1.5)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-04-12 03:04:01 +00:00 |
|
dependabot-preview[bot]
|
41ad41f711
|
Bump @formatjs/intl-pluralrules from 4.0.13 to 4.0.14
Bumps [@formatjs/intl-pluralrules](https://github.com/formatjs/formatjs) from 4.0.13 to 4.0.14.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-pluralrules@4.0.13...@formatjs/intl-pluralrules@4.0.14)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-04-12 03:03:03 +00:00 |
|
dependabot-preview[bot]
|
d6e4ca5302
|
Bump @formatjs/intl-locale from 2.4.21 to 2.4.22
Bumps [@formatjs/intl-locale](https://github.com/formatjs/formatjs) from 2.4.21 to 2.4.22.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-locale@2.4.21...@formatjs/intl-locale@2.4.22)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-04-12 03:02:52 +00:00 |
|
dependabot-preview[bot]
|
46260a0d5c
|
Merge pull request #5246 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210410031537
|
2021-04-10 03:35:01 +00:00 |
|
dependabot-preview[bot]
|
1b21d04c85
|
Bump scratch-l10n from 3.11.20210409031547 to 3.11.20210410031537
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210409031547 to 3.11.20210410031537.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210409031547...3.11.20210410031537)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-04-10 03:24:54 +00:00 |
|
picklesrus
|
1b00523996
|
Merge pull request #5243 from LLK/revert-5234-release/2021-04-07
Revert "[master] Release 2021-04-07"
|
2021-04-09 08:38:42 -04:00 |
|
picklesrus
|
2dcbeb4661
|
Revert "[master] Release 2021-04-07"
|
2021-04-09 08:34:55 -04:00 |
|
dependabot-preview[bot]
|
a4462b964c
|
Merge pull request #5240 from LLK/dependabot/npm_and_yarn/scratch-l10n-3.11.20210409031547
|
2021-04-09 03:37:33 +00:00 |
|
dependabot-preview[bot]
|
aa0e7a28e7
|
Bump scratch-l10n from 3.11.20210405031550 to 3.11.20210409031547
Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210405031550 to 3.11.20210409031547.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210405031550...3.11.20210409031547)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-04-09 03:28:21 +00:00 |
|
Paul Kaplan
|
2b4cd0e96d
|
Merge pull request #5235 from LLK/release/2021-04-07
|
2021-04-08 11:14:17 -04:00 |
|
Paul Kaplan
|
7c4871c19b
|
Remove unused reference
|
2021-04-08 10:57:28 -04:00 |
|
Paul Kaplan
|
97acafc446
|
Merge pull request #5234 from LLK/release/2021-04-07
[master] Release 2021-04-07
|
2021-04-08 10:39:20 -04:00 |
|
Paul Kaplan
|
74a29a62a0
|
Hook up delete restore and report actions for studio comments
|
2021-04-08 10:38:34 -04:00 |
|
Paul Kaplan
|
810eadd258
|
Remove params from studio comment actions that can be retrieved from state
|
2021-04-08 10:37:45 -04:00 |
|
Paul Kaplan
|
11794d885a
|
Add permissions selectors and tests for studio comments
|
2021-04-08 10:36:56 -04:00 |
|
Paul Kaplan
|
7a8f2b61dc
|
Merge pull request #5231 from paulkaplan/use-getstate-in-thunks
Use getState in thunks instead of passing props around
|
2021-04-08 09:14:57 -04:00 |
|
dependabot-preview[bot]
|
71bb3a7665
|
Merge pull request #5236 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20210407220130
|
2021-04-08 11:31:19 +00:00 |
|
dependabot-preview[bot]
|
955bd415f6
|
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210401231322 to 0.1.0-prerelease.20210407220130.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210401231322...0.1.0-prerelease.20210407220130)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2021-04-08 11:19:20 +00:00 |
|
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
|
7a5bdc0400
|
Change class for search input wrapper to search-wrapper
|
2021-04-06 14:19:05 -04:00 |
|
BryceLTaylor
|
0cd1f6e6be
|
Add class to searchbar for automated tests
|
2021-04-06 14:19:05 -04:00 |
|
BryceLTaylor
|
37d279f6e5
|
Search for the gui component in navbar create test
|
2021-04-06 14:19:05 -04:00 |
|