Commit graph

8601 commits

Author SHA1 Message Date
BryceLTaylor
a060311711 Add comments to jest integration tests about users used in tests 2021-08-18 13:46:50 -04:00
BryceLTaylor
a124d5d364 Update Chromedriver 2021-08-18 13:46:50 -04:00
BryceLTaylor
b3226b13f6 Add promote to studio manager integration test 2021-08-18 13:46:50 -04:00
kchadha
b21c0bd9e6 Merge remote-tracking branch 'origin/develop' into release/2021-08-18 2021-08-18 15:46:35 +00:00
Eric Rosenbaum
7df5921381 remove unused part of transfer host tile 2021-08-18 11:40:59 -04:00
Sarah Otts
62858d050c
Merge pull request #5935 from seotts/becomehost-activity-feed
Add studio host transfer notification to the activity feed
2021-08-18 09:33:28 -04:00
renovate[bot]
c3e4868d47
Merge pull request #5943 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210818113752
2021-08-18 12:35:49 +00:00
Renovate Bot
4b212fa0d4
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210818113752 2021-08-18 11:42:10 +00:00
renovate[bot]
00e4432935
Merge pull request #5941 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210818053118
2021-08-18 09:30:44 +00:00
Renovate Bot
4a2e09dcf7
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210818053118 2021-08-18 07:36:12 +00:00
renovate[bot]
2b39ff3ca5
Merge pull request #5942 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210818031501
2021-08-18 07:33:36 +00:00
Renovate Bot
65a3dc5189
chore(deps): update dependency scratch-l10n to v3.14.20210818031501 2021-08-18 04:28:35 +00:00
renovate[bot]
9d09e6aa94
Merge pull request #5940 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210817234637
2021-08-18 02:19:02 +00:00
Eric Rosenbaum
8a9999034e use named color 2021-08-17 21:29:29 -04:00
Eric Rosenbaum
154bb93297 use named color 2021-08-17 21:27:42 -04:00
Eric Rosenbaum
b35f6859cb Merge branch 'transfer-modal' of https://github.com/ericrosenbaum/scratch-www into transfer-modal 2021-08-17 21:16:03 -04:00
Eric Rosenbaum
f6d8d0331f update error alert 2021-08-17 21:15:54 -04:00
Eric Rosenbaum
374e78e8c9 remove unused function 2021-08-17 21:15:11 -04:00
Eric Rosenbaum
16f6d83db0 update strings 2021-08-17 21:14:46 -04:00
Eric Rosenbaum
6253e71d70 change name of isHost selector helper 2021-08-17 21:14:36 -04:00
Eric Rosenbaum
3e2249c316
Update src/views/studio/modals/transfer-host-modal.scss
Co-authored-by: Sarah Otts <se0042@gmail.com>
2021-08-17 21:13:58 -04:00
Eric Rosenbaum
04ff4d173b
Update src/views/studio/modals/transfer-host-modal.scss
Co-authored-by: Sarah Otts <se0042@gmail.com>
2021-08-17 21:13:38 -04:00
Renovate Bot
c9db74b4b1
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210817234637 2021-08-18 00:47:56 +00:00
Eric Rosenbaum
0f4fba7804 clarify comment 2021-08-17 20:47:56 -04:00
renovate[bot]
3becf664e9
Merge pull request #5939 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210817193707
2021-08-17 22:25:42 +00:00
Renovate Bot
fedb450c4c
chore(deps): update dependency scratch-l10n to v3.14.20210817193707 2021-08-17 20:30:29 +00:00
seotts
f635e14a17 remove period from message 2021-08-17 11:18:10 -04:00
renovate[bot]
86f7a79a00
Merge pull request #5938 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210817113510
2021-08-17 14:46:11 +00:00
Renovate Bot
72a26535aa
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210817113510 2021-08-17 12:22:33 +00:00
renovate[bot]
49bb485cb2
Merge pull request #5937 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210817031539
2021-08-17 10:30:34 +00:00
Renovate Bot
612ec5f3aa
chore(deps): update dependency scratch-l10n to v3.14.20210817031539 2021-08-17 04:15:21 +00:00
renovate[bot]
1a9a3315b1
Merge pull request #5936 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210816193803
2021-08-16 20:39:35 +00:00
Renovate Bot
6819f121f2
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210816193803 2021-08-16 19:45:54 +00:00
seotts
aec365c8db Add becomehost notification to the activity feed 2021-08-16 14:50:58 -04:00
renovate[bot]
7588dbcd62
Merge pull request #5934 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210816120506
2021-08-16 14:11:53 +00:00
Renovate Bot
b3ca10f658
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210816120506 2021-08-16 12:57:29 +00:00
renovate[bot]
c289b517e9
Merge pull request #5933 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210816031521
2021-08-16 07:18:46 +00:00
Renovate Bot
a1ca81c19f
chore(deps): update dependency scratch-l10n to v3.14.20210816031521 2021-08-16 04:24:15 +00:00
renovate[bot]
e650a7c673
Merge pull request #5932 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210815092754
2021-08-15 12:09:05 +00:00
Renovate Bot
f6fd5f7fa1
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210815092754 2021-08-15 10:31:15 +00:00
renovate[bot]
acc303866d
Merge pull request #5931 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210815045928
2021-08-15 08:16:30 +00:00
Renovate Bot
06b949f984
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210815045928 2021-08-15 05:11:44 +00:00
renovate[bot]
002124946e
Merge pull request #5930 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210815031459
2021-08-15 05:09:18 +00:00
Renovate Bot
aacfb69fbe
chore(deps): update dependency scratch-l10n to v3.14.20210815031459 2021-08-15 03:35:47 +00:00
Bryce Taylor
d4294829d8
Merge pull request #5743 from BryceLTaylor/test-studio-rate-limit
Add studio rate limit integration test
2021-08-13 16:25:47 -04:00
Eric Rosenbaum
d797309d23 add load more button 2021-08-13 15:46:15 -04:00
Eric Rosenbaum
c928a21135 update permissions 2021-08-13 15:46:15 -04:00
Eric Rosenbaum
b4c96f3193 fix permissions and correctly select host when admins transfer 2021-08-13 15:46:15 -04:00
Eric Rosenbaum
596816d7d1 admin can transfer host 2021-08-13 15:46:15 -04:00
Ray Schamp
b215b9523b
Merge pull request #5927 from LLK/release/2021-08-11
Re-merge release branch to develop
2021-08-12 16:36:47 -04:00