tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,578 Commits 5 Branches 0 Tags
6cd656efbc9e53a41814ba3a28c6c0a7fdf38d4e
Commit Graph
5703 Commits
Author SHA1 Message Date
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
Shlee 799a002188 Fix typo in quotes list error handling (#39904) 2026-07-22 18:39:38 +02:00
Echo c573b26b38 Improve emoji search (#39815) 2026-07-21 14:41:15 +02:00
zunda dba4b37b8f Accept non-Latin characters to suggest hash tag (#39696) 2026-07-21 14:41:15 +02:00
Eugen Rochko ed8fbafb56 Change autosuggestions to include second word in web UI (#39622) 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
Claire ea05e85eee Fix relative times (#39742) 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
GitHub Actions 776e667017 New Crowdin translations 2026-07-03 15:22:03 +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
GitHub Actions 06d64519da New Crowdin translations 2026-07-02 15:28:12 +02:00
diondiondion 9bd073bf0b Fix duplicate "clear" button shown in main search input in Chrome (#39679) 2026-07-02 14:14:43 +02:00
Echo 291b1d90c6 Fix visual glitch with the spoiler button (#39677) 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
RoOhi 3642757ea4 Fix: Ignore non-http/https protocols in Service Worker handleFetch (#39507) 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
diondiondion 2abd442c64 Fix combobox menu not closing after a selection (#39595) 2026-06-24 15:34:54 +02:00
Echo 6b17583352 Add more resilience to Emoji IDB upgrades (#39576) 2026-06-24 14:24:05 +02:00
diondiondion ed5f3269e1 Fix combobox listbox not scrolling up when new suggestions have loaded (#39588) 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
GitHub Actions b5e771b89e New Crowdin translations 2026-06-23 17:57:50 +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
diondiondion ef35e07832 Fix redundant indentation on Post reply indicator (#39554) 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 58cf7cfd75 Fix custom profile field overflow (#39513) 2026-06-23 11:17:54 +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
github-actions[bot]andGitHub Actions 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
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
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
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
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