David Roetzel
51224bb437
Add "featured collections" collection to actors ( #37512 )
2026-01-20 08:27:05 +00:00
Claire
e9793971b3
Merge commit 'ad77ee7f8ba6aa25ee36e3e21c38d9bbc252b097' into glitch-soc/merge-upstream
2026-01-19 18:01:57 +01:00
Claire
220115757d
Fix potential duplicate handling of quote accept/reject/delete ( #37537 )
2026-01-19 13:47:27 +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
82fb2596c7
Fix posts with edited out media attachments being returned in /api/v1/accounts/:id/statuses?only_media=true ( #37363 )
2026-01-05 15:06:20 +00:00
Claire
c7ad055ff3
Merge commit 'a0ce77673c977e3a90d0c7d1c2acd250b7fad0c2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/application_controller.rb`:
Upstream added an experimental color and contrast theme control.
Conflicts because of glitch-soc's different theming system.
Adapted upstream's changes.
- `app/views/layouts/application.html.haml`:
Upstream added an experimental color and contrast theme control.
Conflicts because of glitch-soc's different theming system.
Adapted upstream's changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream added an experimental color and contrast theme control.
Conflicts because of glitch-soc's different theming system.
Adapted upstream's changes.
2026-01-03 15:26:58 +01:00
Claire
04f4725249
Merge commit '0231b6d350d6027fa822f286732405b573d634e8' into glitch-soc/merge-upstream
2025-12-19 18:43:09 +01:00
diondiondion
a0ce77673c
Add dedicated user preferences for theme mode & contrast ( #37288 )
2025-12-19 15:31:44 +00: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
db62d70492
Change Wrapstodon switch from feature flag to admin setting ( #37273 )
2025-12-17 09:47:02 +00:00
Matt Jankowski
a292162c5f
Mark Form::AdminSettings#persisted? as true ( #35872 )
2025-12-17 08:32:24 +00:00
Claire
780fefa700
Merge commit '53be8392eceea8c3a576478e209fe82c2ceb458a' into glitch-soc/merge-upstream
2025-12-16 18:27:03 +01:00
Matt Jankowski
7230c2059f
Add coverage for "domain variants" consumers ( #35995 )
2025-12-16 10:24:27 +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
53617cef5a
Merge commit 'd730f6b0c5cfb18894d1a9e34d0aa2556dda3c62' into glitch-soc/merge-upstream
2025-12-11 18:05:28 +01:00
David Roetzel
adf8a3601d
Add service to add item to a collection ( #37192 )
2025-12-10 16:59:21 +00:00
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
