tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,589 Commits 5 Branches 0 Tags
cdca08ba0799b34e5a02c31a29dfa676c6f349cb
Commit Graph
29589 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire cdca08ba07 Merge pull request #3601 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to 9e5f298350 into stable-4.6
 2026-07-27 13:12:04 +02:00
Claire 66ccc19509 [Glitch] Fix being unable to vote in polls without an expiration date 
Port 42c01d703fdb87abd8c335624b83f2ac251967ac to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-27 12:48:11 +02:00
Claire 9b51e5af2b [Glitch] Fix “Hide media with a warning” filters not being applied correctly 
Port 1553ca26f27af816885970a02b2bf69b64748e46 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-27 12:48:11 +02:00
Claire 599ee0c31d Merge commit '9e5f298350d9b05dbb60ba122cd8cb72d40c8997' into glitch-soc/merge-4.6 2026-07-27 12:47:42 +02:00
Claire 9e5f298350 Fix being unable to vote in polls without an expiration date (#39949) 2026-07-27 12:26:07 +02:00
Claire 14108d2c06 Fix “Hide media with a warning” filters not being applied correctly (#39946) 2026-07-27 11:33:05 +02:00
Claire 8f480a7672 Merge pull request #3598 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to fe7c6beb61 into stable-4.6
 2026-07-24 20:02:59 +02:00
Claire 895563ec41 Merge commit 'fe7c6beb618da69da8d41dccd064dea1546bd391' into glitch-soc/merge-4.6 2026-07-24 19:09:29 +02:00
Claire fe7c6beb61 Update dependency aws-sdk-s3 2026-07-24 10:56:14 +02:00
Claire 095fc847f1 Fix performance of user-focused queries in admin dashboard (#39929) 2026-07-24 09:12:15 +02:00
Claire 5fd76aa2e2 Merge pull request #3593 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to 35fce54cc2 into stable-4.6
 2026-07-23 07:52:59 +02:00
Shlee 6cd656efbc [Glitch] Fix typo in quotes list error handling 
Port 45cc65bb7f7d0a3aa7cc2ee8d8549431963a24cb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-22 19:01:46 +02:00
Echo 056d6ae414 [Glitch] Improve emoji search 
Port cf46401689b3122d0c310ea2b1c639ad151780f6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-22 19:01:24 +02:00
zunda 6c7f3854d0 [Glitch] Accept non-Latin characters to suggest hash tag 
Port 72085f7d5288692f85e411916d3f0f18a3603574 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-22 19:00:46 +02:00
Eugen Rochko 3c029a54df [Glitch] Change autosuggestions to include second word in web UI 
Port e4e19ba26487e03c9db62275efe960dc124aa280 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-22 19:00:30 +02:00
diondiondion 912c6b1d61 [Glitch] Fix swapped order of "accept/reject" actions in follow requests 
Port de2cf76e4a10b7f1ebe6c4ea509985272dfc1e89 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-22 19:00:02 +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
renovate[bot]andClaire 35fce54cc2 Update dependency @vitest/browser to v4.1.10 [SECURITY] (#39915) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-22 18:39:38 +02:00
Claire d813ddd1db Fix Web Push subscription deletion endpoint incorrectly expecting anti-CSRF tokens (#39918) 2026-07-22 18:39:38 +02:00
Claire 503aee6be4 Fix ActivityPub::Activity::Create trying to re-create known statuses when author changes (#39916) 2026-07-22 18:39:38 +02:00
Shlee 799a002188 Fix typo in quotes list error handling (#39904) 2026-07-22 18:39:38 +02:00
Claire 61a1238bd7 Fix lax relevancy check in inbound activity processing (#39892) 2026-07-22 18:39:38 +02:00
Claire af8d57c886 Update dependency rails-html-sanitizer 2026-07-21 14:41:15 +02:00
Claire f90b89b7a9 Fix Account::Merging concern not supporting Quotes or Collections, refactor it (#39884) 2026-07-21 14:41:15 +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 2ab060be0f Fix suspended accounts not being removed from follow request count in /api/v1/accounts/verify_credentials (#39858) 2026-07-21 14:41:15 +02:00
Claire 25223d6392 Merge pull request #3585 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to d7bb36a64a into stable-4.6
 2026-07-19 15:54:59 +02:00
diondiondion cab8833e82 [Glitch] Fix TS lint error caused by a React typing change 
Port ac385af2f4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-19 11:32:33 +02:00
diondiondion 7b9d328069 [Glitch] Fix "Learn more" link target in column post privacy hint 
Port ba773b9a8e20c83991ae48ffd8ca61b4617aef7b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-19 11:32:24 +02:00
diondiondion 9e0574cbd3 [Glitch] Fix page refresh when trying to save custom profile fields 
Port b40eed5e3c016184784835d522450444edc95d06 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-19 11:32:24 +02:00
diondiondion 2e4b55bb72 [Glitch] Fix pagination overlapping announcement reactions bar 
Port d70f1f983c945b3aa4c2089e540c67d706d762d9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-19 11:32:24 +02:00
diondiondion ed73d33de1 [Glitch] Fix very wide images overflowing posts horizontally 
Port dde6c28e97ebc697a03d744d78d8822f85cbd6e8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-19 11:32:23 +02:00
Echo 35e05ead8d [Glitch] Fix account language selector 
Port 78894ca4ad00b52848ed89c32dc33c6d2663c681 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-19 11:32:23 +02:00
Claire 66419873fe [Glitch] Fix relative times 
Port 312400370506ba558c30dac6641b198fac0e1300 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-19 11:32:23 +02:00
Echo 0dd85ac22e [Glitch] Fix pinned post button width 
Port 71a4126f3ae2f3420a55bb82c99458f675b3392a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-19 11:32:23 +02:00
Claire 1285172f2a Merge commit 'd7bb36a64a842dfac52fb1cfb0fcd6646981fb38' into glitch-soc/merge-4.6 2026-07-19 11:29:44 +02:00
Claire d7bb36a64a Fix not being able to edit quote post text (#39837) 2026-07-16 14:47:44 +02:00
diondiondion ac385af2f4 Fix TS lint error caused by a React typing change 2026-07-16 14:47:44 +02:00
Claire e9c8401143 Update dependency websocket-driver 2026-07-16 14:47:44 +02:00
Claire 0ef1cf0590 Update dependency json 2026-07-16 14:47:44 +02:00
Claire bdd2053e7a Rename ASSOCIATIONS_ON_SUSPEND to ASSOCIATIONS_ON_PURGE (#39831) 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
Shlee c870aae3a9 Include tag_follows in ASSOCIATIONS_ON_SUSPEND to suspended users (#39824) 2026-07-16 14:47:44 +02:00
Shlee a614f6c38f Fix CW being copied to body when editing quote posts with empty text (#39823) 2026-07-16 14:47:44 +02:00
Shlee 3ed1ad7cdb Fix handling of QuoteRequest rejections when those can't be found by id (#39820) 2026-07-16 14:47:44 +02:00
Shlee ef1a880fe1 Fix: Admin invite autofollow option is ignored (#39819) 2026-07-16 14:47:44 +02:00