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

29476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
diondiondion
dc4d9d8f22 [Glitch] Fix "private mention" post heading overlapping thread line 
Port a951cf301166f212bc14b8220d8ed4b5b0655059 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-23 18:06:52 +02:00
diondiondion
81590f1c9c [Glitch] Fix custom profile field overflow 
Port 2a894970ac8d052b196969668c5dd8c81c48cca0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-23 18:06:52 +02:00
Claire
2f491f0d48 Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version.
   Did it as well.
 2026-06-23 18:01:59 +02:00
GitHub Actions
b5e771b89e New Crowdin translations 2026-06-23 17:57:50 +02:00
renovate[bot]
b020032df5 Update Node.js to 24.17 (#39483) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-06-23 17:35:29 +02:00
Claire
a454bbde69 Bump Mastodon API version (#39574) 2026-06-23 17:35:29 +02:00
nicole mikołajczyk
30b1bf86fa Accept avatar_description and header_description in /api/v1/accounts/update_credentials (#39547) 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-06-23 17:35:29 +02:00
David Roetzel
b06e9f5a5e LDAP: Fix attempted modification of frozen hash (#39571) 2026-06-23 17:35:29 +02:00
Eugen Rochko
4f425d9b77 Fix simplified layout applying to other pages in web UI (#39570) 2026-06-23 17:35:29 +02:00
renovate[bot]
6031e53133 Update dependency chewy to v8.4.1 (#39474) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-06-23 11:27:36 +02:00
Echo
7418eaa1f2 Fix Vite build warning (#39562) 2026-06-23 11:17:55 +02:00
Echo
903594f70c Removes comment as it was breaking Vite rewriting import path (#39558) 2026-06-23 11:17:55 +02:00
David Roetzel
e38abc3801 Add scheduler job to repair collection attribution (#39550) 2026-06-23 11:17:55 +02:00
renovate[bot]
c473e28bd1 Update dependency ox to v2.14.27 (#39508) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-06-23 11:17:55 +02:00
Matt Jankowski
af8ae721d5 Reduce setup step timeout, increase overall timeout (#39495) 2026-06-23 11:17:55 +02:00
diondiondion
ef35e07832 Fix redundant indentation on Post reply indicator (#39554) 2026-06-23 11:17:55 +02:00
renovate[bot]
ec89e73f7b Update dependency concurrent-ruby to v1.3.7 [SECURITY] (#39553) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-06-23 11:17:55 +02:00
renovate[bot]
2734f386c7 Update dependency nokogiri to v1.19.4 (#39551) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-06-23 11:17:55 +02:00
Shlee
eb2d1c0f2a Follow up to #39458 - Hardcoded maxLength of 30 for display name after recent change to 40. (#39499) 2026-06-23 11:17:55 +02:00
diondiondion
5a3f942a5d Fix advanced UI columns not using mobile styles (#39528) 2026-06-23 11:17:54 +02:00
diondiondion
7cb81e0887 Fix "private mention" post heading overlapping thread line (#39521) 2026-06-23 11:17:54 +02:00
David Roetzel
052d6bb173 Add check for wrong attribution of collections (#39525) 2026-06-23 11:17:54 +02:00
David Roetzel
7608436b64 Add route constraint to only allow numeric ids (#39523) 2026-06-23 11:17:54 +02:00
diondiondion
58cf7cfd75 Fix custom profile field overflow (#39513) 2026-06-23 11:17:54 +02:00
Claire
2a80a07854 Fix fetching unknown key when it's not the actor's first, and add error handling for unavailable keys (#39512) 2026-06-23 11:17:54 +02:00
Claire
0c4bf90bae
Merge pull request #3537 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to 137d5801544ca5b8078ce2242ff3b5505e648166 into stable-4.6
 2026-06-17 15:30:35 +02:00
diondiondion
ada096fd2b [Glitch] Refactor report modal heading translation 
Port fe2db1e2e854fde6cdd82344bde0f9fee9ac2151 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-17 14:44:24 +02:00
diondiondion
de89461fb8 [Glitch] Fix tiny spacing above character counter 
Port e966aae0492cc612a96757ea01a204d9ae60a3aa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-17 14:44:24 +02:00
diondiondion
772106eb08 [Glitch] Add category selection to collection report modal 
Port 97db9fb1a5bbe74ec4cdcbc498ea2e998d3ed510 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-17 14:44:24 +02:00
Claire
ddfb2ea968 [Glitch] Fixes being unable to edit an attachment twice without submitting 
Port 3109a5a4d8612ba2d9468a2151cafbe738598099 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-17 14:44:24 +02:00
Claire
5dfb14f518 [Glitch] Fix styling of follow requests 
Port 69fdefb376da47ad38d04b69108729ab675d7b68 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-17 14:44:24 +02:00
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