Commit graph

11139 commits

Author SHA1 Message Date
Sarah Otts
bb61a7413f
Merge pull request #6659 from LLK/develop
Update release branch to include develop
2022-03-16 12:59:01 -04:00
Sarah Otts
e434ac6817
Merge pull request #6658 from seotts/fix-conference-test
Fix conference integration test
2022-03-16 11:52:57 -04:00
seotts
5756d4937d Fix conference integration test 2022-03-16 11:51:23 -04:00
Karishma Chadha
3037c6a242
Merge pull request #6652 from kchadha/conference-page-updates
Add 2022 conference page
2022-03-16 10:47:35 -04:00
Karishma Chadha
96f2ba67d5 Move shared image to a shared folder 2022-03-16 10:43:57 -04:00
renovate[bot]
a5c58d8419
Merge pull request #6653 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220316031548
2022-03-16 05:55:00 +00:00
Renovate Bot
f1666f1389
chore(deps): update dependency scratch-l10n to v3.14.20220316031548 2022-03-16 03:51:17 +00:00
Karishma Chadha
90a9075dbf Add 2022 conference page. Refactor a bit of 2021 conference code so we don't have to create duplicate componenets 2022-03-15 18:22:40 -04:00
renovate[bot]
6b04581b46
Merge pull request #6650 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220315192901
2022-03-15 21:56:57 +00:00
Renovate Bot
136b912201
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220315192901 2022-03-15 20:06:47 +00:00
renovate[bot]
458f39731b
Merge pull request #6645 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220315131702
2022-03-15 16:19:27 +00:00
Maximouse
050c8ce9ea Fix studio comment issues on narrow screens 2022-03-15 15:17:17 +01:00
Renovate Bot
6bd70a07db
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220315131702 2022-03-15 13:32:01 +00:00
Maximouse
2d7a448829 Fix reply input indentation and alignment 2022-03-15 13:46:08 +01:00
Maximouse
4738774011 Correct comment compose spacing 2022-03-15 13:00:08 +01:00
Maximouse
ea7f3cb770 Fix Explore/search tile overflow when avatars don't load 2022-03-15 11:25:17 +01:00
renovate[bot]
ef02d7e233
Merge pull request #6643 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220315031541
2022-03-15 05:49:13 +00:00
Renovate Bot
efeb109397
chore(deps): update dependency scratch-l10n to v3.14.20220315031541 2022-03-15 05:46:21 +00:00
renovate[bot]
ad643095a6
Merge pull request #6642 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220315015454
2022-03-15 05:43:41 +00:00
Renovate Bot
f90b054f37
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220315015454 2022-03-15 04:01:03 +00:00
renovate[bot]
cb433d0917
Merge pull request #6641 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220314204741
2022-03-15 01:42:42 +00:00
Renovate Bot
a1465c1ef8
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220314204741 2022-03-14 23:14:07 +00:00
renovate[bot]
b8aa7d97af
Merge pull request #6640 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220314110559
2022-03-14 14:13:02 +00:00
Renovate Bot
e16a1184fa
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220314110559 2022-03-14 11:58:49 +00:00
renovate[bot]
65e29c2065
Merge pull request #6639 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220314031535
2022-03-14 09:32:56 +00:00
Renovate Bot
e8242a5e57
chore(deps): update dependency scratch-l10n to v3.14.20220314031535 2022-03-14 05:05:58 +00:00
renovate[bot]
26ed448b95
Merge pull request #6638 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220313144705
2022-03-13 20:13:29 +00:00
Renovate Bot
e6503a0c5d
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220313144705 2022-03-13 17:15:36 +00:00
renovate[bot]
6cd525059e
Merge pull request #6637 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220313110542
2022-03-13 12:16:59 +00:00
Renovate Bot
88c99c9f4a
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220313110542 2022-03-13 11:09:06 +00:00
renovate[bot]
04eabc6348
Merge pull request #6636 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220313031543
2022-03-13 08:51:55 +00:00
Renovate Bot
d3bbe8194f
chore(deps): update dependency scratch-l10n to v3.14.20220313031543 2022-03-13 05:08:47 +00:00
renovate[bot]
2a3aaf9fea
Merge pull request #6635 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220312165257
2022-03-12 18:52:30 +00:00
Renovate Bot
cac50280df
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220312165257 2022-03-12 17:02:40 +00:00
renovate[bot]
c6776fae8d
Merge pull request #6632 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220312053021
2022-03-12 09:56:19 +00:00
Renovate Bot
7b180611a4
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220312053021 2022-03-12 09:53:17 +00:00
renovate[bot]
c3f9726b90
Merge pull request #6633 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220312031532
2022-03-12 09:50:01 +00:00
Renovate Bot
51c82d5ab6
chore(deps): update dependency scratch-l10n to v3.14.20220312031532 2022-03-12 04:36:31 +00:00
Ray Schamp
e125305b28
Merge pull request #6631 from rschamp/hotfix/totally-normal-flag
Add new feature flag
2022-03-11 14:41:10 -05:00
rschamp
930bb78304 Handle Totally Normal™ flags 2022-03-11 14:22:43 -05:00
renovate[bot]
773306778a
Merge pull request #6629 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220311183443
2022-03-11 18:58:58 +00:00
Renovate Bot
159e69e1cb
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220311183443 2022-03-11 18:55:47 +00:00
renovate[bot]
9a2cd1bb45
Merge pull request #6630 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220311031555
2022-03-11 18:52:18 +00:00
Renovate Bot
6e8cd3dadc
chore(deps): update dependency scratch-l10n to v3.14.20220311031555 2022-03-11 17:02:13 +00:00
Tom Lum
413d3e0f11
Merge pull request #6625 from LLK/release/2022-03-09
[Develop] release/2022-03-09
2022-03-10 11:10:04 -05:00
Tom Lum
ad46292edd
Merge pull request #6626 from LLK/release/2022-03-09
[Master] release/2022-03-09
2022-03-10 11:09:51 -05:00
renovate[bot]
234c06e746
Merge pull request #6628 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220310120655
2022-03-10 15:13:02 +00:00
Renovate Bot
10fd7effec
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220310120655 2022-03-10 12:19:38 +00:00
renovate[bot]
a3eeccb00e
Merge pull request #6627 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220310031603
2022-03-10 07:06:32 +00:00
Renovate Bot
a598d217d4
chore(deps): update dependency scratch-l10n to v3.14.20220310031603 2022-03-10 07:02:58 +00:00