5434 Commits (37879eb72e75d6e9bdef70bf689104133381e628)

Author SHA1 Message Date
Claire 6574050b4b Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Shlee 7af7fa3a8e Update notifications.js (#18977)
2 years ago
Rens Groothuijsen 6dfb31ea0c [Glitch] Add warning for sensitive audio posts
2 years ago
Claire fd0c34e13f Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Eugen Rochko 7aef706965 New Crowdin updates (#18905)
2 years ago
Rens Groothuijsen aced8820dd Add warning for sensitive audio posts (#17885)
2 years ago
Claire 2b414f4d73 Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
prplecake cf4bed0ac0 [Glitch] Add ability to follow hashtags in web UI
2 years ago
prplecake b682c11a6e Merge remote-tracking branch 'mastodon/main' into cit/wip/follow-hashtags
2 years ago
Eugen Rochko 7ae2d64364 New Crowdin updates (#18855)
2 years ago
Mélanie Chauvel c2208ef466 Use slightly more margin between post buttons (under compose box) (#1816)
2 years ago
Claire 5e628e4fd3 Add option to share CW toggle state across instances of a post
2 years ago
Claire a8b3d6f47e Regroup CW unfolding settings in their own section
2 years ago
Claire 711301519a Improve interaction between out-of-CW attachments and collapsed toots
2 years ago
Claire 42d06afe03 Add explanation for some options in the local settings dialog
2 years ago
Claire 406b7d972b Add local setting toggle to move media attachments outside CWs
2 years ago
Eugen Rochko acd3f34a31 [Glitch] Change hashtag numbers to have clearer labels in web UI
2 years ago
Yamagishi Kazutoshi f6696f7d33 [Glitch] Bump react-redux-loading-bar from 4.0.8 to 5.0.4
2 years ago
Eugen Rochko 9bbcd2e8a0 Add ability to follow hashtags in web UI (#18862)
2 years ago
Claire 081005232f Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Eugen Rochko 436e52927a Change hashtag numbers to have clearer labels in web UI (#18864)
2 years ago
Eugen Rochko dba05a6d36 New Crowdin updates (#18810)
2 years ago
Yamagishi Kazutoshi a3eda85ff9 Bump react-redux-loading-bar from 4.0.8 to 5.0.4 (#18562)
2 years ago
Jeong Arm 89a416c061 [Glitch] Fix badge color not affected
2 years ago
Claire ba5d3974eb Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Jeong Arm 9a42ccca53 Fix badge color not affected (#18826)
2 years ago
Claire b50ab06371 Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Eugen Rochko 731dfd285e New Crowdin updates (#18781)
2 years ago
Eugen Rochko 38d04135bf Change how hashtags are normalized (#18795)
2 years ago
Eugen Rochko 092fe73b01 New Crowdin updates (#18716)
2 years ago
Eugen Rochko cfb73f9fc9 [Glitch] Add customizable user roles
2 years ago
Claire 06a878c6b5 Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Eugen Rochko e164d6a687 Add customizable user roles (#18641)
2 years ago
Claire 301299d036 Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Claire 64588263f7 Remove dead code in WebUI filtering code (#18745)
2 years ago
Claire 106b27830b Fix reblogged statuses being erroneously shown as filtered (#18744)
2 years ago
Eugen Rochko a14136558e [Glitch] Add notifications for new reports
2 years ago
Claire dcbedf8587 [Glitch] [SSR only] Revamp post filtering system
2 years ago
mayaeh 68c03ea7be [Glitch] Fixed the setting page's logo that is not displayed on the smartphone
2 years ago
Claire 490417762f Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Claire 90e5a9bd98 Revamp post filtering system (#18058)
2 years ago
Eugen Rochko e6eb0a29b9 Add notifications for new reports (#18697)
2 years ago
Eugen Rochko a7ca331c3d New Crowdin updates (#18671)
2 years ago
mayaeh 2cb4c0caed Fixed the setting page's logo that is not displayed on the smartphone (#18710)
2 years ago
Eugen Rochko 0d7c0f0bf7 [Glitch] Fix contrast of some elements with new brand colors
2 years ago
Claire dc250cb7f3 Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Eugen Rochko 96ecbae0f7 Fix contrast of some elements with new brand colors (#18691)
2 years ago
Claire a7a44a4dff Fix checkmark on interaction buttons with larger fonts (#1799)
2 years ago
Eugen Rochko d1374cc03a New Crowdin updates (#18605)
2 years ago
Eugen Rochko c3f7041715 Fix wrong aspect ratio of logo in icons (#18639)
2 years ago
Claire bfe05eb101 [Glitch] Fix logo gradient not working on some Safari and Blink-based browsers
2 years ago
Eugen Rochko c3c77fc5d9 [Glitch] Change brand color and logotypes
2 years ago
Claire 03846ad6c2 Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Claire 28dc3750f6 Fix logo gradient not working on some Safari and Blink-based browsers (#18634)
2 years ago
Eugen Rochko 18fbdcd5f4 [Glitch] Add administrative webhooks
2 years ago
Claire 3b4abfe132 Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Eugen Rochko 03d2cb5146 Change brand color and logotypes (#18592)
2 years ago
Eugen Rochko 0eb2db6b52 Add administrative webhooks (#18510)
2 years ago
Claire 5618c69b2a Fix language indicator text color (#1795)
2 years ago
Eugen Rochko 157bf44409 New Crowdin updates (#18561)
2 years ago
Eugen Rochko 2184897fba [Glitch] Change label of publish button to be "Publish" again
2 years ago
Claire c3842a700f [Glitch] Change language to be carried over on reply
2 years ago
Claire 705ebf794b [Glitch] Remove unnused otherAccounts property
2 years ago
Jeong Arm 4c43ac85d6 [Glitch] Add lang html attr to each posts
2 years ago
Claire a864904fad Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Yamagishi Kazutoshi 848648e058 Replace from Code Climate to Super-Linter (#18587)
2 years ago
Eugen Rochko 8ec66981da Change label of publish button to be "Publish" again (#18583)
2 years ago
Jeong Arm 15b64d2f6b Translate: Korean (#1790)
2 years ago
Claire c5eabffe34 Change language to be carried over on reply (#18557)
3 years ago
Claire 8ce9a12526 Remove unnused otherAccounts property (#18556)
3 years ago
Eugen Rochko 02c4d029ff New Crowdin updates (#18507)
3 years ago
Jeong Arm 9adb7dde33 Add lang html attr to each posts (#18544)
3 years ago
Alexander Ivanov a59e8245f5 Add support for webp uploads (#18506)
3 years ago
Eugen Rochko c460fd0250 Remove unused assets (#18541)
3 years ago
Claire 47fa6c3b91 Add language indicator icon and local settings for status icons (#1788)
3 years ago
Claire 61e105a326 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko 3143aec7f1 Change "dangerous" to "sensitive" in privacy policy and web UI (#18515)
3 years ago
Claire 801b898d31 Add checkmark on top of status icon buttons when they are active (#1783)
3 years ago
Claire ca81647961 Various code cleanup (#1782)
3 years ago
Eugen Rochko c5f0792a0d New Crowdin updates (#18458)
3 years ago
Claire b1085e2dfa Fix crash in glitch-soc search results when Elasticsearch is disabled (#1780)
3 years ago
Yamagishi Kazutoshi 1ab4abd764 [Glitch] Fix languages dropdown on light theme
3 years ago
Claire eada1864ef Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Yamagishi Kazutoshi fa12352fd3 Fix languages dropdown on light theme (#18460)
3 years ago
Eugen Rochko 9977cda0ac New Crowdin updates (#18419)
3 years ago
Eugen Rochko c0a5c88364 [Glitch] Add language dropdown to compose in web UI
3 years ago
Claire 1a853d7caa Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Claire 73a2e3326f Add confirmation page when importing blocked domains (#1773)
3 years ago
Eugen Rochko e4a9aa1ab4 Add language dropdown to compose in web UI (#18420)
3 years ago
Claire fbfa953ad2 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Claire e6af69d56b Use upstream's settings for CW auto-expand and column swiping (#1770)
3 years ago
Eugen Rochko f806b5d6b6 New Crowdin updates (#18339)
3 years ago
Eugen Rochko fbef44009d [Glitch] Add `limited` attribute to accounts in REST API and a warning in web UI
3 years ago
Eugen Rochko 6256a3da46 [Glitch] Remove Keybase integration
3 years ago
Claire 6545114ac7 [Glitch] Fix block/mute lists showing a follow button when unblocking a user (#18364)
3 years ago
Claire c6e7c928ab Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko ac3d6f9a35 Add `limited` attribute to accounts in REST API and a warning in web UI (#18344)
3 years ago
Claire 917567567a Fix block/mute lists showing a follow button when unblocking a user (#18364)
3 years ago
Claire 3d8cef439b [Glitch] Fix streaming notifications not using quick filter logic
3 years ago
Claire c8edaaba1b [Glitch] Fix floating action button obscuring last element
3 years ago
Claire 6f69b831d6 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Claire 7919b6631e Fix streaming notifications not using quick filter logic (#18316)
3 years ago
Claire 82dcdc12f1 Fix floating action button obscuring last element (#18332)
3 years ago
Eugen Rochko 3ce9a50930 New Crowdin updates (#18255)
3 years ago
Stefano Pigozzi 02987b1191 Replace leftover `envelope` icons with `at` icons (#18305)
3 years ago
Claire 221959d36a Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
mayaeh f78036e71b Update translation strings for direct message (#18300)
3 years ago
Claire 1d7e3d18a0 Change “Only people I mention” to “Mentioned people only” (#18291)
3 years ago
Claire 3c1979d0dc Move DM conversation/timeline tab to column settings switch
3 years ago
Claire a4c1a80a7f Fix backend terms link not being used
3 years ago
Claire d748d0b94a Refactor visibility icon using VisibilityIcon
3 years ago
Claire 6e8284756b [Glitch] Rename toots to posts in various places, add or reword DM warnings
3 years ago
Claire a62029ad4c Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko c33a26ed38 Change "Conversations" back to "Direct messages" and add warning in web UI (#18289)
3 years ago
Eugen Rochko 35ca8565d5 New Crowdin updates (#18213)
3 years ago
Claire e2cce242aa Remove “I don't like it” option from report modal
3 years ago
Eugen Rochko 53d5cb18f1 [Glitch] Fix being able to scroll away from the loading bar in web UI
3 years ago
Claire ad9329502a Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko 15c9eb89bc New Crowdin updates (#18148)
3 years ago
Claire 2c1843f37a Pre-fill domain block/allow domain from search filter (#18172)
3 years ago
Eugen Rochko 07737bb6d1 Change "Direct" status visibility to "Only people I mention" in web UI (#18146)
3 years ago
Eugen Rochko c803c1a8db Fix being able to scroll away from the loading bar in web UI (#18170)
3 years ago
Claire 73f1650610 [Glitch] Fix empty “Server rules violation” report option
3 years ago
Claire f130d2fb69 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Claire ff9d647aa6 Fix empty “Server rules violation” report option (#18165)
3 years ago
Claire 7eb54adc71 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko 0f11d6ee6d New Crowdin updates (#18074)
3 years ago
Claire d503fb3d58 Update win95 style from cybre.space
3 years ago
Claire 0069bebafe Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko 1ae83e0796 New Crowdin updates (#18062)
3 years ago
Eugen Rochko e0a1c43a69 New Crowdin updates (#18032)
3 years ago
Claire 7b26b12378 Swap position of media attachments and polls
3 years ago
Claire f9719b106c Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko 71d83f4e61 New Crowdin updates (#17995)
3 years ago
Claire ed1d3bc1e2 [Glitch] Auto-fill timeline gaps when getting re-connecting to Websocket/EventSource stream
3 years ago
Claire 3ad22b06ff [Glitch] Fix potentially missing statuses when reconnecting to websocket
3 years ago
Claire d4f25d52dd Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Claire c9a5121ae5 Auto-fill timeline gaps when getting re-connecting to Websocket/EventSource stream (#17987)
3 years ago
Eugen Rochko 330c279c0c New Crowdin updates (#17897)
3 years ago
Claire d43028a0d3 Fix potentially missing statuses when reconnecting to websocket (#17981)
3 years ago
Claire 24256816cc [Glitch] Fix older items possibly disappearing on timeline updates
3 years ago
Claire 7103869d62 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Claire 00d429879f Fix older items possibly disappearing on timeline updates (#17980)
3 years ago
Eugen Rochko cea2cd9a56 Add pagination for trending statuses in web UI (#17976)
3 years ago
Claire 57d0a61f0c [Glitch] Fix possible duplicate statuses in timelines in some edge cases
3 years ago
Claire b0781a933d Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Claire 623f8717c8 Fix possible duplicate statuses in timelines in some edge cases (#17971)
3 years ago
Eugen Rochko f982d56b4e Remove sign-in token authentication, instead send e-mail about new sign-in (#17970)
3 years ago
CommanderRoot 368f6ac07a [Glitch] Replace deprecated String.prototype.substr()
3 years ago
Claire 77a8515b59 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
quinn 3b3741df6f Update composer.scss
3 years ago
quinn 92d2f50065 Update status.scss
3 years ago
quinn 038d7b7be0 Update composer.scss
3 years ago
CommanderRoot 07f1888854 Replace deprecated String.prototype.substr() (#17949)
3 years ago
Claire bdaf4179b3 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Claire a23fbf6ec5 Fix regression of status colors in actions modal in web UI (#17903)
3 years ago
Eugen Rochko 7d12456777 New Crowdin updates (#17864)
3 years ago
mayaeh 9e6e98856c [Glitch] Add a hashtag public link to the trending hashtag page
3 years ago
Claire 250ce1608d Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
mayaeh 37c1fe7de1 Add a hashtag public link to the trending hashtag page (#17140)
3 years ago
Eugen Rochko d85a5fa593 New Crowdin updates (#17829)
3 years ago
Eugen Rochko 375c322507 [Glitch] Fix color of show more link in report dialog in web UI
3 years ago
Claire cce98a6a2d Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko 1c1c2ce0a1 Fix crash when search fails in web UI (#17853)
3 years ago
Eugen Rochko c9ff17bb85 Fix regression of status colors in actions modal in web UI (#17851)
3 years ago
Eugen Rochko fa52084ce4 [Glitch] Fix wrong position of fade-out element in account card in web UI
3 years ago
Eugen Rochko 1c4374eb7d [Glitch] Add hint about missing media attachment description in web UI
3 years ago
Claire f56a3dc4e2 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko 18f8c7302c Fix wrong position of fade-out element in account card in web UI (#17846)
3 years ago
Eugen Rochko 354415e7ce Add hint about missing media attachment description in web UI (#17845)
3 years ago
Eugen Rochko b80f1a76d7 Fix color of show more link in report dialog in web UI (#17844)
3 years ago
Eugen Rochko a0777e8681 New Crowdin updates (#17817)
3 years ago
Claire 7ebf924259 Add missing locales to glitch-soc
3 years ago
Claire 7b22ba977a Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Claire 343975b2f6 Fix Sanskrit translation not being used when selected (#17820)
3 years ago
Claire 6a1249b975 Remove old files for renamed translation (#17818)
3 years ago
Eugen Rochko 53647d0f8b New Crowdin updates (#17771)
3 years ago
Claire 24c1b04f9c Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko 1b9b9585e6 New Crowdin updates (#17742)
3 years ago
Claire fc205f34a1 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
mayaeh 500a3e1d3a Changed to display the "Explore" in "Getting-Started" at all resolutions (#17762)
3 years ago
Eugen Rochko 95ea5b2f7d Fix public timelines being inaccessible on one stage of responsive layout in web UI (#17760)
3 years ago
mayaeh 24f375d79e Change the "Explore" icon from fa-globe to fa-hashtag (#17757)
3 years ago
mayaeh 0a9273ffb2 Add menu column of explore to getting-started (#17755)
3 years ago
Claire 3ac319b6bb [Glitch] Fix edit history dropdown and modal in light theme
3 years ago
Claire f9d00306e0 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko 6c0080f6bf New Crowdin updates (#17674)
3 years ago
Claire 9d93d4bafe Fix edit history dropdown and modal in light theme (#17740)
3 years ago
Claire 643177ff8a [Glitch] Fix report dialog being illegible using mastodon-light theme
3 years ago
Eugen Rochko 4d1b09c62a [Glitch] Add polls and media attachments to edit comparison modal in web UI
3 years ago
Claire 57c69a47ab Move report modal styles to flavours/glitch/styles/components/modal.scss
3 years ago
Eugen Rochko 665ade7fae [Glitch] Fix being able to add more than 4 hashtags to hashtag column in web UI
3 years ago
Eugen Rochko 99feb19348 [Glitch] Change design of federation pages in admin UI
3 years ago
Claire f677c1619a Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Claire 040961e3f8 Fix report dialog being illegible using mastodon-light theme (#17734)
3 years ago
Eugen Rochko f5346541fd Add polls and media attachments to edit comparison modal in web UI (#17727)
3 years ago
Eugen Rochko 380aef66ae Fix being able to add more than 4 hashtags to hashtag column in web UI (#17729)
3 years ago
Eugen Rochko 594c595fa5 Chore: Update translatable strings (#17723)
3 years ago
Eugen Rochko 11e848bf95 Change design of federation pages in admin UI (#17704)
3 years ago
Eugen Rochko 4623292d97 [Glitch] Change appearance of account cards in web UI
3 years ago
Josh Soref beb59e188e [Glitch] Spelling
3 years ago
Claire 09306d7c3c Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko 563964dd80 Change appearance of account cards in web UI (#17689)
3 years ago
Josh Soref 1c070bd94c Spelling (#17705)
3 years ago
Claire 44a1a7a02d Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko 97eaac87fa Remove profile directory link from main navigation panel (#17688)
3 years ago
Claire 761df31510 [Glitch] Change visual separation of applications in authorized apps list
3 years ago
Claire 3e3fc8398b Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Claire d37c28f54c Change visual separation of applications in authorized apps list (#17686)
3 years ago
Eugen Rochko 93ba12efd6 [Glitch] Add ability to mark statuses as sensitive from reports in admin UI
3 years ago
Eugen Rochko c71c6092a8 [Glitch] Change authorized applications page
3 years ago
Claire 4795ee7f2c Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko b25b703cce Add ability to mark statuses as sensitive from reports in admin UI (#17668)
3 years ago
Eugen Rochko 4d0a2968d9 Change authorized applications page (#17656)
3 years ago
Eugen Rochko 2b90261718 New Crowdin updates (#17628)
3 years ago
Eugen Rochko 43721775d4 [Glitch] Fix report submit button not being disabled during submission in web UI
3 years ago
Claire d2eb561d32 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko 00fcfa176f Chore: Update translatable strings (#17495)
3 years ago
Eugen Rochko 45341c5287 Fix not showing loading indicator when searching in web UI (#17655)
3 years ago
Eugen Rochko c49b23819b Fix report submit button not being disabled during submission in web UI (#17654)
3 years ago
Claire 185977560c [Glitch] Fix remote reports with comments revealing remote reporter
3 years ago
Claire 6c89abe2bb Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Claire 2d5edf2090 Fix remote reports with comments revealing remote reporter (#17652)
3 years ago
Claire 5fd343c72b [Glitch] Fix media modal footer's “external link” not being a link
3 years ago
Claire 5dd7d6bc07 [Glitch] Fix reply button on media modal not giving focus to compose form
3 years ago
Eugen Rochko 0979110108 [Glitch] Add trending statuses
3 years ago
Claire 8e04ac45be Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Claire f75cd229f3 Fix media modal footer's “external link” not being a link (#17561)
3 years ago
Claire cbf951569e Fix reply button on media modal not giving focus to compose form (#17626)
3 years ago
Eugen Rochko 19b4c36e40 Add explore page to web UI (#17123)
3 years ago
Eugen Rochko e6d2b07ec1 Add trending statuses (#17431)
3 years ago
Claire 243d322e5a Fix publish buttons styling
3 years ago
Claire b90e5add99 [Glitch] Fix reporting from profile
3 years ago
Claire e8d278d3e1 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Claire 543d13ed7a Fix reporting from profile (#17632)
3 years ago
Claire b9e78f7964 Fetch relationships when opening report modal
3 years ago
Eugen Rochko c830291a72 [Glitch] Change report modal to include category selection in web UI
3 years ago
Claire 4df1f0e721 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko 7e91581be0 Change report modal to include category selection in web UI (#17565)
3 years ago
Eugen Rochko 67cecd6563 [Glitch] Add notifications for new sign-ups
3 years ago
Claire c58e2f4775 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko eef9eec5d3 Add notifications for new sign-ups (#16953)
3 years ago
Eugen Rochko bbd1b979e7 New Crowdin updates (#17593)
3 years ago
luzpaz b97e7364f3 Fix various typos (#17621)
3 years ago
Eugen Rochko 15d69174c0 [Glitch] Fix link colors in report and strike details
3 years ago
Eugen Rochko 41e6b61ea2 [Glitch] Fix wrong styles on strike page
3 years ago
Claire e7ad957447 Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
Eugen Rochko 8d4b0b255a Fix link colors in report and strike details (#17616)
3 years ago
Eugen Rochko 839ad9fa53 Fix wrong styles on strike page (#17615)
3 years ago
Claire ddf6fa684b Merge branch 'main' into glitch-soc/merge-upstream
3 years ago