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
Echo
dbf14784bf
Add setting to control the referrer origin ( #34731 )
2025-05-19 13:13:22 +00:00
Claire
5321a553d5
Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Not a real conflict, upstream added a setting on a line adjacent to a
glitch-soc-only line.
Added upstream's new setting.
2025-05-14 13:38:23 +02:00
Claire
aa04efb92a
Move server rule creation form to its own page ( #34637 )
2025-05-14 09:43:07 +00:00
Claire
80f7175379
Merge commit 'a296facdea884cc828999c9f9be0f4bc83afe68d' into glitch-soc/merge-upstream
2025-04-11 19:14:53 +02:00
Claire
00cd218741
Add paragraph to tell admins that email announcements cannot be opted out ( #34411 )
2025-04-11 09:52:23 +00:00
Claire
f8b0f38636
Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream
2025-03-29 17:02:39 +01:00
David Roetzel
97b9994743
Basic FASP support ( #34031 )
2025-03-28 12:16:40 +00:00
Claire
971690caf2
Merge commit 'f7b1769e8a69e2831493f3a704d68efa5cf9beff' into glitch-soc/merge-upstream
2025-03-19 20:09:14 +01:00
Eugen Rochko
0099907600
Fix error when terms of service are missing an effective date ( #34200 )
2025-03-18 21:39:13 +00:00
Claire
0efa669fe9
Merge commit '2f98134ac69ee840095c9d8389e4b2fff72f20c1' into glitch-soc/merge-upstream
2025-03-15 17:49:32 +01:00
Eugen Rochko
d213c585ff
Add age verification on sign-up ( #34150 )
2025-03-14 14:07:29 +00:00
Claire
4bea9a0a66
Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream
2025-03-07 18:34:27 +01:00
Claire
dbd3e05812
Merge commit 'b57687083f4af178f2e2f43665eb4e49d32a50c2' into glitch-soc/merge-upstream
2025-03-07 17:37:36 +01:00
Eugen Rochko
2cabbae132
Add min. age to terms of service ( #34105 )
2025-03-07 11:50:52 +00:00
Claire
b6f3cfb302
Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream
2025-03-06 20:10:00 +01:00
Claire
5a100bf38f
Add ability to email announcements to all users ( #33928 )
2025-03-06 14:05:27 +00:00
Eugen Rochko
cadda2f957
Add effective date to terms of service ( #33993 )
2025-03-05 09:01:33 +00:00
Darren VanBuren
bff53a637e
Fix up the off by one error on displayed rank for trending tags admin page. ( #34016 )
2025-02-28 11:16:49 +00:00
Claire
a682bd19f5
Merge commit '20531d1e078a27116dea53ce21c1b32bf3774eca' into glitch-soc/merge-upstream
2025-02-25 18:52:24 +01:00
Eugen Rochko
298ca53593
Add choice of law to terms of service generator ( #33994 )
2025-02-25 10:58:11 +00:00
Claire
844ae90dad
Merge commit '2beab34ca405a0beb3ea9f5ab684779dc2eb6374' into glitch-soc/merge-upstream
2025-01-29 12:05:09 +01:00
