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
697569e5f9
Add account_id attribute to AnnualReport entity ( #37182 )
2025-12-09 15:59:40 +00:00
David Roetzel
ea768c17db
Add counter cache to collections ( #37176 )
2025-12-09 10:31:35 +00:00
Claire
05e45beb34
Merge commit '607449336da198ea9fe9c014220a5374a0ca1ae4' into glitch-soc/merge-upstream
2025-12-08 16:33:27 +01:00
David Roetzel
55becaa1b5
Preload tag to prevent n+1 ( #37154 )
2025-12-08 10:30:10 +00:00
David Roetzel
8625721805
Draft API to get all collections by an account ( #37139 )
2025-12-08 08:56:13 +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
David Roetzel
5a7a4fff11
First draft of Collection update API ( #37110 )
2025-12-04 10:00:21 +00:00
Matt Jankowski
7c730e9041
Use normalizes API for Tag display_name value ( #35797 )
2025-12-03 15:39:01 +00:00
David Roetzel
4e6d1892b9
Fix creation of duplicate conversations ( #37108 )
2025-12-03 14:33:27 +00:00
Claire
c97d25fcbd
Fix serialization of 2025 wrapstodon reports ( #37103 )
2025-12-03 12:53:16 +00:00
Claire
5d84957117
Add shareable wrapstodon links ( #37047 )
2025-12-03 11:00:41 +00:00
Echo
c5c8100d02
Emoji: Update emoji categories with featured emoji ( #37084 )
2025-12-02 10:30:08 +00:00
David Roetzel
2d203ca72a
First draft of API to get a single collection ( #37053 )
2025-12-01 15:04:52 +00:00
Christian Oelschlegel
1f9ddb7cf6
fix(tag): prevent dupl. tags on concurrent inserts ( #35792 )
...
Co-authored-by: Christian Oelschlegel <oelschle@sciphy.de >
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2025-12-01 14:56:52 +00:00
Claire
44e6abe48b
Merge commit '0004ed4c8021ebd400d32eb32a5e479ebd7bcf91' into glitch-soc/merge-upstream
2025-11-30 16:40:18 +01:00
Matt Jankowski
cb4f1cc89c
Improve SessionActivation.activate spec ( #36983 )
2025-11-26 10:26:39 +00:00
David Roetzel
0725afe1a9
Collections: Add missing validations for boolean columns ( #37005 )
2025-11-25 14:46:50 +00:00
Claire
652ed7ab50
Merge commit '585545d0d5678a6ea4b958af4a3bc6593134d0f6' into glitch-soc/merge-upstream
2025-11-21 19:33:14 +01:00
Shugo Maeda
48fe679728
Separate remote thumbnails into cache/ directory ( #36911 )
2025-11-21 13:27:04 +00:00
David Roetzel
7ffa5fa0c4
Add models to represent "Collections" ( #36977 )
2025-11-21 10:28:23 +00:00
Claire
7a56972381
Merge commit '366856f3bcdc2ff008b04e493a5de317ab83d5d0' into glitch-soc/merge-upstream
2025-11-19 21:49:09 +01:00
Matt Jankowski
53703202fb
Add IpBlock#to_cidr method to build string ( #35773 )
2025-11-17 14:51:05 +00:00
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
