tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,676 Commits 5 Branches 0 Tags
main
Commit Graph
621 Commits
Author SHA1 Message Date
Tarrien d8f7558302 Cleaning up. 2026-09-18 04:40:50 -04: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
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 6aca68e185 Merge commit 'e2b7096bd3f93afcf4d6b3e7ffb9ccdb417a9def' into glitch-soc/merge-4.6 2026-06-16 21:49:17 +02:00
diondiondion 80f9422ef2 [Accessibility] Return alt text for default server thumbnail (#39439) 2026-06-15 17:01:10 +02: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
Evan Prodromou 9c493c20b9 Add policy to filter notifications from bots (#38494) (#38809) 2026-06-09 12:28:53 +00: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 487c814eb9 Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Glitch-soc allows a wider range of HTML than upstream.
  Upstream added `:all => %w(lang)`, which was not supported by glitch-soc,
  added it there too.
 2026-05-22 19:43:42 +02:00
David Roetzel dee85c6df9 Only preload accounts in Collections when needed (#39143) 2026-05-22 10:11:41 +00:00
David Roetzel e18ca373eb Revert "Add partial accounts to collections endpoint (#38919)" (#39128) 2026-05-21 13:45:09 +00:00
Claire 49310aeecf Merge commit '1a2038775c0a999024a615348fcba6240e27b0fa' into glitch-soc/merge-upstream 2026-05-06 21:00:32 +02:00
David Roetzel f6f45c43a9 Add partial accounts to collections endpoint (#38919) 2026-05-06 15:08:26 +00:00
David Roetzel 07ce066d68 Move PartialAccountSerializer to the top-level (#38916) 2026-05-06 09:35:07 +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
Claire 5b395774c0 Add fallback attributes to notifications for new and infrequent notifications (#38832) 2026-04-29 15:53:29 +00:00
Claire b3bae7e78f Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Upstream added a new setting textually adjacent to ones modified by glitch-soc's.
  Added upstream's new setting.
 2026-04-25 09:20:39 +02:00
diondiondion a217b633b7 Allow defining alt text for server thumbnail (#38796) 2026-04-23 17:46:50 +00:00
Claire b6abf7a69f Merge commit 'c4eec632b92c800ae38dba111c4c76e63bb1c0de' into glitch-soc/merge-upstream 2026-04-22 20:24:21 +02:00
David Roetzel 1cae543e8f Add per-user maximum number of collections (#38769) 2026-04-22 12:34:08 +00:00
Claire e0a34e6d89 Merge commit 'b15d234ccb5d004180561c440dd45536d70e67b2' into glitch-soc/merge-upstream 2026-04-17 18:06:10 +02:00
David Roetzel b846f88e16 Improve collection item behavior in REST API (#38732) 2026-04-17 13:28:39 +00:00
Claire fc1ba93cdc Refactor featured collections URL code (#38709) 2026-04-16 16:00:13 +00:00
David Roetzel e711f9d492 Federate featured item creation date (#38713) 2026-04-16 15:44:50 +00:00
David Roetzel 961acaf202 Include collection url in API responses (#38708) 2026-04-16 10:09:39 +00:00
Claire 1eac058989 Merge commit '73fc8d34d98a80cfb32d3c7c5dc4794fad5470d5' into glitch-soc/merge-upstream 2026-04-11 13:22:19 +02:00
Claire 8124d44ee1 Fix local collection uri not being serialized in REST API responses (#38645) 2026-04-10 15:01:28 +00:00
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
Claire 39c70649ca Add added_to_collection and collection_updated notification types (#38491) 2026-04-08 12:56:07 +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 2ac493ee8e Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream 2026-03-26 18:23:45 +01:00
Claire 3ebd3952a1 Add formatted_note and formatted_fields to GET /api/v1/profile (#38339) 2026-03-26 10:32:30 +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 7583d07d3a Change avatar and account header description limit and expose it in API (#38384) 2026-03-25 12:32:47 +00:00
David Roetzel a3bdcc71e7 Fix serialization when an account is missing (#38370) 2026-03-24 16:42:57 +00:00
Claire 60236bffe6 Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream 2026-03-24 12:13:39 +01:00
Claire 39d9da3b82 Tag linked FeaturedCollection objects over ActivityPub (#38115) 2026-03-23 13:11:33 +00:00
Claire b5222606e3 Merge commit '811575a10903cada549580979cc809ca98ad570c' into glitch-soc/merge-upstream 2026-03-11 18:50:59 +01:00
David Roetzel 3091e2e525 Ingestion of remote collections (#38144) 2026-03-11 14:29:00 +00:00
Claire 5fdcac60b9 Merge commit '64629eadb71afab79a741b016dc56a8bdf1d46f2' into glitch-soc/merge-upstream 2026-03-10 18:04:32 +01:00
David Roetzel 3b6d94ce62 Add column for html descriptions of collections (#38124) 2026-03-10 14:54:38 +00:00
Claire c96db36396 Merge commit '8a0261c51caf76b6d12e3801da471759c31c9608' into glitch-soc/merge-upstream 2026-03-04 12:40:16 +01:00