Claire
8b95254883
Merge commit 'c36db57acedf0033c090748125c665a0360cd11f' into glitch-soc/merge-upstream
2026-01-23 17:57:20 +01:00
David Roetzel
de63b61943
Change Collections API shape ( #37580 )
2026-01-23 10:22:37 +00:00
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
David Roetzel
e65103bd3d
Fix rendering of initial state when collections feature is enabled ( #37556 )
2026-01-21 09:18:16 +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
David Roetzel
51224bb437
Add "featured collections" collection to actors ( #37512 )
2026-01-20 08:27:05 +00:00
Claire
478462ab25
Merge commit 'ed17b3a7ec52c0421ae2483a8e08431316f08b1c' into glitch-soc/merge-upstream
2026-01-12 21:00:14 +01:00
David Roetzel
a9cfddf28e
AP/AS serialization of Collections ( #37434 )
2026-01-12 08:39:25 +00:00
Claire
b1d219afd0
Merge commit '82fb2596c70a18fc4a2d99ab51106180196bfe98' into glitch-soc/merge-upstream
2026-01-05 18:19:58 +01:00
Claire
b5bc301cbd
Fix serialization of context pages ( #37376 )
2026-01-05 11:59:10 +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
David Roetzel
4e63958914
Federated "featureable in collections" preference ( #37298 )
2025-12-19 13:44:27 +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
780fefa700
Merge commit '53be8392eceea8c3a576478e209fe82c2ceb458a' into glitch-soc/merge-upstream
2025-12-16 18:27:03 +01:00
Claire
550a6d4765
Add wrapstodon to initial state and show wrapstodon sidebar item on load ( #37261 )
2025-12-16 09:47:18 +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
Asahi Lina
394ed551bb
Serialize legacy quotes ( #3203 )
2025-11-11 13:23:51 +01: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
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
Echo
85d0cdb5f7
Emoji: Remove final flag ( #36409 )
2025-10-28 11:33:27 +00:00
Claire
4b42fe6aba
Change API behavior of reblogs wrt. quotes for consistency ( #36559 )
2025-10-28 08:05:23 +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
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
