3b56d69896
Merge branch 'emoji-reactions-base' into develop
2025-09-21 19:01:32 +02:00
Claire
06f45a2046
Merge commit ' eb118d8523' 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
6fc9febb47
Merge commit ' 1b664cf20d' into glitch-soc/merge-upstream
2025-09-05 20:03:42 +02:00
Matt Jankowski
1b664cf20d
Relay reset delivery tracker model spec and callback ( #36027 )
2025-09-05 12:56:15 +00:00
Matt Jankowski
05a655f33e
Convert age verification controller to system specs ( #36026 )
2025-09-05 12:44:09 +00:00
Matt Jankowski
3efba15b3c
Use pluck on DomainAllow.allowed_domains for export ( #36019 )
2025-09-05 12:30:18 +00:00
Emelia Smith
4c2a2c27c1
Automatically remove invalid Web::PushSubscriptions ( #35987 )
2025-09-04 08:00:44 +00:00
Claire
d5b959a2ca
Merge commit ' 75fca715e9' 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
fiona
e665cc68f4
Fix handling of edited status with new media and no text ( #35970 )
2025-09-02 12:25:55 +00:00
Eugen Rochko
7fc884ba00
Fix banned text being able to be circumvented via unicode ( #35978 )
2025-09-02 07:29: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 ' 40242fafee' into glitch-soc/merge-upstream
2025-08-29 18:21:28 +02:00
Matt Jankowski
ee4b0a223c
Add coverage for Relay model ( #35950 )
2025-08-29 15:18:52 +00:00
Claire
4fa203e69e
Rename unknown quote policy value to unsupported_policy ( #35955 )
2025-08-29 13:50:37 +00:00
Matt Jankowski
5f1e6a5886
Fix failure to verify changes in api/v1/accounts/credentials spec ( #35951 )
2025-08-29 08:14:23 +00:00
Claire
884d7996b1
Merge commit ' 02de05dc27' into glitch-soc/merge-upstream
2025-08-27 18:13:03 +02:00
Claire
c00ed9c913
Add digest re-check before removing followers in synchronization mechanism ( #34273 )
2025-08-27 12:12:55 +00:00
Claire
7e25f6b606
Merge commit ' 6ad0ddebe4' into glitch-soc/merge-upstream
2025-08-26 19:07:52 +02:00
Matt Jankowski
a8166d28ed
Add coverage for "live TOS" and "no TOS" paths in tos/drafts spec ( #35902 )
2025-08-26 08:43:43 +00:00
Matt Jankowski
4f41b7c089
Relax hard-coded attr names in system specs ( #35903 )
2025-08-26 08:23:45 +00:00
Claire
496370801a
Add quotes_count to serializer specs ( #35901 )
2025-08-25 15:49:52 +00:00
Claire
f3a932d8a1
Add quoted_update notification type ( #35820 )
2025-08-25 15:44:18 +00:00
Claire
a44b4e220e
Merge commit ' f6e822e1f5' 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
71cee3e472
Merge commit ' f16f8b51b8' 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
Matt Jankowski
ce813ad144
Avoid method that makes tokens while checking for tokens ( #35815 )
2025-08-19 06:49:34 +00:00
Claire
4ffcf7f7ed
Merge commit ' 255d8f3f8c' 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
8d602df786
Merge commit ' 72bd1ed4b3' into glitch-soc/merge-upstream
2025-08-18 13:44:06 +02:00
Claire
72bd1ed4b3
Fix updates to quote policy not being federated ( #35804 )
2025-08-18 08:34:45 +00:00
Matt Jankowski
9d15b85d3b
Include update in the resources args for api/web/push_subscriptions route ( #35801 )
2025-08-18 07:35:56 +00:00
Claire
4d9150735a
Merge commit ' 651e51a82e' 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
93923a4af2
First pass coverage addition for antispam class ( #35771 )
2025-08-14 07:57:18 +00:00
Claire
2648bbdc51
Add PUT /api/v1/statuses/:status_id/interaction_policy ( #35769 )
2025-08-13 15:51:16 +00:00
Echo
7cf53dbf63
Redirect on success for standalone compose ( #35763 )
2025-08-13 13:52:29 +00:00
Essem
768d431336
Add reaction to push subscriptions spec
2025-08-12 22:12:59 +02:00
3f5041fd60
Merge branch 'emoji-reactions-base' into develop
2025-08-12 22:12:00 +02:00
Claire
258e5c4938
Fix interaction policy changes in implicit updates not being saved ( #35751 )
2025-08-12 12:19:29 +00:00
Claire
8a7e84a475
Add test for Delete of inlined QuoteAuthorization ( #35724 )
2025-08-11 08:55:23 +00:00
Claire
0e99d428b2
Change serialization of Delete activities for QuoteAuthorization to inline the latter ( #35725 )
2025-08-11 08:55:18 +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 ' ce1680e6f9' 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
Claire
e68de292b4
Merge commit ' a485f97d21' 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
