caseymm
9c83891a42
added assets folder and started swapping in assets
2021-09-30 11:17:15 -07:00
Eric Rosenbaum
d400b7176f
Merge pull request #6115 from LLK/release/2021-09-29
...
[Master] release/2021-09-29
2021-09-30 11:06:29 -04:00
renovate[bot]
f0ed2e28c4
Merge pull request #6121 from LLK/renovate/scratch-gui-0.x
...
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210930112842
2021-09-30 12:55:58 +00:00
Renovate Bot
a6dc906809
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210930112842
2021-09-30 11:33:24 +00:00
renovate[bot]
d2c22a7ebb
Merge pull request #6119 from LLK/renovate/scratch-gui-0.x
...
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210930073400
2021-09-30 10:40:17 +00:00
Renovate Bot
dd3caaef52
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210930073400
2021-09-30 08:28:01 +00:00
renovate[bot]
5d1f02f81b
Merge pull request #6118 from LLK/renovate/scratch-l10n-3.x
...
chore(deps): update dependency scratch-l10n to v3.14.20210930031530
2021-09-30 06:55:27 +00:00
Renovate Bot
8f05ff377a
chore(deps): update dependency scratch-l10n to v3.14.20210930031530
2021-09-30 04:26:12 +00:00
caseymm
da116acda0
a bit more
2021-09-29 17:17:34 -07:00
caseymm
2263ec4974
more content changes
2021-09-29 17:04:29 -07:00
caseymm
4277aa5db0
some content changes
2021-09-29 15:54:33 -07:00
Sarah Otts
6181487369
Merge pull request #6117 from seotts/fix-host-tile
...
Show "Studio Host" on manager tile
2021-09-29 16:10:10 -04:00
seotts
1d4c7e8938
show "Studio Host" on manager tile
2021-09-29 16:00:52 -04:00
ericrosenbaum
f87b64d166
Merge remote-tracking branch 'origin/develop' into release/2021-09-29
2021-09-29 14:54:09 +00:00
renovate[bot]
c788dcd4c8
Merge pull request #6113 from LLK/renovate/scratch-gui-0.x
...
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210929111256
2021-09-29 14:22:34 +00:00
Renovate Bot
156b28e0bf
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210929111256
2021-09-29 12:45:32 +00:00
renovate[bot]
eafda4a4a1
Merge pull request #6112 from LLK/renovate/scratch-gui-0.x
...
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210929084832
2021-09-29 11:06:30 +00:00
Renovate Bot
66e4a057eb
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210929084832
2021-09-29 09:39:34 +00:00
renovate[bot]
8d12906d30
Merge pull request #6111 from LLK/renovate/scratch-l10n-3.x
...
chore(deps): update dependency scratch-l10n to v3.14.20210929031524
2021-09-29 04:46:33 +00:00
Renovate Bot
8fcd2b6617
chore(deps): update dependency scratch-l10n to v3.14.20210929031524
2021-09-29 04:09:52 +00:00
caseymm
743ccb0428
start to swap out nav
2021-09-28 16:41:30 -07:00
caseymm
845d7ed578
route and 2020 folder
2021-09-28 15:49:09 -07:00
Karishma Chadha
69b6871ca0
Merge pull request #6110 from LLK/kchadha-release-workflow-no-ff
...
Update Release Workflow
2021-09-28 13:50:11 -04:00
Karishma Chadha
5b877189eb
Update Release Workflow
...
Add --no-ff flag to `git merge` line in the release branch creation workflow. This should ensure that we're always creating a merge commit on the release branch when pulling in changes from develop to stage for the release.
2021-09-28 13:10:04 -04:00
renovate[bot]
8e469e6d0c
Merge pull request #6109 from LLK/renovate/scratch-gui-0.x
...
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210928102232
2021-09-28 12:11:07 +00:00
Renovate Bot
5a541ea6f2
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210928102232
2021-09-28 11:01:21 +00:00
renovate[bot]
7c8b199e64
Merge pull request #6108 from LLK/renovate/scratch-gui-0.x
...
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210928082014
2021-09-28 10:01:09 +00:00
Renovate Bot
9cff753d17
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210928082014
2021-09-28 09:01:26 +00:00
renovate[bot]
9565faf216
Merge pull request #6107 from LLK/renovate/scratch-l10n-3.x
...
chore(deps): update dependency scratch-l10n to v3.14.20210928031525
2021-09-28 05:34:12 +00:00
Renovate Bot
ea156682be
chore(deps): update dependency scratch-l10n to v3.14.20210928031525
2021-09-28 03:46:17 +00:00
renovate[bot]
176b4004dd
Merge pull request #6106 from LLK/renovate/scratch-gui-0.x
...
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210927215149
2021-09-28 00:07:15 +00:00
Renovate Bot
37e8519431
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210927215149
2021-09-27 22:56:50 +00:00
Sarah Otts
c4c48578a7
Merge pull request #6097 from seotts/admins-can-promote
...
Allow admins to promote curators to managers
2021-09-27 15:02:25 -04:00
renovate[bot]
923f3fcf75
Merge pull request #6104 from LLK/renovate/scratch-gui-0.x
...
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210927162216
2021-09-27 17:42:47 +00:00
Renovate Bot
5b761e8c52
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210927162216
2021-09-27 16:52:06 +00:00
renovate[bot]
eb672c50d0
Merge pull request #6103 from LLK/renovate/scratch-l10n-3.x
...
chore(deps): update dependency scratch-l10n to v3.14.20210927031529
2021-09-27 08:52:07 +00:00
Renovate Bot
2aa3902e4a
chore(deps): update dependency scratch-l10n to v3.14.20210927031529
2021-09-27 04:24:22 +00:00
renovate[bot]
8c8ba3629f
Merge pull request #6102 from LLK/renovate/scratch-gui-0.x
...
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210926132431
2021-09-26 16:12:53 +00:00
Renovate Bot
1c9888fe9c
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210926132431
2021-09-26 13:39:07 +00:00
renovate[bot]
96435ce1dc
Merge pull request #6101 from LLK/renovate/scratch-l10n-3.x
...
chore(deps): update dependency scratch-l10n to v3.14.20210926031519
2021-09-26 05:11:01 +00:00
Renovate Bot
e7dc9fe5be
chore(deps): update dependency scratch-l10n to v3.14.20210926031519
2021-09-26 03:21:11 +00:00
renovate[bot]
4e580330fe
Merge pull request #6100 from LLK/renovate/scratch-gui-0.x
...
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210925091518
2021-09-25 11:29:36 +00:00
Renovate Bot
f161988fba
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210925091518
2021-09-25 09:26:47 +00:00
renovate[bot]
73ee427964
Merge pull request #6099 from LLK/renovate/scratch-gui-0.x
...
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210925063331
2021-09-25 07:36:51 +00:00
Renovate Bot
926dee90a5
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210925063331
2021-09-25 07:31:12 +00:00
renovate[bot]
854c8ad916
Merge pull request #6098 from LLK/renovate/scratch-l10n-3.x
...
chore(deps): update dependency scratch-l10n to v3.14.20210925031536
2021-09-25 07:28:07 +00:00
Renovate Bot
72b85011fb
chore(deps): update dependency scratch-l10n to v3.14.20210925031536
2021-09-25 04:16:29 +00:00
seotts
ef3e861fc3
Allow admins to promote curators
2021-09-24 16:12:09 -04:00
Sarah Otts
705e8dba6e
Merge pull request #6085 from zoebentley/credits-page-update-9-21
...
Credits page update 9 21
2021-09-24 11:08:01 -04:00
Zoë Bentley
d2c3cce09b
Added Harakou
2021-09-24 10:39:51 -04:00
