tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,617 Commits 5 Branches 0 Tags
92afbdc8408b68c334ba8dcfdcec5b5dc0ddcd90
Commit Graph
29617 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sharlayan 92afbdc840 [Glitch] Fix selected account being lost when creating a collection 
Port f6969f71f886d24f13e182a31209a8cab3735787 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-08-13 18:41:49 +02:00
Claire 1403a21fe8 Merge commit 'd74bbd9a3c64740433e016dfc936e83d710858f6' into glitch-soc/merge-4.6 2026-08-13 18:41:35 +02:00
Claire d74bbd9a3c Bump version to v4.6.6 2026-08-13 18:16:01 +02:00
GitHub Actions abee91d6ee New Crowdin translations 2026-08-13 15:55:52 +02:00
Claire c76fd2b478 Update mastodon:setup task warning about trademark to match masto but ignore subdomains (#40143) 2026-08-13 14:42:43 +02:00
Claire b4121ff003 Wrap connection errors in Webfinger#perform (#40135) 2026-08-13 14:42:43 +02:00
Claire 170f23bb24 Fix Web UI being inaccessible with URLs ending with .zip (#40134) 2026-08-13 14:42:43 +02:00
diondiondion e059627d18 Fix semitransparent background of picture-in-picture video player (#40132) 2026-08-13 14:42:43 +02:00
diondiondion 2178939191 Fix title tooltip appearing for fullscreen videos (#40127) 2026-08-13 14:42:43 +02:00
diondiondion 77b51c07ac Fix image preview too dark in alt text editor dialog (#40126) 2026-08-13 14:42:43 +02:00
Claire 77b7951de8 Fix domain block impact queries being rejected (#40122) 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 6f8664c82e Merge pull request #3619 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to 1440d55b13 into stable-4.6
 2026-08-07 08:17:33 +02:00
Sharlayan c603ad8dfe [Glitch] Fix oversized profile image crop uploads 
Port 857db1913e8c5929fd60ad9085eb013dbe0af315 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-08-06 18:10:00 +02:00
Echo d133f70b87 [Glitch] Cancel emoji search requests 
Port dca7bc42d25a55351c14861ea9c68229aaf54397 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-08-06 18:09:30 +02:00
Claire 53bad36955 Merge commit '1440d55b139e39ec722c2a3db7f60b66cd889048' into glitch-soc/merge-4.6 2026-08-06 18:09:08 +02:00
Claire 1440d55b13 Bump version to v4.6.5 2026-08-06 14:22:54 +02:00
Shlee 2a43b432a6 Fix incorrect attribute being read while processing Collection items (#40052) 2026-08-06 11:41:22 +02:00
Shlee 3359c149f9 Fix typo in embedded quote handling code (#40049) 2026-08-06 11:41:22 +02:00
Shlee 92162c4113 Fix missing AccountWarning from merging.rb (#39982) 2026-08-06 11:41:22 +02:00
Shlee 65f3ac3036 Fix typo in process_status_update_service.rb allowing more than 4 media attachments (#39978) 2026-08-06 11:41:22 +02:00
David Roetzel 07a8dfa32c Improve enforcement of collection item limit (#39969) 2026-08-06 11:41:22 +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 2be3994558 Merge commit '930aa9fee26bf9eaefe27826fa1061288d83373b' into glitch-soc/stable-4.6 2026-07-27 16:05:45 +02:00
Claire 930aa9fee2 Merge commit from fork 
* Fix GHSA-7jvv-fhmg-wpfw

* Fix GHSA-hx34-2pfw-2qfj

* Fix GHSA-vwhj-3g83-v276

* Bump version to v4.6.4
 2026-07-27 16:02:01 +02:00
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