Claire
17ba99e5de
Merge commit 'd6f2a3ac8d61e0828a17f68a6e9094d0f4662f4c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
Conflict because of glitch-soc's theming change.
Adapted upstream's changes.
- `docker-compose.yml`:
Conflict because of container repo name change.
Adapted upstream's changes.
- `yarn.lock`:
Conflict because of an additional glitch-soc dependency.
Updated the dependencies upstream did.
2025-12-10 18:05:44 +01:00
Claire
7b8a5d42f1
Remove unused time series details from 2025 annual report ( #37187 )
2025-12-10 11:02:24 +00:00
Claire
315f5e5a31
Merge commit '9d81561bb2440c8fb9a75bd05277120aff346b1e' into glitch-soc/merge-upstream
2025-12-09 18:06:56 +01:00
Matt Jankowski
ac71771d98
Fix misc comment typos ( #37183 )
2025-12-09 16:09:01 +00:00
Claire
2f6cdd6d47
Merge commit '1ae3b4672bffbc4aaf26f60c7063d6901239de5d' into glitch-soc/merge-upstream
2025-12-05 20:00:40 +01:00
Echo
007ae588d8
Fix incorrect date for Wrapstodon start ( #37138 )
2025-12-05 14:12:26 +00:00
Claire
9b851616fe
Remove more unused data from 2025 annual reports ( #37134 )
2025-12-05 13:36:37 +00:00
Claire
c8f365fd1d
Merge commit '0dac31dfd588e4cd866f382ed001a9535f06234a' into glitch-soc/merge-upstream
2025-12-04 20:59:54 +01:00
Claire
34aa825e96
Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream
2025-12-04 20:16:21 +01:00
Echo
0dac31dfd5
Create new entrypoint for sharable Wrapstodon ( #37121 )
2025-12-04 15:48:10 +00:00
Claire
88aed3c11a
Fix streamed quoted polls not being hydrated correctly ( #37118 )
2025-12-04 14:10:48 +00:00
Claire
5d84957117
Add shareable wrapstodon links ( #37047 )
2025-12-03 11:00:41 +00:00
Claire
f8422e1fa4
Add API for on-demand generation of annual reports ( #37055 )
2025-12-02 13:37:05 +00:00
Claire
99ff59b7b2
Merge commit '37ccffa95a30772b55e3f18d486d699ee6c5f9e8' into glitch-soc/merge-upstream
2025-11-30 17:47:27 +01:00
Claire
801672e3cb
Add method to quickly test for AnnualReport account eligibility ( #37045 )
2025-11-28 16:19:23 +00:00
Claire
945ef5a8e1
Remove unused data from 2025 annual reports ( #37033 )
2025-11-28 08:58:34 +00:00
Claire
868d45df2f
Merge commit 'ca53195b31ef7eb9205f879e022b09b28efc9314' into glitch-soc/merge-upstream
2025-11-25 18:22:48 +01:00
Claire
204143becc
Increase HTTP read timeout for expensive S3 batch delete operation ( #37004 )
2025-11-25 10:18:34 +00:00
Claire
b76530a7f1
Merge commit '76d8ac3fe680e92d20059c590ccb1cd8f74078c2' into glitch-soc/merge-upstream
2025-11-24 19:08:03 +01:00
Claire
96d5e57351
Revert "Increase HTTP read timeout for expensive S3 batch delete operation ( #36971 )" ( #36996 )
2025-11-24 13:33:37 +00:00
Claire
652ed7ab50
Merge commit '585545d0d5678a6ea4b958af4a3bc6593134d0f6' into glitch-soc/merge-upstream
2025-11-21 19:33:14 +01:00
Claire
a54334b714
Increase HTTP read timeout for expensive S3 batch delete operation ( #36971 )
2025-11-21 08:59:07 +00:00
Claire
dd7d750f5d
Merge commit '21ce99f746e17867df74029d3b2caca45588818d' into glitch-soc/merge-upstream
2025-11-20 18:13:37 +01:00
Claire
a28f1d0110
Fix missing fallback link in CW-only quote posts ( #36963 )
2025-11-20 10:08:36 +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
a7ba4ba446
Merge commit '26e7fe97714d077930621f9111b7eaad2774df65' into glitch-soc/merge-upstream
2025-11-04 20:38:24 +01:00
Matt Jankowski
337f16d33e
Remove unused DomainControlHelper include from SignedRequest ( #35856 )
2025-11-04 15:27:42 +00:00
Claire
6ff4dad89d
Merge commit '055f581ca58b62132c1eff23453031d9df9dbf0e' into glitch-soc/merge-upstream
2025-10-31 18:03:21 +01:00
Joshua Byrd
e5e9f8da93
Fix og:images from The Guardian (and possibly other CDNs that check URL hashes) ( #36139 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2025-10-30 10:57:07 +00:00
Claire
002e592667
Merge commit '51877081b435b38e1c5bd449087279469fa7c667' into glitch-soc/merge-upstream
2025-10-29 12:24:49 +01:00
Claire
e437bb919f
Change display of blocked and muted quoted users ( #36619 )
2025-10-29 09:13:12 +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
5f3f75559f
Merge commit '1dead10312caa0cc7719cb80052af549ddf3e6a1' into glitch-soc/merge-upstream
2025-10-28 20:25:09 +01:00
Claire
8fb524e07f
Add support for Update of converted object types ( #36322 )
2025-10-28 14:05:14 +00:00
Claire
4b42fe6aba
Change API behavior of reblogs wrt. quotes for consistency ( #36559 )
2025-10-28 08:05:23 +00:00
Eugen Rochko
76053fb4a9
Fix hashtags not being picked up when full-width hash sign is used ( #36103 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2025-10-27 17:18:01 +00:00
David Roetzel
402686c76c
Remove http_message_signatures feature flag ( #36610 )
2025-10-27 16:06:44 +00:00
Eugen Rochko
bfcf21e915
Fix vacuums being interrupted by a single batch failure ( #36606 )
2025-10-27 14:22:54 +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
4c0104084d
Merge commit 'c96e28a41d6f3dee898b09ab1b250ac5b5dfd9e4' into glitch-soc/merge-upstream
2025-10-17 18:36:27 +02:00
Claire
c96e28a41d
Change HttpMessageSignature to perform assertions directly on Linzer objects ( #36510 )
2025-10-17 08:41:28 +00: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
af82db5271
Merge commit 'edd7fd98722a0d49ea486aa790a186735e491f35' into glitch-soc/merge-upstream
2025-10-13 18:07:08 +02:00
Eugen Rochko
33f739da44
Fix permalink redirects continuing to work for suspended accounts ( #36453 )
2025-10-13 15:18:01 +00:00
Claire
490c89a5a9
Merge commit 'c858fc77ef194be0217fd98eae84efd261dba798' into glitch-soc/merge-upstream
2025-10-09 17:59:13 +02:00
