tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,445 Commits 5 Branches 0 Tags
Commit Graph

29445 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
6b4e8c7467 Merge commit 'e8642389912b1059c921f0836825f12a0f2779db' into glitch-soc/merge-4.6 
Conflicts:
- `app/models/account.rb`:
  Upstream changed the display name length limit for local users,
  but glitch-soc has a configurable limit.
  Updated the default limit to be upstream's new limit.
 2026-06-17 14:40:25 +02:00
Claire
e864238991
Bump version to v4.6.0 (#39470) 2026-06-17 14:14:09 +02:00
github-actions[bot]
9d34527db5
New Crowdin Translations for stable-4.6 (automated) (#39469) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-17 12:33:01 +02:00
Matt Jankowski
41ea9ad128 Handle missing sw.js in test environment assets (#39459) 2026-06-17 12:09:12 +02:00
diondiondion
eba056979f Refactor report modal heading translation (#39457) 2026-06-17 12:09:12 +02:00
diondiondion
a5fd36e95c Fix tiny spacing above character counter (#39467) 2026-06-17 12:09:12 +02:00
Matt Jankowski
8ea7732343 Relax account display name length limit (#39458) 2026-06-17 12:09:12 +02:00
diondiondion
e85019c17e Add category selection to collection report modal (#39456) 2026-06-17 12:09:12 +02:00
Claire
291dda95da Fixes being unable to edit an attachment twice without submitting (#39453) 2026-06-17 12:09:12 +02:00
Claire
4cccaaa9ec Fix styling of follow requests (#39452) 2026-06-17 12:09:12 +02:00
renovate[bot]
27926437ca Update dependency @vitest/browser to v4.1.8 [SECURITY] (#39451) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2026-06-17 12:09:12 +02:00
Claire
1f927a8f77
Merge pull request #3535 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to e2b7096bd3f93afcf4d6b3e7ffb9ccdb417a9def into stable-4.6
 2026-06-16 22:14:57 +02:00
Coro
b14f20aca6 [Glitch] Fix bio text overflow on account profile page 
Port 74391c72c647257fce809309599608d6fac746b1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-16 21:52:33 +02:00
diondiondion
ea0f807516 [Glitch] Fix hovercard not showing in compose column 
Port 8544f95ad63bdcf5401dbf121043f1645e725b83 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-16 21:52:33 +02:00
Hanage999
57246a0539 [Glitch] Fix categorised custom emojis missing from the emoji picker 
Port b4be90f9ea3e29e166b4fb0d0e0cc6b32dbf908b to glitch-soc

Signed-off-by: Hanage999 <hanage999@crazynewworld.net>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-16 21:52:32 +02:00
diondiondion
149b5b7989 [Glitch] Change Page Up/Page Down hotkeys to require Alt modifier key 
Port 083b325a9a89b2eb73e490595e987440cd544093 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-16 21:52:32 +02:00
diondiondion
7fb9eb452b [Glitch] Prevent crash trying to access nullish location state 
Port 4fce6e0f7338ee6d6a791039357e8dd69adc206e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-16 21:52:32 +02:00
Echo
4b67d8e34f [Glitch] Emoji: Add back to state 
Port 963a54664804e60ea8e30795090a0f20de7a48dc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-16 21:52:32 +02:00
Federico Rao
61237253dc [Glitch] Guard against undefined AudioContext in useAudioContext hook 
Port 61fdcf33303f9be249fbec4f576153bde2c9048b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-16 21:52:32 +02:00
diondiondion
81aaac4779 [Glitch] Fix crash of standalone wrapstodon and embedded status pages 
Port a78d1150a9c8f385450bb0cfaa947c164c8c69d6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-16 21:52:32 +02:00
Claire
6aca68e185 Merge commit 'e2b7096bd3f93afcf4d6b3e7ffb9ccdb417a9def' into glitch-soc/merge-4.6 2026-06-16 21:49:17 +02:00
Claire
e2b7096bd3
Bump version to v4.6.0-rc.2 (#39441) 2026-06-15 17:27:55 +02:00
diondiondion
80f9422ef2 [Accessibility] Return alt text for default server thumbnail (#39439) 2026-06-15 17:01:10 +02:00
Dmytro Oliinyk
72fa17a441 Fix service worker failing to load due to 404 on chunk dependencies (#39433) 2026-06-15 17:01:10 +02:00
Coro
dd12940ed5 Fix bio text overflow on account profile page (#39418) 2026-06-15 17:01:10 +02:00
diondiondion
2e5039ec73 Fix hovercard not showing in compose column (#39430) 2026-06-15 17:01:10 +02:00
Hanage999
bdfbc6b3a6 Fix categorised custom emojis missing from the emoji picker (#39421) 
Signed-off-by: Hanage999 <hanage999@crazynewworld.net>
 2026-06-15 17:01:10 +02:00
diondiondion
01d03d67a8 Change Page Up/Page Down hotkeys to require Alt modifier key (#39427) 2026-06-15 17:01:10 +02:00
David Roetzel
dc53b0e077 Destroy dependent notifications of a collection (#39429) 2026-06-15 17:01:10 +02:00
diondiondion
fcf222246a Prevent crash trying to access nullish location state (#39408) 2026-06-15 17:01:10 +02:00
Echo
6cf9be9880 Emoji: Add back to state (#39402) 2026-06-15 17:01:10 +02:00
Federico Rao
f79e0109fe Guard against undefined AudioContext in useAudioContext hook (#39397) 2026-06-15 17:01:10 +02:00
diondiondion
ce8bf016bd Fix crash of standalone wrapstodon and embedded status pages (#39400) 2026-06-15 17:01:10 +02:00
Claire
e2d44d8343 Update dependency net-imap (#39426) 2026-06-15 17:01:10 +02:00
Claire
61c56d4fd3
Merge pull request #3486 from ClearlyClaire/glitch-soc/drop-local-emoji 
Completely drop support for the infamous local-only emoji
 2026-06-12 19:16:32 +02:00
Claire
a8644ccb3e
Merge pull request #3529 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to b902c825054b953599cd0341acf428332fca5044
 2026-06-12 19:16:15 +02:00
diondiondion
057d5e1be4 [Glitch] Fix misleading copy in "Remove me from collection" confirmation dialog 
Port bd9184836740a8741da84def835bfbea29e2015b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-12 18:43:23 +02:00
Eugen Rochko
17d706ac54 [Glitch] Fix poll options being below uploads in compose form in web UI 
Port 9910018b0d9dbad466a408a5dfd168a67f324067 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-12 18:43:23 +02:00
diondiondion
6e2f3ab2b2 [Glitch] Fix account hovercard sometimes not triggering 
Port 2e3b81cc1ea89a4d1fea87c2be6df67ace64c9c5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-12 18:43:23 +02:00
Echo
7f0725767d [Glitch] Emojis: Improve custom search 
Port 8ba8ce5669853e967a77e886b71dd18fcf35b8eb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-12 18:43:23 +02:00
diondiondion
0f61e15a6a [Glitch] Fix loading/errored emoji in detailed status display name causing line break 
Port 90438e9b2e4b7216b0402d7679808dae9d206288 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-12 18:43:23 +02:00
diondiondion
d9fa3feeeb [Glitch] Add empty state to CollectionAdder component 
Port 5098b8ccc9d95a866ef109e32b6cc5de069f12b9 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]
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