Commit graph

8583 commits

Author SHA1 Message Date
renovate[bot]
a5838b09d8
Merge pull request #5962 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210821112420
2021-08-21 13:31:57 +00:00
Renovate Bot
b37365b08a
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210821112420 2021-08-21 12:05:27 +00:00
renovate[bot]
dda369883a
Merge pull request #5961 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210821054408
2021-08-21 10:21:13 +00:00
Renovate Bot
23d4108ef6
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210821054408 2021-08-21 08:15:02 +00:00
renovate[bot]
659a931fbd
Merge pull request #5960 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210821031719
2021-08-21 08:12:36 +00:00
Renovate Bot
7480a31894
chore(deps): update dependency scratch-l10n to v3.14.20210821031719 2021-08-21 04:14:21 +00:00
Eric Rosenbaum
bdab707d2c
Merge pull request #5958 from ericrosenbaum/longer-alerts
Increase default alert duration to 6 seconds
2021-08-20 16:39:26 -04:00
Eric Rosenbaum
a8b7961f66 alerts default to 6 seconds 2021-08-20 14:04:09 -04:00
renovate[bot]
872737ad50
Merge pull request #5956 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210820141456
2021-08-20 17:22:09 +00:00
Renovate Bot
0fd29b426c
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210820141456 2021-08-20 15:51:23 +00:00
Bryce Taylor
d23e4d6ceb
Merge pull request #5946 from BryceLTaylor/studio-management-integration-tests
Studio management integration tests
2021-08-20 11:41:53 -04:00
BryceLTaylor
6ec730887c Clean up studio integration tests 2021-08-20 11:26:00 -04:00
BryceLTaylor
f67fcdc495 Check text of curator invite in studio integration test 2021-08-20 11:24:31 -04:00
Sarah Otts
3ae87754a0
Merge pull request #5760 from LankyBox01/patch-1
Add line breaks to description
2021-08-20 11:07:27 -04:00
renovate[bot]
10073b02c9
Merge pull request #5955 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210820094114
2021-08-20 10:47:47 +00:00
Renovate Bot
23820fc1be
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210820094114 2021-08-20 09:45:12 +00:00
renovate[bot]
c17ce350ab
Merge pull request #5954 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210820031536
2021-08-20 07:19:28 +00:00
Renovate Bot
4c121455c8
chore(deps): update dependency scratch-l10n to v3.14.20210820031536 2021-08-20 04:12:40 +00:00
renovate[bot]
70dc8813a2
Merge pull request #5953 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210820011132
2021-08-20 02:45:50 +00:00
Renovate Bot
865af4a9dc
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210820011132 2021-08-20 01:33:35 +00:00
Eric Rosenbaum
296506ff84
Merge pull request #5920 from ericrosenbaum/transfer-modal
Studio host transfer modal (work in progress)
2021-08-19 14:04:35 -04:00
Karishma Chadha
4177f9b965
Merge pull request #5944 from LLK/release/2021-08-18
[Develop] release/2021-08-18
2021-08-19 13:44:49 -04:00
BryceLTaylor
4d1a010ee6 Update package-lock 2021-08-19 11:40:50 -04:00
renovate[bot]
5177c43267
Merge pull request #5948 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210819085604
2021-08-19 10:57:51 +00:00
Renovate Bot
99d38cef4e
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210819085604 2021-08-19 09:24:42 +00:00
renovate[bot]
c5a620f3ca
Merge pull request #5947 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210819031659
2021-08-19 07:13:25 +00:00
Renovate Bot
865852265d
chore(deps): update dependency scratch-l10n to v3.14.20210819031659 2021-08-19 04:46:38 +00:00
BryceLTaylor
63e43abbc8 Look for studio tabs in studio management integration tests 2021-08-18 14:03:48 -04:00
BryceLTaylor
b834569aef Add expect lines to studio management integration tests 2021-08-18 13:46:50 -04:00
BryceLTaylor
a4f71b44fb split promote to studio manager integration tests into subtests 2021-08-18 13:46:50 -04:00
BryceLTaylor
1ec30589f7 move studio creation for management integration tests to beforeAll 2021-08-18 13:46:50 -04:00
BryceLTaylor
2e5055e05a Create sign in function in selenium helpers for integration tests 2021-08-18 13:46:50 -04:00
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