Claire
95aaefe083
Merge commit '562ea656f495f0619e393b7d93bd07c5abd28e5a' into glitch-soc/merge-upstream
2026-01-21 22:04:02 +01:00
nicole mikołajczyk
3219373d56
Add profile field limits to instance serializer ( #37535 )
2026-01-21 16:01:33 +00:00
Claire
5d04c56c48
Merge commit '400c1f3e8ec0ffd33ad30d9334b9210cdb89b14c' into glitch-soc/merge-upstream
2026-01-20 16:14:14 +01:00
David Roetzel
7cdc05b9a8
Add language attribute to collections ( #37549 )
2026-01-20 13:22:54 +00:00
Claire
04f4725249
Merge commit '0231b6d350d6027fa822f286732405b573d634e8' into glitch-soc/merge-upstream
2025-12-19 18:43:09 +01:00
David Roetzel
0231b6d350
Expose feature policy in API ( #37322 )
2025-12-19 15:20:30 +00:00
Claire
84feffd6e6
Merge commit '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream added a method right next to glitch-soc-only methods.
Added upstream's method.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream changed a line right next to a glitch-soc addition.
Changed the code as upstream did.
2025-12-17 18:27:14 +01:00
David Roetzel
5e8b8f9c23
Extract interaction policy class ( #37277 )
2025-12-17 10:12:43 +00:00
Claire
1fdb48c668
Merge commit 'cbe135210305c0ce4455130c4e75680e53ff1425' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
Conflict caused by glitch-soc's theming system.
Updated upstream changes.
2025-12-15 20:22:20 +01:00
David Roetzel
1766616ebc
Refactor relation preloading ( #37217 )
2025-12-15 07:35:46 +00:00
Claire
6503287c2d
Merge commit '4af8e83c8a236265c46a1b984fa5dbd3a7c73dfe' into glitch-soc/merge-upstream
2025-12-12 17:45:26 +01:00
David Roetzel
3cc4b59b41
First draft of API to add items to a collection ( #37222 )
2025-12-12 13:09:55 +00:00
Claire
315f5e5a31
Merge commit '9d81561bb2440c8fb9a75bd05277120aff346b1e' into glitch-soc/merge-upstream
2025-12-09 18:06:56 +01: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
cf23f0414f
Add id to collection serializers ( #37157 )
2025-12-08 11:40:17 +00:00
David Roetzel
8625721805
Draft API to get all collections by an account ( #37139 )
2025-12-08 08:56:13 +00:00
Claire
34aa825e96
Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream
2025-12-04 20:16:21 +01:00
Claire
08da9d8fc5
Fix serialization of annual reports with share code ( #37104 )
2025-12-03 13:05:33 +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
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
Claire
99ff59b7b2
Merge commit '37ccffa95a30772b55e3f18d486d699ee6c5f9e8' into glitch-soc/merge-upstream
2025-11-30 17:47:27 +01:00
David Roetzel
f896bbac3b
Draft API to create Collections ( #37049 )
2025-11-28 13:30:43 +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
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
4b42fe6aba
Change API behavior of reblogs wrt. quotes for consistency ( #36559 )
2025-10-28 08:05:23 +00:00
Claire
209434cb1d
Merge commit '17eb1a7e668dbba6e79612395b99407e8e8de6b9' into glitch-soc/merge-upstream
2025-10-21 18:15:56 +02: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
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
b15b07606c
Merge commit '28be5a199f685b9fb26742c4d78ddca53df05d57' into glitch-soc/merge-upstream
2025-09-24 18:26:13 +02:00
Claire
e1f7847b64
Remove the outgoing_quotes feature flag, making the feature unconditional ( #36130 )
2025-09-24 08:58:08 +00:00
Claire
a548c5c29b
Merge commit '24ddf80ff7a707bcea01a6e59831ffefe495f3e0' into glitch-soc/merge-upstream
2025-09-23 18:41:09 +02:00
Matt Jankowski
4abc442add
Refer to pinnable visibilities constant from status serializer pinnable? attribute ( #35852 )
2025-09-22 13:45:23 +00:00
Claire
af360df59b
Merge commit '48005c55fffd1540105ca53870da64f742a0f7fc' into glitch-soc/merge-upstream
2025-09-18 19:19:36 +02:00
Claire
e2171f5083
Change quoted posts from silenced accounts not to be hidden ( #36166 )
2025-09-18 13:21:17 +00:00
Claire
6abe6cdef5
Merge commit '40242fafee83cf9a6bcb2d0ac1e228827969402f' into glitch-soc/merge-upstream
2025-08-29 18:21:28 +02:00
Claire
8b7685d956
Add default quote policy to API ( #35948 )
2025-08-29 11:37:20 +00:00
Claire
884d7996b1
Merge commit '02de05dc272856c77fac5c9e1d84cf585ae20c1e' into glitch-soc/merge-upstream
2025-08-27 18:13:03 +02:00
Claire
a6a0d982ef
Fix streaming and handling of quoted_update notifications ( #35924 )
2025-08-27 14:53:54 +00:00
Claire
7e25f6b606
Merge commit '6ad0ddebe4be9fb76b9119924674b4679e8da74a' into glitch-soc/merge-upstream
2025-08-26 19:07:52 +02:00
Claire
e8fe33f273
Merge commit '7aba79ade9bfeb86105aa575bc7156acef78f7da' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflict because of glitch-soc's theming system.
Updated the line as upstream did.
2025-08-25 22:15:28 +02:00
