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
d4e0784182
Fix quote revocation not being streamed ( #35710 )
2025-08-07 08:03:15 +00:00
Claire
e615d2f069
Change quote to be fetched with quoted account rather than random follower ( #35709 )
2025-08-07 08:02:29 +00:00
Claire
53185f5381
Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream
2025-08-04 21:24:47 +02:00
Claire
cb0b608fa7
Ensure quoted user is given access to see the post ( #35665 )
2025-08-04 16:06:59 +00:00
Claire
32791c9745
Accept remote quotes of local quotes according to set policy ( #35629 )
2025-08-04 15:27:46 +00:00
Claire
0153a239db
Avoid nested transactions when fetching quote posts ( #35657 )
2025-08-04 14:34:05 +00:00
Claire
5ed9410de0
Disable ActiveRecord query cache in Create critical path ( #35662 )
2025-08-04 14:15:02 +00:00
Claire
dbab707d64
Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream
2025-08-01 22:11:59 +02:00
Claire
591df1f205
Add support for local quote stamps ( #35626 )
2025-08-01 14:55:25 +00:00
Claire
572a0e128d
Change quote verification to not bypass authorization flow for mentions ( #35528 )
2025-07-31 07:39:53 +00:00
Claire
e53421b548
Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream
...
Conflicts:
- `config/settings.yml`:
Not a real conflict, upstream removed settings that are identical in glitch-soc
but textually adjacent to glitch-soc-only settings.
Removed what upstream removed.
2025-07-30 20:05:45 +02:00
Claire
efc0d237af
Fix synchronous recursive fetching of deeply-nested quoted posts ( #35600 )
2025-07-30 14:39:30 +00:00
Claire
8649681c51
Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
Conflict because upstream added context extensions where glitch-soc had its own.
Added upstream's new context extension while keeping ours.
2025-07-25 21:45:00 +02:00
Claire
5a88b7f683
Add experimental basic quote post authoring ( #35355 )
2025-07-25 12:35:24 +00:00
Claire
aa6d1d4ac1
Merge commit '629bb74451242060298c6fb305c5337002379cc2' into glitch-soc/merge-upstream
2025-06-11 18:55:03 +02:00
Claire
7a7e0ba4cd
Add basic support for remote attachments with multiple media types ( #34996 )
2025-06-10 13:26:29 +00:00
Claire
4b22aa93a2
Merge commit '989ca63b596c9006c5606edd4e66498e29e83489' into glitch-soc/merge-upstream
2025-06-06 12:56:00 +02:00
Claire
989ca63b59
Remove inbound_quotes feature flag ( #34958 )
2025-06-06 08:25:59 +00:00
Claire
2085b0b53a
Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
Not a real conflict, just glitch-soc code textually adjacent to code added
upstream.
2025-06-05 18:02:40 +02:00
Claire
3d474807bf
Change “legacy” non-fast-tracked quote posts to not be displayed as such ( #34945 )
2025-06-05 13:53:57 +00:00
Claire
49e9a1fe4e
Merge commit 'fbe9728f36998d3788e71c56bacc803c857fc422' into glitch-soc/merge-upstream
...
Conflicts:
- `docker-compose.yml`:
Conflict because of different repo names. Updated version.
2025-05-06 16:30:33 +02:00
Claire
79931bf3ae
Merge commit from fork
...
* Check scheme in account and post links
* Harden media attachments
* Client-side mitigation
* Client-side mitigation for media attachments
2025-05-06 15:02:13 +02:00
Claire
8d98d91f33
Merge commit '22e2e7f02b2f25f30abd6a616bc3b0b543b30279' into glitch-soc/merge-upstream
2025-05-06 12:06:51 +02:00
Claire
22e2e7f02b
Fix crash when likes or shares collections are not inlined, for real ( #34619 )
2025-05-06 09:51:42 +00:00
Claire
3e5d78cc5b
Fix crash when likes or shares collections are not inlined ( #34618 )
2025-05-06 07:39:26 +00:00
Claire
d14d7a5379
Merge commit 'aedc5f692144aa36245fe47c277bb5ad4766a335' into glitch-soc/merge-upstream
2025-05-05 20:31:48 +02:00
Claire
cbaba54e9d
Add support for importing embedded self-quotes ( #34584 )
2025-05-05 08:01:16 +00:00
Claire
68bb158c84
Merge commit '8b34daf2541c6afdb5ade19e4531373ef7b05bc0' into glitch-soc/merge-upstream
2025-05-03 18:28:25 +02:00
Claire
3ec3814f8e
Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream
2025-05-03 17:37:26 +02:00
Jonny Saunders
8b34daf254
Fix: Use strings not symbols to access totalItems in interaction collections ( #34594 )
2025-05-03 10:37:06 +00:00
Claire
9ed6a14d45
Add support for ingesting quote policies ( #34479 )
2025-04-28 08:48:27 +00:00
Claire
ae3b7dd28d
Reject incoming QuoteRequest activities ( #34480 )
2025-04-25 23:28:09 +00:00
Claire
ace0a3d61f
Merge commit 'b33f9ea60338a78dde2fb7fe3f083c2ffaafcf1f' into glitch-soc/merge-upstream
2025-04-21 15:22:22 +02:00
Claire
df2611a10f
Add initial support for ingesting and verifying remote quote posts ( #34370 )
2025-04-17 07:45:23 +00:00
Claire
99e3ea232f
Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream
2025-04-04 20:00:24 +02:00
Claire
dd23ba9c83
Refactor local-URI-to-account resolving ( #34349 )
2025-04-02 14:44:09 +00:00
Claire
b330cc21c4
Merge commit 'aff51823752b809c3349698b6be02bfdda7a9010' into glitch-soc/merge-upstream
2025-03-12 19:48:51 +01:00
Claire
966b816382
Refactor ActivityPub::FetchRepliesService and ActivityPub::FetchAllRepliesService ( #34149 )
2025-03-12 11:52:38 +00:00
Claire
fcc5262f60
Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
Upstream tests for changing themes in there, but glitch-soc has
its own place for that.
Updated upstream's change while skipping the theme test.
2025-01-27 18:19:09 +01:00
Matt Jankowski
f73df1f2b0
Fix Style/HashSlice cop violations ( #33720 )
2025-01-24 16:57:55 +00:00
Claire
ab152ebed4
Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream refactored `visibility` handling to a concern, while glitch-soc had
custom code adjacent to some of the changed lines.
Applied upstream's changes.
- `lib/mastodon/version.rb`:
Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
default github repository had been modified.
Applied upstream's changes and updated `config/mastodon.yml` accordingly.
2025-01-14 20:38:32 +01:00
