tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,227 Commits 5 Branches 0 Tags
Commit Graph

281 Commits

Author SHA1 Message Date
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
Claire
cdf721a273
Fix remote statuses with large media descriptions being rejected (#39135) 2026-05-21 15:46:10 +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
44394878a4 Merge commit 'c6facd27ed191177afb003640b8ee7d0742c7f63' into glitch-soc/merge-upstream 2026-04-30 19:00:48 +02:00
David Roetzel
1f1653e039
Remove rejected and revoked collection items (#38792) 2026-04-28 11:10:25 +00:00
David Roetzel
d5f8b08d69
Add collections to Flag activities (#38817) 2026-04-28 11:09:43 +00:00
Claire
b9014ec220 Merge commit '66fdd3ae65e13349fbc0b2818d4b91a389075553' into glitch-soc/main 2026-04-08 19:32:32 +02:00
Claire
39c70649ca
Add added_to_collection and collection_updated notification types (#38491) 2026-04-08 12:56:07 +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
David Roetzel
62479b7b0a
Remove collections_federation feature flag (#38508) 2026-04-01 08:55:41 +00:00
Claire
2ac493ee8e Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream 2026-03-26 18:23:45 +01:00
David Roetzel
abd29109c5
Fetch unknown collection when handling FeatureRequest activity (#38413) 2026-03-26 13:30:27 +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
15dbf8040e
Add support for multiple keypairs for remote accounts (#38279) 2026-03-25 14:52:12 +00:00
David Roetzel
c9eefd0ae7
Persist activity URI of a FeatureRequest (#38393) 2026-03-25 14:32:15 +00:00
Claire
60236bffe6 Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream 2026-03-24 12:13:39 +01:00
David Roetzel
e4e584a99e
Handle Update of a FeaturedCollection (#38337) 2026-03-23 15:57:02 +00:00
Claire
39d9da3b82
Tag linked FeaturedCollection objects over ActivityPub (#38115) 2026-03-23 13:11:33 +00:00
Claire
469076c357 Merge commit '4e276e4476c81482143440f1f405479e0e4be7eb' into glitch-soc/merge-upstream 2026-03-20 18:03:14 +01:00
David Roetzel
ccf6f16f05
Handle Delete of a FeatureAuthorization (#38292) 2026-03-20 09:51:20 +00:00
Claire
3593ddff11 Merge commit 'b320c9e4c901bf99ccbca321bad2ceb2f51de140' into glitch-soc/merge-upstream 2026-03-17 18:58:19 +01:00
Matt Jankowski
b320c9e4c9
Prefer to_json over JSON.generate when simple strings in stub request (#38258) 2026-03-17 16:10:54 +00:00
David Roetzel
f3035a8e51
Handle Reject of a FeatureRequest (#38256) 2026-03-17 15:59:51 +00:00
Matt Jankowski
b9d25bde3e
Convert mix of JSON.parse and JSON.load_file (#38242) 2026-03-17 13:27:57 +00:00
David Roetzel
5f36c482d2
Handle Accept of a FeatureRequest (#38251) 2026-03-17 11:45:00 +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
8792d6f840
Use JSON.generate in trivial string/hash conversion in specs (#38224) 2026-03-16 15:16:43 +00:00
Matt Jankowski
70230c632c
Use to_json call for AP::Follow reject path (#38227) 2026-03-16 14:40:51 +00:00
Claire
4359098740 Merge commit '9c8be1e72146af247e2b6cdae6e1d37371506569' into glitch-soc/merge-upstream 2026-03-16 12:17:49 +01:00
David Roetzel
c993daa347
Start of handling FeatureRequest activities (#38193) 2026-03-16 09:04:28 +00:00
Claire
3833eadfbf Merge commit 'adede83c7c9a943cf9954fe865becf6a0c2d2280' into glitch-soc/merge-upstream 2026-03-12 18:48:32 +01:00
David Roetzel
eeed483518
Handle Remove of an individual collection item (#38170) 2026-03-12 11:11:39 +00:00
David Roetzel
353c8b2abf
Handle Remove activity on featuredCollections (#38169) 2026-03-12 10:37:53 +00:00
David Roetzel
94aa5d7c9e
Handle Add activity to featuredCollections (#38167) 2026-03-12 10:14:22 +00:00
Claire
8d717ab161 Merge commit '1d46558e8d949860acc4f3a86516b9989bd74f79' into glitch-soc/merge-upstream 
Conflicts:
- `spec/controllers/application_controller_spec.rb`:
  Upstream moved specs that were textually-adjacent to glitch-soc ones.
  Kept the glitch-soc ones.
 2026-03-09 18:14:15 +01:00
David Roetzel
1d46558e8d
Ingestion of remote collection items (#38106) 2026-03-09 14:59:57 +00:00
Claire
95aaefe083 Merge commit '562ea656f495f0619e393b7d93bd07c5abd28e5a' into glitch-soc/merge-upstream 2026-01-21 22:04:02 +01:00
Claire
e7c6600d83
Fix cross-server conversation tracking (#37559) 2026-01-21 12:02:41 +00:00
Claire
f65e6a5029 Merge commit '10de65e41c3b01bd938f97fdb60fc96c26673966' into glitch-soc/merge-upstream 2026-01-14 20:31:42 +01:00
David Roetzel
c218849204
Add collection endpoint (#37468) 2026-01-14 10:08:29 +00:00
Claire
478462ab25 Merge commit 'ed17b3a7ec52c0421ae2483a8e08431316f08b1c' into glitch-soc/merge-upstream 2026-01-12 21:00:14 +01:00
David Roetzel
a9cfddf28e
AP/AS serialization of Collections (#37434) 2026-01-12 08:39:25 +00:00
Claire
d7254ecec4 Merge commit 'a4b8b9fe98c677f718e4b2c1ffe1755d58e7f8d7' into glitch-soc/merge-upstream 2026-01-10 13:12:36 +01:00
David Roetzel
aa2110025e
Fix URI generation for reblogs by accounts with numerical AP ids (#37415) 2026-01-07 15:39:22 +00:00
Claire
04f4725249 Merge commit '0231b6d350d6027fa822f286732405b573d634e8' into glitch-soc/merge-upstream 2025-12-19 18:43:09 +01:00
David Roetzel
4e63958914
Federated "featureable in collections" preference (#37298) 2025-12-19 13:44:27 +00:00
Claire
84feffd6e6 Merge commit '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added a method right next to glitch-soc-only methods.
  Added upstream's method.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed a line right next to a glitch-soc addition.
  Changed the code as upstream did.
 2025-12-17 18:27:14 +01:00