Claire
e451416d90
Merge commit 'c44cc1f5c3bafb49a324f8f72a42a91d09eecfe3' into glitch-soc/merge-upstream
2026-02-12 18:00:45 +01:00
David Roetzel
f57167c61a
Add ID/URI to collection items ( #37842 )
2026-02-12 15:31:45 +00:00
Claire
2373c5a132
Merge commit 'ca9966ce2ff79dcac90b2feced65fa991534d53e' into glitch-soc/merge-upstream
2026-02-11 20:26:56 +01:00
Claire
dfe44bcaef
Add ability to require 2FA for specific roles (including Everybody) ( #37701 )
2026-02-11 14:34:09 +00:00
Claire
01b576efed
Add skin migrations for glitch-soc
2026-02-11 13:49:27 +01:00
Claire
20fedab093
Fix mistakenly included glitch-soc database columns ( #37824 )
2026-02-11 12:34:34 +00:00
Claire
4fbd1ad7ae
Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream
...
Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.
They were all manually resolved by adapting the relevant code.
2026-02-11 13:32:18 +01:00
Claire
d13d7b4566
Fix server theme migration ( #37810 )
2026-02-10 20:53:43 +00:00
Claire
75ba314e6b
Migrate to new theming infrastructure ( #37612 )
2026-02-10 10:59:47 +00:00
Claire
d62a7775b5
Merge commit 'd0502ac3c1630e281fda5492cbc28390262b0aeb' into glitch-soc/merge-upstream
2026-01-29 21:08:46 +01:00
Matt Jankowski
23148dc536
Update rubocop to version 1.8.40 ( #37628 )
2026-01-29 10:14:14 +00:00
Claire
36be9bbebf
Merge commit 'a495a0cbfcf9f6111c0e598af0864de2b76e4111' into glitch-soc/merge-upstream
2026-01-28 19:29:10 +01:00
Claire
6af4696c70
Add backend support for storing remote actors profile pic and header descriptions ( #37634 )
2026-01-28 09:32:59 +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
b6b6e142ba
Merge commit '918563704f5ff5eeb1efa31a412ac38f97781e9e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream modified `theme_color_tags` to work on color scheme rather than theme.
Updated it as well.
- `app/views/layouts/embedded.html.haml`:
Upstream changed the embed theme from `mastodon-light` to `system`.
Glitch-soc doesn't use a hardcoded value, so ignore the change.
- `spec/helpers/theme_helper_spec.rb`:
Accomodate `theme_color_tags` changes.
2026-01-16 22:28:08 +01:00
David Roetzel
be00db4fa3
Use snowflake ids for collections and their items ( #37514 )
2026-01-16 09:49:53 +00:00
Claire
04f4725249
Merge commit '0231b6d350d6027fa822f286732405b573d634e8' into glitch-soc/merge-upstream
2025-12-19 18:43:09 +01:00
David Roetzel
4e63958914
Federated "featureable in collections" preference ( #37298 )
2025-12-19 13:44:27 +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
34aa825e96
Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream
2025-12-04 20:16:21 +01: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
Claire
e5651e7e04
Make settings-related database migrations more robust ( #37079 )
2025-12-01 14:11:49 +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
5f3f75559f
Merge commit '1dead10312caa0cc7719cb80052af549ddf3e6a1' into glitch-soc/merge-upstream
2025-10-28 20:25:09 +01:00
Claire
38f15a89fe
Fix recent settings migrations ( #36602 )
2025-10-27 12:24:24 +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
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
f800057008
Merge commit 'b8444d9bb7885d75112a3cae74b6a5c711c7d547' into glitch-soc/merge-upstream
2025-10-08 18:07:04 +02:00
Claire
a7f89d13d2
Change index on follows table to improve performance of some queries ( #36374 )
2025-10-07 12:37:40 +00: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
b6c53c1129
Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
Upstream refactored a part of the code where glitch-soc has changed the code
to potentially hide followers count.
Adapt upstream's changes.
2025-09-29 18:41:46 +02:00
Claire
150f0fcba5
Add support for numeric-based URIs for local accounts ( #32724 )
2025-09-29 12:05:48 +00:00
Claire
cc52833296
Merge commit '38fa0102c111f1c0cff5a42eba6882ffae4ca109' into glitch-soc/merge-upstream
2025-09-15 18:39:09 +02:00
Claire
f5591346cc
Add following_url to accounts ( #36093 )
2025-09-15 13:45:57 +00:00
Claire
9f97df84da
Merge commit '45a996f12b04f88e0774bc6d6b52452ce39b612f' into glitch-soc/merge-upstream
2025-09-11 21:20:15 +02:00
Claire
f7289b251f
Add migration to fill unset default quote policy based on default post privacy ( #36041 )
2025-09-11 10:11:31 +00:00
Claire
06f45a2046
Merge commit 'eb118d85238da8d0583868abab2756bb329742ba' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated dependencies textually adjacent to glitch-soc-only ones.
Updated them as upstream did.
2025-09-10 18:11:12 +02:00
Claire
e1dc960219
Rework FEP-7888 implementation ( #36064 )
2025-09-09 18:27:30 +00:00
Jesse Karmani
65b4a0a6f1
Implement FEP 7888: Part 1 - publish conversation context ( #35959 )
2025-09-05 19:28:29 +00: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
Claire
2560242972
Add quotes_count to statuses stats ( #35832 )
2025-08-25 12:21:28 +00:00
Claire
71cee3e472
Merge commit 'f16f8b51b863d3fcadd17753004adbf8962ead01' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated a dependency adjacent to one that is only in glitch-soc.
Updated as upstream did.
2025-08-19 18:46:12 +02:00
Claire
736751e5de
Change indexes on quotes to efficiently list quotes of a given account or quoted status ( #35819 )
2025-08-19 12:50:30 +00:00
