Claire
95aaefe083
Merge commit '562ea656f495f0619e393b7d93bd07c5abd28e5a' into glitch-soc/merge-upstream
2026-01-21 22:04:02 +01:00
David Roetzel
783504f36a
Do not return undiscoverable collections ( #37560 )
2026-01-21 12:30:07 +00:00
Claire
5d04c56c48
Merge commit '400c1f3e8ec0ffd33ad30d9334b9210cdb89b14c' into glitch-soc/merge-upstream
2026-01-20 16:14:14 +01:00
Claire
028e76f770
Merge commit from fork
...
* Add limit on inbox payload size
The 1MB limit is consistent with the limit we use when fetching remote resources
* Add limit to number of options from federated polls
* Add a limit to the number of federated profile fields
* Add limit on federated username length
* Add hard limits for federated display name and account bio
* Add hard limits for `alsoKnownAs` and `attributionDomains`
* Add hard limit on federated custom emoji shortcode
* Highlight most destructive limits and expand on their reasoning
2026-01-20 15:14:45 +01:00
Claire
c2f776b747
Merge commit from fork
2026-01-20 15:10:38 +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
f65e6a5029
Merge commit '10de65e41c3b01bd938f97fdb60fc96c26673966' into glitch-soc/merge-upstream
2026-01-14 20:31:42 +01:00
David Roetzel
c218849204
Add collection endpoint ( #37468 )
2026-01-14 10:08:29 +00:00
Claire
e33a8d5bfb
Merge commit '9b5986b36e86d50d19b68b10788b3316012894c3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
Upstream refactored a bit where we had an extra argument for markdown/HTML.
Adapted upstream change.
2026-01-13 18:01:53 +01:00
Shlee
9b5986b36e
Fix quote_approval_policy being reset to user defaults when omitted in status update ( #37436 )
2026-01-13 10:40:08 +00:00
Claire
d7254ecec4
Merge commit 'a4b8b9fe98c677f718e4b2c1ffe1755d58e7f8d7' into glitch-soc/merge-upstream
2026-01-10 13:12:36 +01:00
Joshua Rogers
b55982cc1a
Fix Vary parsing in cache control enforcement ( #37426 )
2026-01-09 16:21:18 +00:00
Claire
aa6ec435d2
Merge commit '9fe14a30724e18425aedaba59ca63c63d8b14083' into glitch-soc/merge-upstream
2026-01-07 14:53:51 +01:00
Claire
0f79e29188
Merge commit from fork
2026-01-07 14:15:14 +01: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
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
diondiondion
a0ce77673c
Add dedicated user preferences for theme mode & contrast ( #37288 )
2025-12-19 15:31:44 +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
Nicholas La Roux
09ab2829da
Upgrade rubocop-rails from 2.33.4 to 2.34.2 and address related offenses ( #37243 )
2025-12-15 12:57:16 +00:00
Claire
dc4fb51e52
Increase cache duration on public shared wrapstodon page ( #37249 )
2025-12-15 10:19:17 +00:00
David Roetzel
bb72ecd466
Add simple API to remove item from collection ( #37225 )
2025-12-15 08:03:49 +00: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
1e67567d8f
Change HTTP Signature verification status from 401 to 503 on temporary failure to get remote actor ( #37221 )
2025-12-12 12:42:43 +00:00
Claire
315f5e5a31
Merge commit '9d81561bb2440c8fb9a75bd05277120aff346b1e' into glitch-soc/merge-upstream
2025-12-09 18:06:56 +01: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
Claire
607449336d
Merge commit from fork
2025-12-08 15:44:08 +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
75b9e9a8b0
Enable missing before actions in Collection API ( #37122 )
2025-12-04 15:35:47 +00:00
David Roetzel
9921fa1af7
First draft API to delete collections ( #37117 )
2025-12-04 13:47:23 +00:00
David Roetzel
5a7a4fff11
First draft of Collection update API ( #37110 )
2025-12-04 10:00:21 +00:00
Matt Jankowski
b3b5bf26d1
Remove duplicate set_locale around action in auth/registrations ( #36455 )
2025-12-03 15:34:10 +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
David Roetzel
2d203ca72a
First draft of API to get a single collection ( #37053 )
2025-12-01 15:04:52 +00:00
Echo
048746e56b
Hide domain for local emojis in admin ( #37080 )
2025-12-01 14:24:24 +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
