tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,022 Commits 5 Branches 0 Tags
42ec9a607b78f7d3366e951db08e0064423c4e89
Commit Graph
2664 Commits
Author SHA1 Message Date
Claire 42ec9a607b Merge commit 'c26003af215da7696e2b0dcece7fa695b1be8871' into glitch-soc/merge-upstream 2026-05-18 19:35:08 +02:00
Pia B. 07a05e1edf Add batch remove for collections in reports (#39020) 2026-05-18 14:53:40 +00:00
Claire 808b7a858d Merge commit '8bbde181db0d6d79018fb1754a8296e753d47415' into glitch-soc/merge-upstream 2026-05-13 18:42:04 +02:00
Pia B. 7c05f56fe8 Add batch actions to collections and possibility to report multiple collections (#38991) 2026-05-12 16:13:01 +00:00
Claire 99f0a03dec Merge commit 'b2aa476abbe82e2b49d84c9fb8ef654f95391fd3' into glitch-soc/merge-upstream 2026-05-07 18:26:17 +02:00
Claire b2aa476abb Redirect with interstitial when trying to view a remote collection while logged out (#38941) 2026-05-07 16:04:26 +00:00
Claire 49310aeecf Merge commit '1a2038775c0a999024a615348fcba6240e27b0fa' into glitch-soc/merge-upstream 2026-05-06 21:00:32 +02:00
Pia B. 1a2038775c Add ability to search email blocks by domain (#38923) 2026-05-06 15:54:12 +00:00
David Roetzel f6f45c43a9 Add partial accounts to collections endpoint (#38919) 2026-05-06 15:08:26 +00:00
Matt Jankowski d243ba36ce Add admin area spec for email subscriptions management (#38912) 2026-05-06 08:47:12 +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
Shlee 7c1d6ab114 Role "collection limit" setting missing in params (#38794) 2026-04-23 13:32:12 +00:00
David Roetzel fdb2563abf Use /collections/:id as canonical URL for a collection (#38783) 2026-04-23 07:36:35 +00:00
Claire e0a34e6d89 Merge commit 'b15d234ccb5d004180561c440dd45536d70e67b2' into glitch-soc/merge-upstream 2026-04-17 18:06:10 +02:00
Matt Jankowski 5722b1bbc5 Remove invalid options from recovery codes controller (#38733) 2026-04-17 13:25:39 +00:00
Claire 817291c692 Merge commit '2b93d19d2ca18366b015e3dcde412e67625fe8f5' into glitch-soc/merge-upstream 2026-04-14 18:19:27 +02:00
Claire 63a244fe1a Add /api/v1_alpha/accounts/:id/in_collections to list collections you are in (#38657) 2026-04-13 17:28:28 +00:00
Claire 9177a3e807 Merge commit '02deb0b2381e116b512a826064f6d4008c260cd5' into glitch-soc/merge-upstream 2026-04-13 19:12:08 +02:00
Claire 46af7467e0 Improve error handling when failing to refresh an actor's key (#38555) 2026-04-13 14:49:42 +00:00
Claire 69b70d48c6 Merge commit 'db13dddcf90343574dee320fff7e8bb9bf3707e4' into glitch-soc/merge-upstream 2026-04-07 20:08:57 +02:00
Matt Jankowski 71e6e50846 Simplify media attachment lookup in show/player actions (#38565) 2026-04-07 09:58:37 +00:00
Claire 45bd1ca785 Merge commit 'ffcf87e0234a5529652295d2386a8c9c8e43a7ff' into glitch-soc/merge-upstream 2026-04-02 12:03:44 +02:00
Claire ffcf87e023 Fix refreshing keys from stale actors on signature verification error (#38515) 2026-04-02 09:07:44 +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
Eugen Rochko 93dcca7f12 Add email subscriptions to profiles in web UI (#38487) 2026-04-01 14:24:28 +00:00
Claire db704180b2 Fix signature verification when the key ID is an acct: URI (#38516) 2026-04-01 14:14:53 +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 b321d5d377 Use resources to declare API TOS access endpoints (#38416) 2026-03-26 14:07:06 +00:00
Claire 806e2a993a Fix Webfinger endpoint not handling new AP ID scheme (#38391) 2026-03-26 09:58:47 +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
David Roetzel bcead76410 Only federate accepted collection items (#38385) 2026-03-25 13:04:09 +00:00
Matt Jankowski 5d7682c7dd Extract security_key_options endpoint to standalone controller (#38367) 2026-03-25 10:35:09 +00:00
Claire 60236bffe6 Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream 2026-03-24 12:13:39 +01:00
Matt Jankowski 5a7c565396 Extract common lists for status/reblog preload/cacheable (#35285) 2026-03-23 15:53:56 +00:00
Claire 04bf07a9cf Merge commit 'c37bc5a8a94758e19b2d50db5e7816a96cec5cf4' into glitch-soc/merge-upstream 2026-03-17 18:01:07 +01:00
Matt Jankowski f07e84f9de Rescue JSON::ParserError where already converted (#38244) 2026-03-17 08:57:10 +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 16c41e035b Use JSON.parse in AP inboxes (#38238) 2026-03-16 16:58:13 +00:00
Matt Jankowski 3832030711 Convert Oj.load -> JSON.parse in most places (#38236) 2026-03-16 16:38:19 +00:00
Matt Jankowski 092acbd47b Use to_json call for pins API (#38231) 2026-03-16 15:06:22 +00:00
Matt Jankowski 8ed13bc6f7 Use to_json call for accounts API (#38226) 2026-03-16 14:40:03 +00:00