Claire
f800057008
Merge commit 'b8444d9bb7885d75112a3cae74b6a5c711c7d547' into glitch-soc/merge-upstream
2025-10-08 18:07:04 +02:00
diondiondion
63bbe4ee16
Display quotes in email notifications ( #36379 )
2025-10-07 12:50: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
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
26193a119b
Merge commit 'd9b70bbde13b78709b48be6c979bc7520e81520a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper close to a glitch-soc one.
Added upstream's helper.
2025-09-16 18:30:30 +02:00
Eugen Rochko
d9b70bbde1
Fix login page linking to other pages within OAuth authorization flow ( #36115 )
2025-09-16 14:25:21 +00:00
Claire
5da295fa4d
Merge commit '06803422da3794538cd9cd5c7ccd61a0694ef921' into glitch-soc/merge-upstream
2025-09-13 11:12:22 +02:00
Echo
06803422da
Make Vite respect CSP for styles ( #36089 )
2025-09-12 13:37:26 +00:00
Eugen Rochko
30b31a89e6
Add schema.org markup to SEO-enabled posts ( #36075 )
2025-09-12 09:12:07 +00:00
Claire
9f97df84da
Merge commit '45a996f12b04f88e0774bc6d6b52452ce39b612f' into glitch-soc/merge-upstream
2025-09-11 21:20:15 +02:00
diondiondion
872044484c
Update labels in Posting defaults settings ( #36084 )
2025-09-11 14:04:15 +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
Matt Jankowski
786891c333
Remove unused local vars from user mailer warning ( #35977 )
2025-09-02 07:35:53 +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
ab698ff521
Move posting defaults to their own preferences sub-category ( #35966 )
2025-09-01 08:31:07 +00:00
Claire
6abe6cdef5
Merge commit '40242fafee83cf9a6bcb2d0ac1e228827969402f' into glitch-soc/merge-upstream
2025-08-29 18:21:28 +02:00
Matt Jankowski
40242fafee
Use partial for severed relationship download area ( #35945 )
2025-08-29 15:19:59 +00:00
Claire
884d7996b1
Merge commit '02de05dc272856c77fac5c9e1d84cf585ae20c1e' into glitch-soc/merge-upstream
2025-08-27 18:13:03 +02:00
Matt Jankowski
c2b7b28919
Use strict locals and remove unused value in card partial ( #35919 )
2025-08-27 13:22:39 +00:00
Matt Jankowski
5cb7dfafcc
Move lengthy ruby logic from mailer view to helper ( #35911 )
2025-08-27 13:15:33 +00:00
Matt Jankowski
35a06319fa
Rely on mail_to helper default name arg value ( #35913 )
2025-08-27 13:05:13 +00: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
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
Matt Jankowski
4738a18e52
Use default action of persisted records on edit forms ( #35904 )
2025-08-25 17:26:25 +00:00
Claire
3c17ccab37
Rearrange posting defaults settings ( #35896 )
2025-08-25 15:50:22 +00:00
Shlee
61a21d6a36
Add crossorigin back to inert css (regression? of #30687 ) ( #35876 )
2025-08-25 06:54:47 +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
235037a3b2
Merge commit 'ac59772dc6cda646258e61debfd792f9057c1c39' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
Conflict because upstream added a parameter where glitch-soc had an extra one.
Added upstream's parameter while keeping glitch-soc's.
- `app/serializers/activitypub/note_serializer.rb`:
Conflict because upstream added an extension where glitch-soc had an extra one.
Added upstream's extension while keeping glitch-soc's.
- `app/services/update_status_service.rb`:
Conflict because upstream added a parameter where glitch-soc had an extra one.
Added upstream's parameter while keeping glitch-soc's.
2025-08-06 22:02:55 +02:00
Claire
ac59772dc6
Change icon of quote notification mails ( #35701 )
2025-08-06 15:20:16 +00:00
Claire
53185f5381
Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream
2025-08-04 21:24:47 +02:00
Claire
80aadc55df
Add missing mailer for quote notifications ( #35652 )
2025-08-04 10:44:59 +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
72affd6b45
Merge commit 'a863e68d174b176dc350d8e3472c010cd37b7807' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends/statuses.rb`:
Conflict because of glitch-soc's setting to allow CWs in trends.
Kept glitch-soc's setting but followed upstream's refactor.
- `docker-compose.yml`:
Conflict because of upstream VS glitch-soc repos.
Updated version number as upstream did, but kept glitch-soc repos.
2025-07-24 18:10:38 +02:00
David Roetzel
8a1c43bf3b
Use default for preselected default privacy post setting ( #35422 )
2025-07-24 08:23:41 +00:00
Claire
eeffe580d8
Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream
2025-07-15 18:19:32 +02:00
