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
79169408b0
Fix tests on glitch-soc
2025-10-28 20:39:10 +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
Renaud Chaput
779a1f8448
Add a new setting to choose the server landing page ( #36588 )
2025-10-27 10:16:59 +00:00
Matt Jankowski
2640cf5317
Update stoplight to version 5.4.0 ( #36581 )
2025-10-27 09:38:01 +00:00
Claire
deed31ba8c
Merge commit '1ba579b0a181fbfff514ef32b50179d2ab1fc342' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/public_feed.rb`:
Minor conflict due to glitch-soc's local-only posts.
Adopted upstream's changes.
- `spec/models/tag_feed_spec.rb`:
Minor conflict due to glitch-soc's local-only posts.
Adopted upstream's changes.
2025-10-23 18:33:52 +02:00
Claire
6b2051b7b3
Fix bookmarks export when one bookmarked status is soft-deleted ( #36576 )
2025-10-23 11:51:23 +00:00
Claire
7774cd6670
Add disabled setting for live and topic feeds, as well as user permission to bypass that ( #36563 )
2025-10-23 08:37:05 +00:00
Claire
209434cb1d
Merge commit '17eb1a7e668dbba6e79612395b99407e8e8de6b9' into glitch-soc/merge-upstream
2025-10-21 18:15:56 +02:00
Claire
17eb1a7e66
Fix scheduled quote posts being posted as non-quote posts ( #36550 )
2025-10-21 16:00:40 +00:00
Claire
aba30a85be
Fix value of quote_approval_policy and quoted_status_id in ScheduledStatus serializer ( #36549 )
2025-10-21 16:00:30 +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
Matt Jankowski
2eccd7b53c
Specs for validation error in API responses ( #36507 )
2025-10-21 07:33:30 +00:00
Claire
9080083263
Merge commit '341ea7f462c68ebe2fc5ee15dc7c58aa5775d5a0' into glitch-soc/merge-upstream
2025-10-20 21:37:50 +02:00
Ben Sheldon [he/him]
843c43c97a
Replace ThreadingHelper wait loop with functional CyclicBarrier ( #36508 )
2025-10-20 10:10:43 +00:00
Claire
ef413ef713
Merge commit '5a8ab0a3e62a8825e28bb74c1760ba6488d20c97' into glitch-soc/merge-upstream
2025-10-15 16:35:37 +02:00
Claire
fab0dd0bcf
Change redirection for denied registration from web app to sign-in page with error message ( #36384 )
2025-10-15 11:37:22 +00:00
Claire
264d068d8d
Change new accounts to use new ActivityPub numeric ID scheme ( #36365 )
2025-10-14 16:36:55 +00:00
Claire
302e3fe8be
Merge commit '50743cc35be19deae9356bd21f1143e3a9b4fbb8' into glitch-soc/merge-upstream
2025-10-14 18:01:40 +02:00
Claire
fd516347cb
Fix deletion of posts quoting soft-deleted local post ( #36461 )
2025-10-14 15:15:38 +00:00
Claire
44ecc4b1e3
Fix moderation warning e-mails that include posts ( #36462 )
2025-10-14 11:48:51 +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
be762da45f
Merge commit '254fff93ca3604438a94a453bedfe6f499e2cd66' into glitch-soc/merge-upstream
2025-10-13 16:51:40 +02:00
Claire
2971ac9863
Fix streaming still being authorized for suspended accounts ( #36448 )
2025-10-13 13:35:44 +00:00
Claire
8921494571
Merge commit '7e98fa9b476fdaed235519f1d527eb956004ba0c' into glitch-soc/merge-upstream
2025-10-13 14:26:11 +02:00
Emelia Smith
7e98fa9b47
Merge commit from fork
...
* Require read, read:statuses or read:notifications scope to access streaming APIs
* Add additional tests for scope-based channel access
We were missing tests in the affirmative for subscribing to the user:notification channel, this adds them
2025-10-13 14:20:57 +02:00
Emelia Smith
24dcb18013
Merge commit from fork
...
* Ensure tootctl revokes sessions, access tokens and web push subscriptions
* Fix test coverage
2025-10-13 14:20:23 +02:00
Emelia Smith
8d09e4ef23
Merge commit from fork
...
* Streaming: Ensure disabled users cannot connect to streaming
* Streaming: Disconnect when the user is disabled
2025-10-13 14:19:14 +02: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
Matt Jankowski
0152659245
Use tag filter for pending tag count on admin dashboard ( #36404 )
2025-10-09 08:08:29 +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
Renaud Chaput
e8dab026bb
Fix quote mailer preview to use the latest quote notification ( #36373 )
2025-10-07 10:19:53 +00:00
Claire
73a625c284
Merge commit '4dc21d7afdb485402555908bc72d071f8b25ec36' into glitch-soc/merge-upstream
...
Conflicts:
- `config/settings.yml`:
Upstream replaced a setting with 4 new ones, while glitch-soc had modified
the default value of that setting.
Removed the old setting and added the new settings, but with defaults
matching glitch-soc's previous behavior.
2025-10-06 19:24:16 +02:00
Claire
2d2c525097
Split timeline_preview setting into more granular settings ( #36338 )
2025-10-06 08:34:05 +00:00
Claire
17e0c745c6
Merge commit 'f69ca085dbfca2253404574dcdc4dc6c2aaa35c0' into glitch-soc/merge-upstream
2025-10-01 19:13:18 +02:00
Claire
cbb94bdfde
Merge commit '45219dbf64805746a472e50bb7c9bcb52972ab2a' into glitch-soc/merge-upstream
2025-09-30 18:06:45 +02:00
Claire
5af40ff960
Fix some routes for numeric AP identifiers ( #36304 )
2025-09-30 15:09:59 +00:00
Claire
589af7a1cc
Change GET /api/v1/statuses/:id/quotes to allow listing quotes to other people's posts ( #36291 )
2025-09-30 09:56:03 +00:00
Claire
45219dbf64
Fix spurious notification of local boosters and quoters when updating quote policy ( #36299 )
2025-09-30 09:40:58 +00:00
Emelia Smith
5b97f25a15
Add integration tests for mastodon-streaming ( #36025 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
Co-authored-by: David Roetzel <david@roetzel.de >
2025-09-30 07:27:09 +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
