tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,227 Commits 5 Branches 0 Tags
4a5cfb09adbaede218823d95c12e893291ec19e2
Commit Graph
29227 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Dørum 4a5cfb09ad [Glitch] Make the hidden account message less misleading 
Port 78e8ee7a43 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-02 18:04:11 +02:00
diondiondion 4edebef9aa [Glitch] Fix formatting of user names with custom emojis in EmptyState component 
Port b076ef1b1b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-02 18:03:03 +02:00
diondiondion a864d256ab [Glitch] Fixes author name spacing in trending links items 
Port 0f7ec43b4a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-02 18:02:41 +02:00
Claire dd12ed2b98 Merge commit 'd1c26c1e27348278fb8081b290e300b327a61ca1' into glitch-soc/merge-upstream 2026-06-02 18:01:45 +02:00
Claire d1c26c1e27 Fix not importing stylesheet recursively (#39254) 2026-06-02 15:23:52 +00:00
diondiondion b076ef1b1b Fix formatting of user names with custom emojis in EmptyState component (#39249) 2026-06-02 12:04:40 +00:00
Martin Dørum 78e8ee7a43 Make the hidden account message less misleading (#39231) 2026-06-02 09:14:12 +00:00
diondiondion 0f7ec43b4a Fixes author name spacing in trending links items (#39246) 2026-06-02 09:04:51 +00:00
github-actions[bot]andGitHub Actions f851dcbefb New Crowdin Translations (automated) (#39244) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-02 08:00:21 +00:00
Matt Jankowski 78932fe567 Add coverage for StatusTrend.allowed method (#39239) 2026-06-02 07:45:08 +00:00
Claire cd43ca4d95 Merge pull request #3518 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to facb552c9c
 2026-06-02 09:32:44 +02:00
Claire 524d3a0d7f [Glitch] Fix server rules and custom closed registrations message 
Port ab8f9d94ea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-01 18:01:23 +02:00
Claire 3cf0fb7ba0 Merge commit 'facb552c9cdbe8a2ebff0b94ebf2c9e9ec385347' into glitch-soc/merge-upstream 2026-06-01 18:00:03 +02:00
renovate[bot] facb552c9c Update formatjs monorepo (#39078) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-06-01 15:18:19 +00:00
renovate[bot]andClaire 6c1f6f3e92 Update dependency @vitest/browser to v4.1.6 [SECURITY] (#39238) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-01 15:10:22 +00:00
zunda 423d0ca875 Extract text from language tagged strings for link preview (#39190) 2026-06-01 15:10:08 +00:00
Matt Jankowski 8d4f9a97fe Move by_domain/local interaction check to filter (#39216) 2026-06-01 14:52:19 +00:00
Matt Jankowski 50b6bbe379 Update vite_rails to version 3.11.0 (#39218) 2026-06-01 14:51:01 +00:00
Claire 89d9fc8889 Remove ignored_columns for columns removed in pre-4.2.0 migrations (#39237) 2026-06-01 14:40:03 +00:00
Essem 4d54d9867e Fix container builds failing on repo names with uppercase characters (#39208) 2026-06-01 14:09:59 +00:00
Matt Jankowski 95bc6f0139 Move simplecov start to config and require to spec_helper (#39236) 2026-06-01 13:37:17 +00:00
Claire 1bd13af546 Fix error handling for invalid keys in signature verification (#39235) 2026-06-01 13:20:23 +00:00
David Roetzel 300bc7ddc5 Add collections to moderation action button/hint text (#39234) 2026-06-01 11:49:48 +00:00
renovate[bot] 65d2c663d9 Update dependency @unhead/react to v3.1.1 (#39176) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-06-01 10:41:51 +00:00
renovate[bot] 2a1f04dad8 Update dependency eslint-plugin-jsdoc to v63 (#39097) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-06-01 10:18:25 +00:00
renovate[bot] 66b4b54fdc Update dependency aws-sdk-s3 to v1.224.0 (#39091) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-06-01 10:14:49 +00:00
Pia B.andClaire f6c156197e Add export for custom filters (#39085) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-01 09:56:17 +00:00
renovate[bot] 3af33aca47 Update dependency discard to v2 (#39192) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-06-01 09:42:57 +00:00
renovate[bot] d04733128e Update RuboCop (non-major) to v1.87.0 (#39179) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-06-01 09:42:44 +00:00
renovate[bot] cea662e32d Update dependency rubyzip to v3.3.1 (#39227) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-06-01 09:39:02 +00:00
Michael Stanclift 88c5d17cf7 Link directly to pending user account in email notification (#39206) 2026-06-01 09:36:39 +00:00
Claire ab8f9d94ea Fix server rules and custom closed registrations message (#39232) 2026-06-01 09:28:13 +00:00
github-actions[bot]andGitHub Actions 1dfad49524 New Crowdin Translations (automated) (#39224) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-01 07:52:25 +00:00
Claire 7f2f403a84 Merge pull request #3517 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to 0caf334891
 2026-05-30 22:39:50 +02:00
diondiondion 45628d7e6e [Glitch] Reduce account overfetching when displaying collection lists 
Port 0caf334891 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-30 12:20:38 +02:00
diondiondion 6032a17cc2 [Glitch] Make handle button text selectable 
Port 8e15e49e87 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-30 12:20:10 +02:00
diondiondion ac0bacbcc0 [Glitch] Remove frontend check for collections feature flag 
Port 7fba458d92 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-30 12:19:47 +02:00
diondiondion bc9732c26c [Glitch] Use new Collections endpoint version 
Port a86f3a4000 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-30 12:19:11 +02:00
Echo 121839f262 [Glitch] Collections: Add default recommendations 
Port fa1e16ed9f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-30 12:18:47 +02:00
Echo b5bd0f2297 [Glitch] Collection notification filtering 
Port 4101f567c5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-30 12:18:17 +02:00
Claire ae2ff31f32 Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream updated the API version, while we also have a custom glitch API version.
  Updated as upstream did.
 2026-05-30 12:13:35 +02:00
diondiondion 0caf334891 Reduce account overfetching when displaying collection lists (#39220) 2026-05-29 15:27:57 +00:00
diondiondion 8e15e49e87 [Profile] Make handle button text selectable (#39217) 2026-05-29 13:14:06 +00:00
diondiondion 7fba458d92 Remove frontend check for collections feature flag (#39215) 2026-05-29 13:07:00 +00:00
diondiondion a86f3a4000 Use new Collections endpoint version (#39214) 2026-05-29 12:48:12 +00:00
Echo fa1e16ed9f Collections: Add default recommendations (#39202) 2026-05-29 11:53:03 +00:00
renovate[bot] 796f771362 Update dependency pg to v8.21.0 (#39067) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-05-29 09:48:52 +00:00
David Roetzel 572612fde9 Remove collections feature flag (#39211) 2026-05-29 09:37:42 +00:00
Matt Jankowski e2754b0bc2 Unify queue_mail and mail in admin mailer new trends spec (#39207) 2026-05-29 09:16:19 +00:00
David Roetzel 6d3182a6eb Move Collections API to v1 namespace (#39210) 2026-05-29 08:39:51 +00:00