tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,404 Commits 5 Branches 0 Tags
d9fa3feeebb6dd73e4c00bb1489fb24cfdceb2e8
Commit Graph
29404 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
diondiondion d9fa3feeeb [Glitch] Add empty state to CollectionAdder component 
Port 5098b8ccc9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-12 18:43:23 +02:00
Claire 08027edb10 Merge commit 'b902c825054b953599cd0341acf428332fca5044' into glitch-soc/merge-upstream 2026-06-12 18:37:02 +02:00
Claire b902c82505 Trim stable-4.3 from changelog and update SECURITY.md (#39395) 2026-06-12 09:33:03 +00:00
renovate[bot] 9c8fc8f56c Update dependency aws-sdk-s3 to v1.225.1 (#39369) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-06-12 09:25:39 +00:00
renovate[bot] 68e5bc44de Update dependency aws-sdk-core to v3.252.0 (#39370) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-06-12 09:25:23 +00:00
Matt Jankowski c0ee6f33c5 Add basic coverage for MuteWorker job (#39384) 2026-06-12 08:14:46 +00:00
Eugen Rochko d6336defae Add last few items to the changelog (#39394) 2026-06-12 08:08:13 +00:00
github-actions[bot]andGitHub Actions 03ccfc2172 New Crowdin Translations (automated) (#39390) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-12 07:56:12 +00:00
diondiondion bd91848367 Fix misleading copy in "Remove me from collection" confirmation dialog (#39391) 2026-06-12 07:37:14 +00:00
Eugen Rochko 9910018b0d Fix poll options being below uploads in compose form in web UI (#39388) 2026-06-12 05:59:36 +00:00
Eugen Rochko 2630e7e7a2 Fix missing string for custom filter import (#39386) 2026-06-12 05:59:23 +00:00
Eugen Rochko 77740e0ce1 Fix missing heading styles in settings area (#39387) 2026-06-12 05:59:08 +00:00
Eugen Rochko d438a09ddb Bump version to 4.6.0-rc.1 (#39383) 2026-06-11 17:22:41 +00:00
Pia B. 35f3748482 Add import for custom filters (#39256) 2026-06-11 16:32:46 +00:00
diondiondion 2e3b81cc1e Fix account hovercard sometimes not triggering (#39381) 2026-06-11 16:18:44 +00:00
Echo 8ba8ce5669 Emojis: Improve custom search (#39382) 2026-06-11 16:02:58 +00:00
Shlee 1f84b98292 Follow up to #38711 - support instances running on subdomains (#39379) 2026-06-11 13:58:19 +00:00
Claire 604b34faaf Merge pull request #3528 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to 96e23af892
 2026-06-11 15:32:45 +02:00
diondiondion 90438e9b2e Fix loading/errored emoji in detailed status display name causing line break (#39378) 2026-06-11 13:20:02 +00:00
Shlee e52fc4a0c1 Follow up to #39323 - for tag_search_service (#39375) 2026-06-11 13:14:20 +00:00
Shlee 655dca8a78 Follow up to #38809 - Appending not following condition (as standard) (#39377) 2026-06-11 13:10:27 +00:00
Shlee 640cc39869 Typo in authorize_interactions_controller.rb (#39376) 2026-06-11 13:05:25 +00:00
diondiondion 5098b8ccc9 Add empty state to CollectionAdder component (#39372) 2026-06-11 12:22:55 +00:00
diondiondion 99ef947f96 [Glitch] Fix "unlisted collections" profile section can be visible to other users 
Port 96e23af892 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-11 13:30:04 +02:00
diondiondion 704e570dfb [Glitch] Auto-focus mobile composer 
Port 782ceb3795 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-11 13:29:25 +02:00
Nishiki e5cf23b3b5 [Glitch] fix: sensitive media card display 
Port 40bf2dca1e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-11 13:27:22 +02:00
Claire bbbbb24dbd Merge commit '96e23af89258068d05cc8557df914b4a9add385b' into glitch-soc/merge-upstream 2026-06-11 13:26:25 +02:00
diondiondion 96e23af892 Fix "unlisted collections" profile section can be visible to other users (#39373) 2026-06-11 10:15:34 +00:00
ShleeandClaire 48d6940d7f Update docker-compose.yml Elasticsearch image from EOL v7 to slightly newer v8 (investigate v9) (#36974) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-11 08:18:37 +00:00
diondiondion 782ceb3795 Auto-focus mobile composer (#39360) 2026-06-11 08:15:40 +00:00
Nishiki 40bf2dca1e fix: sensitive media card display (#39366) 2026-06-11 08:14:53 +00:00
Claire fd2e3d53eb Fix inconsistent check on post edition when there is both a poll and attachments (#39368) 2026-06-11 08:03:10 +00:00
Matt Jankowski b09af1b465 Add basic coverage for EmailDistributionWorker behavior (#39364) 2026-06-11 07:54:15 +00:00
github-actions[bot]andGitHub Actions b5a2dd20f6 New Crowdin Translations (automated) (#39367) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-11 07:42:56 +00:00
Claire 42bdcc70d5 Merge pull request #3527 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to 9e0a3aaf08
 2026-06-10 19:39:54 +02:00
Eugen Rochko dce5466365 [Glitch] Change validation to permit polls and media being combined 
Port 1bbe3872f2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-10 19:09:14 +02:00
diondiondion adfc894a1f [Glitch] Navigation focus handling polish 
Port 2994e8543d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-10 19:07:57 +02:00
diondiondion 4cb1bf73c9 [Glitch] Manage focus on navigation 
Port bcb8553e01 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-10 19:04:58 +02:00
diondiondion 5893554a3a [Glitch] Fix uncontained text overflow in column header 
Port bff9f0eb6d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-10 19:01:33 +02:00
Echo 9917327511 [Glitch] Emoji substring search 
Port 9f7e2d0002 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-10 18:55:22 +02:00
diondiondion 78d514142b [Glitch] Fix font size of Callout component actions in Safari 
Port b2996dcbbc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-10 18:54:55 +02:00
matrix07012 318d82d0bb [Glitch] Fix being unable to unmark media as sensitive when "always mark media as sensitive" is enabled 
Port f2094164c4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-10 18:54:34 +02:00
Claire 89c2ac444f Merge commit '9e0a3aaf08e7d4fc700f7f19d61f5f8fee346b6a' into glitch-soc/merge-upstream 2026-06-10 18:52:58 +02:00
Claire 9e0a3aaf08 Resolve links to unknown remote objects when posting (#38711) 2026-06-10 15:55:27 +00:00
David Roetzel 008f377a37 Redirect if collection AP ID is requested as HTML (#39361) 2026-06-10 15:54:50 +00:00
Eugen Rochko 1bbe3872f2 Change validation to permit polls and media being combined (#39203) 2026-06-10 15:20:21 +00:00
Shlee 1f1455d1f0 Minor refactor foldToASCII in streaming/utils.js (#39355) 2026-06-10 15:18:31 +00:00
Claire 22a5e1b0b0 Fix Elasticsearch connection cleanup in Sidekiq middleware (#39359) 2026-06-10 15:12:25 +00:00
diondiondion 2994e8543d [Accessibility] Navigation focus handling polish (#39358) 2026-06-10 14:50:49 +00:00
ShleeandClaire c6e2e2255c Fix missing boolean check in Admin Reports API (#39197) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-10 13:40:59 +00:00