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

2869 Commits

Author SHA1 Message Date
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
Eugen Rochko
4f425d9b77 Fix simplified layout applying to other pages in web UI (#39570) 2026-06-23 17:35:29 +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
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
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
diondiondion
eba056979f Refactor report modal heading translation (#39457) 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
6aca68e185 Merge commit 'e2b7096bd3f93afcf4d6b3e7ffb9ccdb417a9def' into glitch-soc/merge-4.6 2026-06-16 21:49:17 +02:00
Coro
dd12940ed5 Fix bio text overflow on account profile page (#39418) 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
Echo
6cf9be9880 Emoji: Add back to state (#39402) 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
08027edb10 Merge commit 'b902c825054b953599cd0341acf428332fca5044' into glitch-soc/merge-upstream 2026-06-12 18:37:02 +02: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
Echo
8ba8ce5669
Emojis: Improve custom search (#39382) 2026-06-11 16:02:58 +00:00
diondiondion
5098b8ccc9
Add empty state to CollectionAdder component (#39372) 2026-06-11 12:22:55 +00: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
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
89c2ac444f Merge commit '9e0a3aaf08e7d4fc700f7f19d61f5f8fee346b6a' into glitch-soc/merge-upstream 2026-06-10 18:52:58 +02:00
Eugen Rochko
1bbe3872f2
Change validation to permit polls and media being combined (#39203) 2026-06-10 15:20:21 +00:00
diondiondion
2994e8543d
[Accessibility] Navigation focus handling polish (#39358) 2026-06-10 14:50:49 +00:00
diondiondion
bcb8553e01
[Accessibility] Manage focus on navigation (#39350) 2026-06-10 12:34:48 +00:00
Echo
9f7e2d0002
Emoji substring search (#39353) 2026-06-10 10:40:48 +00:00
matrix07012
f2094164c4
Fix being unable to unmark media as sensitive when "always mark media as sensitive" is enabled (#39339) 2026-06-10 09:27:38 +00:00
Claire
e08c8b6933 Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/settings_helper.rb`:
  Upstream added a new helper.
  Conflict caused by the fact there is a glitch-soc specific helper.
  Added upstream's new helper in addition to glitch-soc's.
 2026-06-09 21:30:54 +02:00
Evan Prodromou
9c493c20b9
Add policy to filter notifications from bots (#38494) (#38809) 2026-06-09 12:28:53 +00:00
Claire
c4ea89dfd9
Change media attachment limit to 10000 characters (#39306) 2026-06-08 14:03:56 +00:00
Claire
c2e6cbb12b Merge commit 'ead13d4826a7ba1699d6bb310e58642b15687671' into glitch-soc/merge-upstream 2026-06-07 14:29:57 +02:00
David Bento
b3a40bb010
Fix "change thumbnail" button being visible when it shouldn't (#35186) (#38467) 2026-06-05 14:45:01 +00:00
diondiondion
2d2a7ec8d6
Fix Collections editor allowing to add the same account multiple times (#39296) 2026-06-05 09:28:28 +00:00
diondiondion
0968910339
[Accessibility] Make post/feed navigation by hotkey more robust (#39270) 2026-06-05 08:39:23 +00:00
diondiondion
fe4613ba32
Display collection in search results when searched by URL (#39289) 2026-06-04 14:28:51 +00:00
diondiondion
e00d16474e
Prevent logged out users from accessing collection & list creation routes (#39282) 2026-06-04 12:08:26 +00:00
Claire
a1ab96baed Merge commit '52aa8a44bbd0c9a6673cbd9b7c088020be938799' into glitch-soc/merge-upstream 2026-06-03 22:30:16 +02:00
diondiondion
ce3fdf73f3
[Accessibility] Add hotkeys PageUp and PageDown for list navigation (#39252) 2026-06-03 13:26:43 +00:00
diondiondion
0ff2c7aedc
Fix about page error when selecting non-default Rules language (#39267) 2026-06-03 13:21:38 +00:00
Claire
659a077616 Merge commit '07236016bcc78a82205093b3e067bf4a1bb07d88' into glitch-soc/merge-upstream 2026-06-03 12:19:05 +02:00
Renaud Chaput
f0359af358
Change Mastodon gGmbH => Mastodon GmbH (#39261) 2026-06-03 09:36:50 +00:00
Claire
dd12ed2b98 Merge commit 'd1c26c1e27348278fb8081b290e300b327a61ca1' into glitch-soc/merge-upstream 2026-06-02 18:01:45 +02:00
diondiondion
0f7ec43b4a
Fixes author name spacing in trending links items (#39246) 2026-06-02 09:04:51 +00:00
Claire
3cf0fb7ba0 Merge commit 'facb552c9cdbe8a2ebff0b94ebf2c9e9ec385347' into glitch-soc/merge-upstream 2026-06-01 18:00:03 +02:00
Claire
ab8f9d94ea
Fix server rules and custom closed registrations message (#39232) 2026-06-01 09:28:13 +00: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
7fba458d92
Remove frontend check for collections feature flag (#39215) 2026-05-29 13:07:00 +00:00