Claire
2ac493ee8e
Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream
2026-03-26 18:23:45 +01:00
Claire
e81a4e258c
Add support for FEP-2c59 ( #38239 )
2026-03-26 13:33:16 +00: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
David Roetzel
2884abacef
Fix item count ( #38402 )
2026-03-25 16:31:04 +00:00
Eugen Rochko
bcf0718a9a
Add email subscriptions ( #38163 )
2026-03-25 16:25:45 +00:00
David Roetzel
bcead76410
Only federate accepted collection items ( #38385 )
2026-03-25 13:04:09 +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
ca08c040b0
Federate new profile settings ( #38314 )
2026-03-24 09:20:17 +00:00
Claire
39d9da3b82
Tag linked FeaturedCollection objects over ActivityPub ( #38115 )
2026-03-23 13:11:33 +00:00
Claire
208b556c18
Merge commit '377952703cf70f14008cc7938479558d8cca9903' into glitch-soc/merge-upstream
2026-03-12 19:03:08 +01:00
David Roetzel
377952703c
Add serializers for Accept+Reject of feature requests ( #38177 )
2026-03-12 15:46:36 +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
Eugen Rochko
69b1f60f4e
Add support for FEP-3b86 (Activity Intents) ( #38120 )
2026-03-10 10:21:24 +00:00
Claire
c96db36396
Merge commit '8a0261c51caf76b6d12e3801da471759c31c9608' into glitch-soc/merge-upstream
2026-03-04 12:40:16 +01:00
Claire
8a0261c51c
Add missing_attribution boolean to preview cards ( #38043 )
2026-03-04 11:18:37 +00:00
Claire
799bd69189
Merge commit '2f657019201d73c9d86d1ece339e66e72954f0eb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
Upstream refactored a line adjacent to a glitch-soc modified line.
Ported upstream changes.
2026-03-02 12:19:02 +01:00
David Roetzel
2f65701920
Add service to revoke inclusion in a Collection ( #38026 )
2026-03-02 10:16:41 +00:00
Claire
0e1ea3110e
Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/mastodon/version.rb`:
Upstream bumped the mastodon API version, glitch-soc has a change on an adjacent
line adding a glitch API version.
2026-02-27 21:25:37 +01:00
David Roetzel
6b88dd4923
Issue FeatureAuthorizations ( #38004 )
2026-02-27 11:00:21 +00:00
Claire
dc27eccc8e
Merge commit 'bca57020a04c552a3c91912a0e0b69ddafaad06a' into glitch-soc/merge-upstream
2026-02-26 18:27:02 +01:00
Claire
9c4d11f927
Add featured_tags to GET /api/v1/profile ( #37932 )
2026-02-26 16:18:42 +00:00
David Roetzel
b09e63da87
Federate activity when remote account is added to a Collection ( #37992 )
2026-02-26 15:11:02 +00:00
Claire
951a42f491
Add max_note_length and max_display_name_length to configuration.accounts in Instance entity ( #37991 )
2026-02-26 14:58:07 +00:00
Echo
d18a47b6a7
Profile editing: Utilize new API ( #37990 )
2026-02-26 13:55:10 +00:00
Claire
85f72a3940
Merge commit '6ba6285a73c3a8b281123814d45f534e3bcebb96' into glitch-soc/merge-upstream
2026-02-20 21:08:06 +01:00
Claire
cc1e65dcec
Add GET /api/v1/profile ( #37912 )
2026-02-20 10:16:04 +00:00
Claire
b041869887
Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream
2026-02-18 18:40:03 +01:00
Claire
bd64ca2583
Add new profile settings ( #37890 )
2026-02-18 13:18:44 +00:00
Claire
ddc7df2064
Merge commit '6c3bd944f8890e1a349bd06e9585cb5ec25507e6' into glitch-soc/merge-upstream
2026-02-13 13:03:51 +01:00
David Roetzel
6c3bd944f8
Allow reporting (local) Collections ( #37848 )
2026-02-13 11:11:44 +00:00
Claire
ab9aa25cd3
Fix delete & redraft of pending posts ( #37839 )
2026-02-13 10:32:16 +00:00
Claire
e451416d90
Merge commit 'c44cc1f5c3bafb49a324f8f72a42a91d09eecfe3' into glitch-soc/merge-upstream
2026-02-12 18:00:45 +01:00
David Roetzel
f57167c61a
Add ID/URI to collection items ( #37842 )
2026-02-12 15:31:45 +00:00
David Roetzel
37d859db29
Federate deletion of collection item ( #37837 )
2026-02-12 10:39:13 +00:00
Claire
2373c5a132
Merge commit 'ca9966ce2ff79dcac90b2feced65fa991534d53e' into glitch-soc/merge-upstream
2026-02-11 20:26:56 +01:00
David Roetzel
3e1127d27b
Federate Add when item is added to Collection ( #37823 )
2026-02-11 13:52:29 +00:00
Claire
1b00b92772
Merge commit '2774e0fbfa045e883ec94e873e657e9e8fefa98b' into glitch-soc/merge-upstream
2026-02-10 12:03:53 +01:00
David Roetzel
03f73377d9
Federate updates to collections ( #37790 )
2026-02-10 10:08:55 +00:00
Claire
8f58c42ca3
Merge commit '2e30044a374811bc94fd62a8159cb2c9ffe18a4d' into glitch-soc/merge-upstream
2026-02-06 22:45:55 +01:00
Echo
7a4945c0d3
Show mute end date in badge ( #37747 )
2026-02-05 20:01:28 +00:00
Claire
59e02a628d
Merge commit 'f652c54c3334890176331f62150559a96eeb41ae' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/backup_service.rb`:
Upstream refactored activity serialization while glitch-soc passed an extra argument.
Followed upstream's refactor, keeping our extra argument.
2026-02-05 12:43:12 +01:00
David Roetzel
9cd94168b3
Federate Remove when collection is deleted ( #37741 )
2026-02-05 10:33:39 +00:00
David Roetzel
73206856c5
Refactor activity serialization ( #37678 )
2026-02-05 09:39:27 +00:00
