tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,613 Commits 5 Branches 0 Tags
8032905c5549fde8564e782dbac366a2fe98d137
Commit Graph
2914 Commits
Author SHA1 Message Date
Claire b9014ec220 Merge commit '66fdd3ae65e13349fbc0b2818d4b91a389075553' into glitch-soc/main 2026-04-08 19:32:32 +02:00
Claire 66fdd3ae65 Fix serialization of added_to_collection notifications (#38612) 2026-04-08 16:40:51 +00:00
Claire 4ad54b279d Add ability to search for a collection by URL (#38588) 2026-04-08 16:03:35 +00:00
Eugen Rochko ba9eabccbf Fix no notification being created when account is added to collection on creation (#38611) 2026-04-08 16:01:37 +00:00
Claire 39c70649ca Add added_to_collection and collection_updated notification types (#38491) 2026-04-08 12:56:07 +00:00
Claire 69b70d48c6 Merge commit 'db13dddcf90343574dee320fff7e8bb9bf3707e4' into glitch-soc/merge-upstream 2026-04-07 20:08:57 +02:00
Matt Jankowski 9fdc8246f2 Use consistent style in *Filter classes to skip pagination (#38559) 2026-04-07 09:59:36 +00:00
Matt Jankowski 71e6e50846 Simplify media attachment lookup in show/player actions (#38565) 2026-04-07 09:58:37 +00:00
Claire cb62beca08 Merge commit 'dc923c6425559266f0665fe2e294f6e412783810' into glitch-soc/merge-upstream 2026-04-02 18:20:01 +02:00
David Roetzel 814cd61fd8 Remove description presence validation on collections (#38528) 2026-04-02 12:56:00 +00:00
Claire 7a4747122e Merge commit 'ca5c0a144ade4bff7bd10446a39d86116879884e' into glitch-soc/merge-upstream 
- `CODE_OF_CONDUCT.md`:
  Adopt upstream's new Code of Conduct
 2026-04-01 19:11:21 +02:00
Claire b5c1a13341 Merge commit '30275cd80e8552d6cbcdeb11f83a4d5028aa6eae' into glitch-soc/merge-upstream 2026-04-01 18:37:21 +02:00
Eugen Rochko 0742a01571 Add MX record validation to e-mail subscriptions, refactor validator (#38502) 2026-04-01 10:04:59 +00:00
David Roetzel 62479b7b0a Remove collections_federation feature flag (#38508) 2026-04-01 08:55:41 +00:00
Matt Jankowski 77507d2c7c Add counting convenience methods on BulkImport (#38465) 2026-03-30 08:52:48 +00:00
Claire 30bb39fe54 Merge commit '8e00f7cc8fab9b447f80a27a972eef78186633ad' into glitch-soc/merge-upstream 2026-03-27 18:15:50 +01:00
Matt Jankowski df9dec741f Add private method for event export filename (#38454) 2026-03-27 15:25:19 +00:00
Claire 2ac493ee8e Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream 2026-03-26 18:23:45 +01:00
Matt Jankowski df479d598f Expand coverage for Tag.search_for method (#38405) 2026-03-26 10:03:17 +00:00
Claire 79958d9442 Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/post_status_service.rb`:
  Upstream added a line adjacent to one that had been modified due to local-only posting.
  Added upstream's change.
- `tsconfig.json`:
  Upstream updated Typescript and updated `tsconfig` in the process by changing paths, where
  glitch-soc had extra paths. Updated as upstream did.
 2026-03-25 21:36:32 +01:00
Claire 572f18c322 Merge commit '664efcf4c3f9713894054fb642a252d8752a4123' into glitch-soc/merge-upstream 2026-03-25 21:09:30 +01:00
Eugen Rochko bcf0718a9a Add email subscriptions (#38163) 2026-03-25 16:25:45 +00:00
Claire 15dbf8040e Add support for multiple keypairs for remote accounts (#38279) 2026-03-25 14:52:12 +00:00
Claire 7583d07d3a Change avatar and account header description limit and expose it in API (#38384) 2026-03-25 12:32:47 +00:00
Claire 3d8e40f7c9 Merge commit 'c72ca33fac1ae1518371f5954ae9487692b17709' into glitch-soc/merge-upstream 2026-03-24 17:05:53 +01:00
David Roetzel 7788281759 Fix adding items without a position (#38368) 2026-03-24 14:43:50 +00:00
Claire 4559e4ed1a Merge commit from fork 2026-03-24 15:44:08 +01:00
Claire 60236bffe6 Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream 2026-03-24 12:13:39 +01:00
Matt Jankowski 9909c743d4 Use matches_uri_prefix in followers hash method (#38332) 2026-03-23 16:11:31 +00:00
Matt Jankowski 5a7c565396 Extract common lists for status/reblog preload/cacheable (#35285) 2026-03-23 15:53:56 +00:00
Matt Jankowski fca25fa1e4 Add tagged_objects to reblog section of status association cache (#38334) 2026-03-23 14:16:52 +00:00
Claire 39d9da3b82 Tag linked FeaturedCollection objects over ActivityPub (#38115) 2026-03-23 13:11:33 +00:00
Claire d48470a1fc Change media description length limit for remote media attachments from 1500 to 10000 characters (#37921) 2026-03-23 10:32:41 +00:00
Claire 469076c357 Merge commit '4e276e4476c81482143440f1f405479e0e4be7eb' into glitch-soc/merge-upstream 2026-03-20 18:03:14 +01:00
Matt Jankowski 24d3c94f4a Use delegate in web/push_subscription model for token value (#38313) 2026-03-20 15:48:28 +00:00
Claire 291f141a02 Merge commit '1ee457f2d37c2b77a7fbce246a7c72ac9f9d3056' into glitch-soc/merge-upstream 2026-03-19 18:14:55 +01:00
Claire 1ee457f2d3 Split invite_users permission into invite_bypass_approval (#38278) 2026-03-19 15:25:54 +00:00
Claire 2b0531914f Merge commit 'd52d0e4dedcc4c8ca12781681debe68f77c007e2' into glitch-soc/merge-upstream 2026-03-18 12:01:23 +01:00
Matt Jankowski b497bb2908 Normalize current_username on account redirect form (#38262) 2026-03-18 09:33:00 +00:00
Claire 3593ddff11 Merge commit 'b320c9e4c901bf99ccbca321bad2ceb2f51de140' into glitch-soc/merge-upstream 2026-03-17 18:58:19 +01:00
David Roetzel 96c93ba835 Only persist a collection item's approval URI once it is verified (#38255) 2026-03-17 15:14:30 +00:00
Claire 73f77c49d8 Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
  Bumped the Mastodon API version as upstream did.
 2026-03-16 18:16:56 +01:00
Matt Jankowski 6b1eac8865 Use to_json call for Relay enable/disable (#38232) 2026-03-16 15:09:28 +00:00
Matt Jankowski 6044219746 Use to_json call for raw event strings (#38215) 2026-03-16 13:55:58 +00:00
Claire 4359098740 Merge commit '9c8be1e72146af247e2b6cdae6e1d37371506569' into glitch-soc/merge-upstream 2026-03-16 12:17:49 +01:00
David Roetzel 12c63a382c Handle adding already approved collection items (#38213) 2026-03-16 10:35:07 +00:00
Claire 5521aac4ab Fix hashtags preceded by non-break spaces not being processed as such (#38212) 2026-03-16 09:39:18 +00:00
David Roetzel c993daa347 Start of handling FeatureRequest activities (#38193) 2026-03-16 09:04:28 +00:00
David Roetzel 2f989c780a Reinstate action logging (#38211) 2026-03-16 08:42:06 +00:00
Matt Jankowski f561014aa8 Make use of email_domain in sign up approval check (#38199) 2026-03-16 08:34:18 +00:00