Kouhai
7c7355a964
th: Merge remote-tracking branch 'glitch/main' ( d033fab0ed)
2023-08-26 22:00:56 -07:00
Claire
2a8e55b0ee
Merge commit '032dfdfb70963ec9dbdad8f40b5056e16680ec86' into glitch-soc/merge-upstream
...
Conflicts:
- `Vagrantfile`:
Upstream bumped a bunch of values, including one that was already bumped by
glitch-soc.
Took upstream's version.
- `lib/paperclip/transcoder.rb`:
glitch-soc already had a partial fix for this.
Took upstream's version.
2023-08-24 21:46:17 +02:00
Robert R George
a4bc8b58f9
Add support for federating memorial attribute ( #26583 )
2023-08-23 08:27:24 +02:00
Claire
b6ca020d02
Merge commit 'bd7f631918b3acbecf0c385008389ba22c945dbe' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some settings, where glitch-soc has an extra setting.
Ported upstream changes, moving the same settings as them.
2023-08-22 18:31:28 +02:00
Claire
3c50a91087
Add support for indexable attribute on remote actors ( #26485 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-08-14 18:54:51 +02:00
Kouhai
f8028d190e
th: Merge remote-tracking branch 'glitch/main'
2023-08-12 18:54:16 -07:00
Claire
68d080177a
Merge commit 'eb1139fd42203ad966810f7f7ed6b55949ac7e8a' into glitch-soc/merge-upstream
2023-07-30 15:54:34 +02:00
Matt Jankowski
430f87e554
Reformat large hash in ContextHelper module ( #26180 )
2023-07-26 09:46:11 +02:00
Ariadne Conill
b25b30bfd8
th: activitypub: fix context extensions for quote_uri
2022-12-26 04:26:52 +00:00
Ariadne Conill
9f9ac9cf3e
th: activitypub: switch to fedibird:quoteUri
2022-12-26 03:18:03 +00:00
Ariadne Conill
21f3328744
th: context helper: add quoteUrl as as:quoteUrl, even though its wrong
2022-12-25 03:25:22 +00:00
Claire
b891d09d2f
Compact JSON-LD signed incoming activities ( #17426 )
...
Co-authored-by: Puck Meerburg <puck@puck.moe>
2022-02-03 14:07:29 +01:00
Puck Meerburg
9d92e9204f
Compact JSON-LD signed incoming activities
2022-02-02 16:13:11 +01:00
