Claire
34aa825e96
Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream
2025-12-04 20:16:21 +01:00
Echo
048746e56b
Hide domain for local emojis in admin ( #37080 )
2025-12-01 14:24:24 +00:00
Claire
7a56972381
Merge commit '366856f3bcdc2ff008b04e493a5de317ab83d5d0' into glitch-soc/merge-upstream
2025-11-19 21:49:09 +01:00
Claire
a4fd9b704a
Merge commit '284b46fee7ad682b52c99d0455a1134e1d4e3fc3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream added an experimental feature flag to try out theme refactors.
Glitch-soc's theming system is too different, so skips the new feature flag.
- `stylelint.config.js`:
Ditto.
2025-11-19 21:34:53 +01:00
Matt Jankowski
53703202fb
Add IpBlock#to_cidr method to build string ( #35773 )
2025-11-17 14:51:05 +00:00
diondiondion
284b46fee7
Implement CSS theme tokens behind feature flag ( #36861 )
2025-11-17 09:44:55 +00:00
Claire
a7ba4ba446
Merge commit '26e7fe97714d077930621f9111b7eaad2774df65' into glitch-soc/merge-upstream
2025-11-04 20:38:24 +01:00
Claire
b5c550ff0b
Remove option to disable access to local topic feeds for logged-in users ( #36703 )
2025-11-04 10:37:43 +00:00
Claire
5f3f75559f
Merge commit '1dead10312caa0cc7719cb80052af549ddf3e6a1' into glitch-soc/merge-upstream
2025-10-28 20:25:09 +01:00
Renaud Chaput
779a1f8448
Add a new setting to choose the server landing page ( #36588 )
2025-10-27 10:16:59 +00:00
Claire
4c0104084d
Merge commit 'c96e28a41d6f3dee898b09ab1b250ac5b5dfd9e4' into glitch-soc/merge-upstream
2025-10-17 18:36:27 +02:00
Emelia Smith
210b389643
Implement quote posts in Moderator UI ( #35964 )
2025-10-16 13:40:24 +00:00
Claire
ee88f8550c
Merge commit '0219b7cad7d9ef800f82cc561571b70da040433f' into glitch-soc/merge-upstream
2025-10-10 19:01:35 +02:00
Emelia Smith
8898f120dc
Improve display of content warnings in Admin UI ( #35935 )
2025-10-10 08:55:41 +00:00
Emelia Smith
81350c7cfb
Add support for displaying link previews for Admin UI ( #35958 )
2025-10-10 08:43:48 +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
8fad4926c5
Merge commit '1571514e49ec02a57c050612b3bca856f54933fb' into glitch-soc/merge-upstream
2025-09-27 21:29:19 +02:00
Matt Jankowski
f61d8cb02a
Hold usable value lists in admin settings form ( #36268 )
2025-09-26 08:21:03 +00:00
Claire
b15b07606c
Merge commit '28be5a199f685b9fb26742c4d78ddca53df05d57' into glitch-soc/merge-upstream
2025-09-24 18:26:13 +02:00
diondiondion
6cbc857ee0
Fix unfortunate action button wrapping in admin area ( #36247 )
2025-09-24 08:57:18 +00:00
Claire
6fc9febb47
Merge commit '1b664cf20dbb696cf16a42efcf59ab186cb211eb' into glitch-soc/merge-upstream
2025-09-05 20:03:42 +02:00
Matt Jankowski
350a802851
Remove unused _index iterator in admin partial ( #36018 )
2025-09-05 12:29:11 +00:00
Claire
d5b959a2ca
Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some preferences to a new category, while glitch-soc had an
extra preference there.
Moved the extra preference like upstream did to the new category.
2025-09-02 19:07:51 +02:00
Emelia Smith
2138f3e40f
Move 'add more' inside table toolbar on reports ( #35963 )
2025-09-02 07:54:58 +00:00
Emelia Smith
15401e6988
Support displaying polls in Admin UI ( #35933 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2025-09-01 14:59:03 +00:00
Claire
884d7996b1
Merge commit '02de05dc272856c77fac5c9e1d84cf585ae20c1e' into glitch-soc/merge-upstream
2025-08-27 18:13:03 +02:00
Matt Jankowski
3f1d78f3c6
Use target account from group_by result in admin/reports/index ( #35920 )
2025-08-27 12:50:16 +00:00
Claire
7e25f6b606
Merge commit '6ad0ddebe4be9fb76b9119924674b4679e8da74a' into glitch-soc/merge-upstream
2025-08-26 19:07:52 +02:00
Matt Jankowski
4738a18e52
Use default action of persisted records on edit forms ( #35904 )
2025-08-25 17:26:25 +00:00
Claire
5cac4dfb5c
Merge commit 'abe5413638043a52e4fcbb5f16aefd14e76bf96c' into glitch-soc/merge-upstream
2025-08-22 22:52:55 +02:00
Emelia Smith
4f494781c1
Refactor to reuse the one status partial across moderation tools ( #35644 )
2025-08-21 14:51:11 +00:00
Claire
dbab707d64
Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream
2025-08-01 22:11:59 +02:00
David Roetzel
fba24cc4eb
Add minute resolution to DeliveryFailureTracker ( #35625 )
2025-08-01 13:29:22 +00:00
Claire
e53421b548
Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream
...
Conflicts:
- `config/settings.yml`:
Not a real conflict, upstream removed settings that are identical in glitch-soc
but textually adjacent to glitch-soc-only settings.
Removed what upstream removed.
2025-07-30 20:05:45 +02:00
Eugen Rochko
20bbd20ef1
Add ability to block words in usernames ( #35407 )
2025-07-29 10:19:15 +00:00
Matt Jankowski
5d69157e62
Prefer delegated nil-wrapping methods to safe navigation ( #35541 )
2025-07-28 08:03:23 +00:00
Claire
8649681c51
Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
Conflict because upstream added context extensions where glitch-soc had its own.
Added upstream's new context extension while keeping ours.
2025-07-25 21:45:00 +02:00
Matt Jankowski
960f693219
Use field partial in admin account show view ( #35503 )
2025-07-25 07:21:08 +00:00
Claire
f7b4580b49
Merge commit '0d650780e26735621f08bbdd545b162871e4562c' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a file, glitch-soc had extra files.
Took upstream's changes and moved glitch-soc's additions at the end.
2025-06-26 18:04:37 +02:00
Eugen Rochko
1804a87193
Change terms of service generator to not be displayed ( #35127 )
2025-06-26 13:26:41 +00:00
Claire
c9a1e27a49
Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
glitch-soc had extra paths under `app/javascript/flavours`, but upstream
added `app/javascript` as a whole, so updated to upstream's.
2025-06-25 19:29:09 +02:00
Claire
0a7418e6d8
Change rule translation interface to display english name and populate empty translations ( #35170 )
2025-06-25 10:02:19 +00:00
Emelia Smith
72f2f35bfb
Implement Instance Moderation Notes ( #31529 )
2025-06-25 08:15:44 +00:00
Matt Jankowski
f852da50f6
Add User#email_domain method to extract domain from email address ( #35159 )
2025-06-25 07:22:19 +00:00
Claire
220b78d4a9
Merge commit '2254f47702368938bdfd0d997f2487fb2950d676' into glitch-soc/merge-upstream
2025-06-12 17:39:03 +02:00
Eugen Rochko
24d943fee0
Change media attachments in moderated posts to not be accessible ( #34872 )
2025-06-12 08:53:02 +00:00
Claire
b031f65670
Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream
2025-05-25 14:51:59 +02:00
Claire
8c51a8ba94
Add ability to translate server rules ( #34494 )
2025-05-21 11:54:12 +00:00
Claire
d7cb6068b1
Add ability to reorder server rules from admin interface ( #34737 )
2025-05-20 12:49:11 +00:00
