tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,579 Commits 5 Branches 0 Tags
5fd76aa2e223c97159486bc36fa41a34f8f8a410
Commit Graph
1932 Commits
Author SHA1 Message Date
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
Claire bdd2053e7a Rename ASSOCIATIONS_ON_SUSPEND to ASSOCIATIONS_ON_PURGE (#39831) 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
David Roetzel e23c2d246c Remove collections when user is suspended (#39809) 2026-07-16 14:47:44 +02:00
Claire f2e61fbd56 Fix error handling in ActivityPub::ProcessFeaturedItemService (#39787) 2026-07-16 14:47:44 +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
David Roetzel 052d6bb173 Add check for wrong attribution of collections (#39525) 2026-06-23 11:17:54 +02:00
Claire 2a80a07854 Fix fetching unknown key when it's not the actor's first, and add error handling for unavailable keys (#39512) 2026-06-23 11:17:54 +02:00
Claire 08027edb10 Merge commit 'b902c825054b953599cd0341acf428332fca5044' into glitch-soc/merge-upstream 2026-06-12 18:37:02 +02:00
Pia B. 35f3748482 Add import for custom filters (#39256) 2026-06-11 16:32:46 +00:00
Shlee 1f84b98292 Follow up to #38711 - support instances running on subdomains (#39379) 2026-06-11 13:58:19 +00:00
Shlee e52fc4a0c1 Follow up to #39323 - for tag_search_service (#39375) 2026-06-11 13:14:20 +00:00
Shlee 655dca8a78 Follow up to #38809 - Appending not following condition (as standard) (#39377) 2026-06-11 13:10:27 +00:00
Claire bbbbb24dbd Merge commit '96e23af89258068d05cc8557df914b4a9add385b' into glitch-soc/merge-upstream 2026-06-11 13:26:25 +02:00
Claire fd2e3d53eb Fix inconsistent check on post edition when there is both a poll and attachments (#39368) 2026-06-11 08:03:10 +00:00
Claire 89c2ac444f Merge commit '9e0a3aaf08e7d4fc700f7f19d61f5f8fee346b6a' into glitch-soc/merge-upstream 2026-06-10 18:52:58 +02:00
Claire 9e0a3aaf08 Resolve links to unknown remote objects when posting (#38711) 2026-06-10 15:55:27 +00:00
Eugen Rochko 1bbe3872f2 Change validation to permit polls and media being combined (#39203) 2026-06-10 15:20:21 +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
David Roetzel 200fda1cdc Add collection reach finder (#39346) 2026-06-09 14:22:21 +00:00
Evan Prodromou 9c493c20b9 Add policy to filter notifications from bots (#38494) (#38809) 2026-06-09 12:28:53 +00:00
Claire 481e51b81e Put Elasticsearch search queries behind a Stoplight (#39323) 2026-06-09 08:30:43 +00:00
David Roetzel cf09247945 Check type of featured item and skip unsupported ones (#39327) 2026-06-08 15:03:23 +00:00
Claire 003ad015f8 Merge commit '0529a1f7d2197dd535f59163c00634f9c060723d' into glitch-soc/merge-upstream 2026-06-03 14:42:51 +02:00
Claire 0529a1f7d2 Bump version to v4.5.11 (#39264) 2026-06-03 12:26:55 +00:00
Claire 659a077616 Merge commit '07236016bcc78a82205093b3e067bf4a1bb07d88' into glitch-soc/merge-upstream 2026-06-03 12:19:05 +02:00
Claire c2daca655f Merge commit from fork 2026-06-03 11:57:50 +02: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
David Roetzel 572612fde9 Remove collections feature flag (#39211) 2026-05-29 09:37:42 +00:00
Claire ca427bc176 Merge commit 'f5b57e8ba7a2d3687b1ae496f6213bfe5347c0fa' into glitch-soc/merge-upstream 2026-05-20 15:43:33 +02:00
Claire 0786c1e57a Merge commit from fork 2026-05-20 14:38:24 +02:00
Claire aaf06a8186 Merge commit '6f8558a6b96041541d911439421563c1e9e7b3f4' into glitch-soc/merge-upstream 2026-05-20 11:31:39 +02:00
David Roetzel 22203f8aeb Improve collection item verification (#39096) 2026-05-20 07:55:17 +00:00
Claire 4fcc9b8a40 Merge commit 'd2f640272f3f36c8979cff645416682840528906' into glitch-soc/merge-upstream 2026-05-12 18:37:31 +02:00
David Roetzel b1f7c9641f Fix updating collection items when position is unknown (#38962) 2026-05-11 06:08:44 +00:00
Claire 80a452220c Merge commit 'cb2e7705848e602b7cdc513560004715134b10d4' into glitch-soc/merge-upstream 2026-05-05 18:01:14 +02:00
Claire 3bc27b9b64 Resolve unknown tagged collections in remote posts (#38900) 2026-05-05 14:46:47 +00:00
Claire 6935fce458 Merge commit 'ba83509ff4ed3f7193f3ca5c5deb3038c39620b1' into glitch-soc/merge-upstream 2026-05-04 21:08:25 +02:00
Eugen RochkoandClaire ee88da4511 Add admin UI for managing email subscriptions (#38741) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-04 13:56:04 +00:00
Claire 44394878a4 Merge commit 'c6facd27ed191177afb003640b8ee7d0742c7f63' into glitch-soc/merge-upstream 2026-04-30 19:00:48 +02:00
David Roetzel 6c5bd4f9a8 Handle collections when blocking a user (#38827) 2026-04-28 14:49:19 +00:00
Claire 0b3c848958 Merge commit 'a706fce6781104b3aa1315be14f1fb8ccd4fcb1b' into glitch-soc/merge-upstream 2026-04-21 19:20:05 +02:00
Matt Jankowski 055b739b88 Use with_domain scope in ReportService (#38758) 2026-04-21 09:59:04 +00:00
Claire e0a34e6d89 Merge commit 'b15d234ccb5d004180561c440dd45536d70e67b2' into glitch-soc/merge-upstream 2026-04-17 18:06:10 +02:00
David Roetzel e711f9d492 Federate featured item creation date (#38713) 2026-04-16 15:44:50 +00:00
David Roetzel fee38e57f0 Federate and store a collection url (#38697) 2026-04-16 07:26:34 +00:00
Claire 1eac058989 Merge commit '73fc8d34d98a80cfb32d3c7c5dc4794fad5470d5' into glitch-soc/merge-upstream 2026-04-11 13:22:19 +02:00
Claire 73fc8d34d9 Change collection update to also send notifications if the sensitive label or the topic are changed (#38644) 2026-04-11 11:01:55 +00:00