Claire
e9793971b3
Merge commit 'ad77ee7f8ba6aa25ee36e3e21c38d9bbc252b097' into glitch-soc/merge-upstream
2026-01-19 18:01:57 +01:00
Claire
220115757d
Fix potential duplicate handling of quote accept/reject/delete ( #37537 )
2026-01-19 13:47:27 +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
Joshua Rogers
b35b3a8bcc
Fix arg order for non_matching_uri_hosts? call in QuoteRequest ( #37425 )
2026-01-09 16:21:05 +00:00
Joshua Rogers
48ce49260d
Fix thread-unsafe ActivityPub activity dispatch ( #37423 )
2026-01-09 16:20:59 +00: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
David Roetzel
5e8b8f9c23
Extract interaction policy class ( #37277 )
2025-12-17 10:12:43 +00:00
Claire
9525134c28
Merge commit '7e7f63a2efc83edd7c59a12e55eaab9509a4c15b' into glitch-soc/merge-upstream
2025-11-12 18:11:41 +01:00
Claire
ed3710e58f
Fix Update importing old previously-unknown activities and treating them as recent ones ( #36848 )
2025-11-12 16:09:00 +00:00
Claire
58b29be439
Merge commit '58b3fc03796dbde54dbba9a4c554c2d8d24f81fd' into glitch-soc/merge-upstream
2025-11-06 12:35:04 +01:00
Oneric
c0c6f5ea32
Fix Accept headers when fetching AP objects to match spec ( #30354 )
2025-11-05 13:32:29 +00:00
Claire
48ec31bec8
Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream changed stuff too close to glitch-soc's theming system changes.
Applied upstream's changes.
- `streaming/index.js`:
Upstream refactored a bunch of stuff where our code was different due to
local-only posts.
Applied upstream's changes while taking care of local-only posts.
2025-10-28 22:10:12 +01:00
Claire
8fb524e07f
Add support for Update of converted object types ( #36322 )
2025-10-28 14:05:14 +00:00
Claire
5674100f0b
Merge commit '118ff13bd028cfb19370a12edb9307ea96007ad7' into glitch-soc/merge-upstream
2025-10-21 15:57:43 +02:00
Claire
405a49df44
Merge commit from fork
...
* Refuse granting quote authorization for reblogs
* Add validation to reject quotes of reblogs
* Do not process quotes of reblogs as potentially valid quotes
* Refuse to serve quoted reblogs over REST API
2025-10-21 15:00:28 +02:00
Claire
302e3fe8be
Merge commit '50743cc35be19deae9356bd21f1143e3a9b4fbb8' into glitch-soc/merge-upstream
2025-10-14 18:01:40 +02:00
Claire
50743cc35b
Fix forwarder being called with nil status when quote post is soft-deleted ( #36463 )
2025-10-14 15:15:45 +00:00
Claire
490c89a5a9
Merge commit 'c858fc77ef194be0217fd98eae84efd261dba798' into glitch-soc/merge-upstream
2025-10-09 17:59:13 +02:00
Claire
d4a4a7177a
Fix crash when serializing quotes of deleted posts for ActivityPub ( #36381 )
2025-10-09 13:52:38 +00:00
Claire
f800057008
Merge commit 'b8444d9bb7885d75112a3cae74b6a5c711c7d547' into glitch-soc/merge-upstream
2025-10-08 18:07:04 +02:00
Claire
0be0a8898a
Fix Update/Delete of quoted status not being forwarded to quoters's followers ( #36390 )
2025-10-08 12:56:32 +00:00
Claire
987f1e897b
Fix JSON payload being potentially mutated when processing interaction policies ( #36392 )
2025-10-08 12:31:51 +00:00
Claire
17e0c745c6
Merge commit 'f69ca085dbfca2253404574dcdc4dc6c2aaa35c0' into glitch-soc/merge-upstream
2025-10-01 19:13:18 +02:00
Claire
3ee1378932
Fix approval for remote quotes of local posts not being streamed to local users ( #36317 )
2025-10-01 13:51:43 +00:00
Claire
b6c53c1129
Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
Upstream refactored a part of the code where glitch-soc has changed the code
to potentially hide followers count.
Adapt upstream's changes.
2025-09-29 18:41:46 +02:00
Claire
150f0fcba5
Add support for numeric-based URIs for local accounts ( #32724 )
2025-09-29 12:05:48 +00:00
Claire
b15b07606c
Merge commit '28be5a199f685b9fb26742c4d78ddca53df05d57' into glitch-soc/merge-upstream
2025-09-24 18:26:13 +02:00
Claire
e1f7847b64
Remove the outgoing_quotes feature flag, making the feature unconditional ( #36130 )
2025-09-24 08:58:08 +00:00
Claire
880e662a60
Merge commit '854aaec6fe69df02e6d850cb90eef37032b4d72f' into glitch-soc/merge-upstream
2025-09-19 18:18:56 +02:00
Claire
b6bc42aaa6
Fix getting Create and Update out of order ( #36176 )
2025-09-19 08:45:13 +00:00
Claire
cc52833296
Merge commit '38fa0102c111f1c0cff5a42eba6882ffae4ca109' into glitch-soc/merge-upstream
2025-09-15 18:39:09 +02:00
Claire
e4bb0fc43a
Add server-side support for handling posts with a quote policy allowing followers to quote ( #36127 )
2025-09-15 15:03:44 +00:00
Claire
5da295fa4d
Merge commit '06803422da3794538cd9cd5c7ccd61a0694ef921' into glitch-soc/merge-upstream
2025-09-13 11:12:22 +02:00
Claire
82b26603fe
Fix quote posts with CW and no text being rejected ( #36095 )
2025-09-12 13:10:31 +00:00
Claire
9f97df84da
Merge commit '45a996f12b04f88e0774bc6d6b52452ce39b612f' into glitch-soc/merge-upstream
2025-09-11 21:20:15 +02:00
Claire
e35dfbfdef
Fix accpeted quotes sometimes not generating notifications ( #36087 )
2025-09-11 12:58:25 +00:00
Claire
06f45a2046
Merge commit 'eb118d85238da8d0583868abab2756bb329742ba' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated dependencies textually adjacent to glitch-soc-only ones.
Updated them as upstream did.
2025-09-10 18:11:12 +02:00
Claire
e1dc960219
Rework FEP-7888 implementation ( #36064 )
2025-09-09 18:27:30 +00:00
Jesse Karmani
65b4a0a6f1
Implement FEP 7888: Part 1 - publish conversation context ( #35959 )
2025-09-05 19:28:29 +00:00
Claire
6abe6cdef5
Merge commit '40242fafee83cf9a6bcb2d0ac1e228827969402f' into glitch-soc/merge-upstream
2025-08-29 18:21:28 +02:00
Claire
4fa203e69e
Rename unknown quote policy value to unsupported_policy ( #35955 )
2025-08-29 13:50:37 +00:00
Claire
e68de292b4
Merge commit 'a485f97d21c3fb7da927e8fd239b301a590ee9b8' into glitch-soc/merge-upstream
2025-08-07 18:16:54 +02:00
Claire
836a2bfee0
Fix handling of inlined instrument in incoming QuoteRequest ( #35714 )
2025-08-07 12:52:29 +00:00
Claire
David Roetzel
Joshua Rogers
Oneric
Jesse Karmani