Claire
e0d7230f97
Merge commit 'c87b05282909383353a9561e97b9f18a2db0766d' into glitch-soc/merge-upstream
2025-11-14 18:19:00 +01:00
Matt Jankowski
f8ffb85566
Use date attribute for date of birth ( #36039 )
2025-11-14 15:17:53 +00:00
Claire
a7ba4ba446
Merge commit '26e7fe97714d077930621f9111b7eaad2774df65' into glitch-soc/merge-upstream
2025-11-04 20:38:24 +01:00
Claire
b5c550ff0b
Remove option to disable access to local topic feeds for logged-in users ( #36703 )
2025-11-04 10:37:43 +00:00
Claire
d04e6ec597
Remove glitch-soc system emoji font option now that it's superseded by upstream
2025-10-28 22:57:31 +01: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
Renaud Chaput
795aaa14bf
Remove environment variables to config Fetch All Replies behaviour ( #36627 )
2025-10-28 15:58:18 +00:00
Claire
b01d21c4d4
Hashtag fixes ( #36625 )
2025-10-28 14:26:08 +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
Renaud Chaput
779a1f8448
Add a new setting to choose the server landing page ( #36588 )
2025-10-27 10:16:59 +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
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
22e3c0e745
Merge commit '612771de465da60dbd58790adc6b1556a7fa739b' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a setting adjacent to a glitch-soc-only setting.
Added upstream's setting while keeping ours.
- `app/serializers/initial_state_serializer.rb`:
Upstream added a setting adjacent to a glitch-soc-only setting.
Added upstream's setting while keeping ours.
2025-10-17 19:00:18 +02:00
diondiondion
6dad80eb8c
Add new "quick boosting" setting ( #36516 )
2025-10-17 13:02:47 +00:00
Claire
ef413ef713
Merge commit '5a8ab0a3e62a8825e28bb74c1760ba6488d20c97' into glitch-soc/merge-upstream
2025-10-15 16:35:37 +02:00
Claire
264d068d8d
Change new accounts to use new ActivityPub numeric ID scheme ( #36365 )
2025-10-14 16:36:55 +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
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
ee88f8550c
Merge commit '0219b7cad7d9ef800f82cc561571b70da040433f' into glitch-soc/merge-upstream
2025-10-10 19:01:35 +02:00
Emelia Smith
81350c7cfb
Add support for displaying link previews for Admin UI ( #35958 )
2025-10-10 08:43:48 +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
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
f03d1bb21f
Add numeric_ap_ids feature flag to switch new accounts to numeric AP identifiers ( #36316 )
2025-10-01 13:09:56 +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
8fad4926c5
Merge commit '1571514e49ec02a57c050612b3bca856f54933fb' into glitch-soc/merge-upstream
2025-09-27 21:29:19 +02:00
Matt Jankowski
f61d8cb02a
Hold usable value lists in admin settings form ( #36268 )
2025-09-26 08:21:03 +00:00
Claire
a548c5c29b
Merge commit '24ddf80ff7a707bcea01a6e59831ffefe495f3e0' into glitch-soc/merge-upstream
2025-09-23 18:41:09 +02:00
Claire
64895e5f6d
Add support for has:quote in search ( #36217 )
2025-09-22 16:03:22 +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
f5591346cc
Add following_url to accounts ( #36093 )
2025-09-15 13:45:57 +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
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
6fc9febb47
Merge commit '1b664cf20dbb696cf16a42efcf59ab186cb211eb' into glitch-soc/merge-upstream
2025-09-05 20:03:42 +02:00
Matt Jankowski
1b664cf20d
Relay reset delivery tracker model spec and callback ( #36027 )
2025-09-05 12:56:15 +00:00
Matt Jankowski
3efba15b3c
Use pluck on DomainAllow.allowed_domains for export ( #36019 )
2025-09-05 12:30:18 +00:00
