tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,667 Commits 5 Branches 0 Tags
6c5e435fae70694e32afdf6ed503602c26f407ed
Commit Graph
2896 Commits
Author SHA1 Message Date
Claire 1403a21fe8 Merge commit 'd74bbd9a3c64740433e016dfc936e83d710858f6' into glitch-soc/merge-4.6 2026-08-13 18:41:35 +02:00
diondiondion 2178939191 Fix title tooltip appearing for fullscreen videos (#40127) 2026-08-13 14:42:43 +02:00
Sharlayan ac7fa978af Fix mobile navigation scrolling to top while opening (#40042) 2026-08-13 14:42:43 +02:00
diondiondion c6d5595f0b Change design of "New collection" button in "Add to collection" dialog (#40133) 2026-08-13 14:42:43 +02:00
Sharlayan bfd69230af Fix selected account being lost when creating a collection (#39897) 2026-08-13 14:42:43 +02:00
Claire 53bad36955 Merge commit '1440d55b139e39ec722c2a3db7f60b66cd889048' into glitch-soc/merge-4.6 2026-08-06 18:09:08 +02:00
Sharlayan fe7e2251db Fix oversized profile image crop uploads (#39958) 2026-08-06 11:41:22 +02:00
Echo 2096076b25 Cancel emoji search requests (#39947) 2026-08-06 11:41:22 +02:00
Claire 5ed695d4f3 Merge commit '35fce54cc29466b848eef9b721be810f77fd78f2' into glitch-soc/merge-4.6 
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
  Upstream refactored this class while glitch-soc had an additional method.
  Moved the private methods as upstream did while keeping glitch-soc's extra one.
- `spec/lib/activitypub/activity/create_spec.rb`:
  glitch-soc had extra tests.
  Added upstream's new tests alongside the glitch-soc-specific ones.
 2026-07-22 18:58:43 +02:00
Echo c573b26b38 Improve emoji search (#39815) 2026-07-21 14:41:15 +02:00
diondiondion 89fa67c0e3 Fix swapped order of "accept/reject" actions in follow requests (#39862) 2026-07-21 14:41:15 +02:00
Claire 1285172f2a Merge commit 'd7bb36a64a842dfac52fb1cfb0fcd6646981fb38' into glitch-soc/merge-4.6 2026-07-19 11:29:44 +02:00
diondiondion ac385af2f4 Fix TS lint error caused by a React typing change 2026-07-16 14:47:44 +02:00
diondiondion bedac555dd Fix "Learn more" link target in column post privacy hint (#39829) 2026-07-16 14:47:44 +02:00
diondiondion 92f5d853d3 Fix page refresh when trying to save custom profile fields (#39828) 2026-07-16 14:47:44 +02:00
Echo ce8ce8dac1 Fix account language selector (#39801) 2026-07-16 14:47:44 +02:00
Echo a17fb57446 Fix pinned post button width (#39724) 2026-07-16 14:47:44 +02:00
Claire f8fb62193a Merge commit 'eeb68053a83894190eefae178a661018b9859494' into glitch-soc/merge-4.6 2026-07-03 18:14:36 +02:00
nicole mikołajczyk 7db2a99504 Don't display 'view collection' menu item on collection page (#39694) 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-07-03 14:38:32 +02:00
Claire 8941f1f98c Merge commit '06d64519da4c6fc50536744f0d950dae22c6e2b9' into glitch-soc/merge-4.6 2026-07-02 18:31:59 +02:00
diondiondion 9bd073bf0b Fix duplicate "clear" button shown in main search input in Chrome (#39679) 2026-07-02 14:14:43 +02:00
Federico Franco ad3228b75a Fix follow button floating on profiles when overview landing page is enabled (#39650) 2026-07-02 14:14:43 +02:00
Thomas Pike a45af2e1a4 Fix encryption warning "read more" link (#39635) 2026-07-02 14:14:43 +02:00
Claire 3083fdad1f Merge commit '46108ecfe18f53e8a989aa36e9397914f6bc0108' into glitch-soc/merge-4.6 2026-06-24 17:27:19 +02:00
Echo 6b17583352 Add more resilience to Emoji IDB upgrades (#39576) 2026-06-24 14:24:05 +02:00
diondiondion a090a9f515 Fix media modal navigation in RTL languages (#39587) 2026-06-24 14:24:05 +02:00
diondiondion 5c7492c5e4 Fix accounts not visible in collection editor in advanced web interface (#39586) 2026-06-24 14:24:05 +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
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