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
Claire
75fca715e9
Change public self-quotes of private posts to be disallowed ( #35975 )
2025-09-02 15:48:37 +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
6abe6cdef5
Merge commit '40242fafee83cf9a6bcb2d0ac1e228827969402f' into glitch-soc/merge-upstream
2025-08-29 18:21:28 +02:00
Claire
4fa203e69e
Rename unknown quote policy value to unsupported_policy ( #35955 )
2025-08-29 13:50:37 +00:00
Claire
7e25f6b606
Merge commit '6ad0ddebe4be9fb76b9119924674b4679e8da74a' into glitch-soc/merge-upstream
2025-08-26 19:07:52 +02:00
Claire
6ad0ddebe4
Fix quotes counting ( #35917 )
2025-08-26 15:51:56 +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
f3a932d8a1
Add quoted_update notification type ( #35820 )
2025-08-25 15:44:18 +00:00
Claire
2560242972
Add quotes_count to statuses stats ( #35832 )
2025-08-25 12:21:28 +00:00
Claire
a44b4e220e
Merge commit 'f6e822e1f5c18553db246991ebfb8658acaef59f' into glitch-soc/merge-upstream
2025-08-24 11:43:25 +02:00
Matt Jankowski
20bc34ca52
Rely on pluck for the SELECT in RuleTranslation.languages ( #35826 )
2025-08-22 23:58:40 +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
4ffcf7f7ed
Merge commit '255d8f3f8c6ece6a9f1fce9ea901d71577b92099' into glitch-soc/merge-upstream
2025-08-18 22:05:19 +02:00
Claire
255d8f3f8c
Fix e-mail confirmation bypassing username approval ( #35806 )
2025-08-18 16:37:13 +00:00
Claire
4d9150735a
Merge commit '651e51a82eba542c4d8c3fec5edd16420ea1ff3e' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated a dependency textually adjacent to a glitch-soc-specific one.
Updated the dependency as upstream did.
2025-08-17 20:52:34 +02:00
Claire
a2cddb9eac
Disallow making private posts quotable ( #35780 )
2025-08-14 13:58:25 +00:00
Claire
b0ce1ce49d
Fix tootctl admin create not bypassing reserved username checks ( #35779 )
2025-08-14 13:35:19 +00:00
Matt Jankowski
b827a0a6a8
Allow CustomEmoji to normalize its own domain ( #35726 )
2025-08-11 07:33:36 +00:00
Claire
11902d958f
Merge commit 'ce1680e6f979889ebd5c775353f3b82a8b2698bb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
Upstream added a new helper for a setting, where glitch-soc had extra ones.
Not a real conflict, added upstream's new helper without removing glitch-soc's ones.
2025-08-09 23:02:43 +02:00
David Roetzel
868c46bc76
Add delivery failure handling to FASP jobs ( #35723 )
2025-08-08 09:46:09 +00:00
Echo
8ee4b3f906
Update Redux to handle quote posts ( #35715 )
2025-08-08 08:44:05 +00:00
Claire
e68de292b4
Merge commit 'a485f97d21c3fb7da927e8fd239b301a590ee9b8' into glitch-soc/merge-upstream
2025-08-07 18:16:54 +02:00
Matt Jankowski
a485f97d21
Replace EmailHelper module with normalizes via model concern ( #35702 )
2025-08-07 13:47:47 +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
Matt Jankowski
a968849e9c
Use normalizes api for UsernameBlock username change ( #35606 )
2025-08-05 14:10:28 +00:00
Claire
53185f5381
Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream
2025-08-04 21:24:47 +02:00
Claire
cb0b608fa7
Ensure quoted user is given access to see the post ( #35665 )
2025-08-04 16:06:59 +00:00
Eugen Rochko
d8397040d7
Fix allow with approval option not working on username blocks ( #35655 )
2025-08-04 13:10:19 +00:00
Claire
80aadc55df
Add missing mailer for quote notifications ( #35652 )
2025-08-04 10:44:59 +00:00
David Roetzel
05cdd3f6eb
Track delivery failures to FASP ( #35628 )
2025-08-04 07:43:34 +00:00
Claire
dbab707d64
Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream
2025-08-01 22:11:59 +02:00
Claire
591df1f205
Add support for local quote stamps ( #35626 )
2025-08-01 14:55:25 +00:00
Claire
29a5f059d2
Add notifications for inbound quotes ( #35618 )
2025-08-01 09:12:46 +00:00
Claire
2dfdcc7dcb
Add API endpoints to view and revoke one's quoted posts ( #35578 )
2025-07-31 09:36:51 +00:00
Claire
572a0e128d
Change quote verification to not bypass authorization flow for mentions ( #35528 )
2025-07-31 07:39:53 +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
Claire
e5826777b6
Fix friends-of-friends recommendations suggesting already-requested accounts ( #35604 )
2025-07-30 16:28:26 +00:00
Claire
31ba52a57b
Change StatusReachFinder to consider quotes as well as reblogs ( #35601 )
2025-07-30 14:07:01 +00:00
Matt Jankowski
e8e6cf9510
Add coverage to user spec for missing last_sign_in_at scenario ( #35587 )
2025-07-30 13:46:58 +00:00
Matt Jankowski
3146109b08
Add MediaAttachment.combined_media_file_size method ( #35570 )
2025-07-30 12:57:51 +00:00
Matt Jankowski
8896d6c1b1
Use attribute for User#bypass_registration_checks? ( #35580 )
2025-07-30 12:55:36 +00:00
Matt Jankowski
7e6b134222
Extract User::Activity concern ( #35581 )
2025-07-30 11:19:11 +00:00
Matt Jankowski
4042bc959b
Use increment for User#update_sign_in! optional change ( #35573 )
2025-07-30 10:38:04 +00:00
Matt Jankowski
6dc55a2f4e
Extract User::Confirmation concern ( #35582 )
2025-07-30 10:33:57 +00:00
Matt Jankowski
15b72591d4
Use attribute for User#external? ( #35579 )
2025-07-30 09:48:18 +00:00
Eugen Rochko
20bbd20ef1
Add ability to block words in usernames ( #35407 )
2025-07-29 10:19:15 +00:00
Eugen Rochko
8cf7a77808
Fix async refresh never being finished when status cannot be fetched ( #35500 )
2025-07-29 09:23:32 +00:00
Matt Jankowski
040a638ab9
Fix Style/GuardClause in Tag ( #35522 )
2025-07-28 08:54:29 +00:00
