Claire
edec2e9fdf
Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream
2024-07-14 18:43:35 +02:00
David Roetzel
35a437a03f
Destroy NotificationRequests that are dismissed ( #31008 )
2024-07-12 12:09:52 +00:00
Claire
55cf5e0188
Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream
2024-07-12 13:41:54 +02:00
Claire
ad52b04a1c
Add setting to disable hover cards ( #30931 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-07-11 19:42:58 +00:00
Claire
388672ff0d
Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream
2024-07-09 20:39:09 +02:00
David Roetzel
967505ee9b
Add size limit for all PreviewCard URLs ( #30973 )
2024-07-09 13:11:34 +00:00
Claire
6a55232988
Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream
2024-07-08 19:41:14 +02:00
Claire
d41b43ed4f
Limit attachments to MEDIA_ATTACHMENTS_LIMIT when returning posts through the API ( #30932 )
2024-07-08 07:41:50 +00:00
Claire
d2aea85e6c
Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream
2024-06-30 11:25:40 +02:00
Eugen Rochko
096057b845
Change author_account to be authors in REST API ( #30846 )
2024-06-27 13:17:18 +00:00
Claire
7a84b76bb1
Drop favicon.ico generation ( #30375 )
2024-06-26 13:44:08 +00:00
Claire
21ca03581a
Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream
2024-06-24 19:39:42 +02:00
Claire
8827cd597e
Fix /admin/accounts/:account_id/statuses/:id for edited posts with media attachments ( #30819 )
2024-06-24 13:11:10 +00:00
Claire
fd867adffe
Merge commit 'bb2d77b4a07e95e7d96df080f2d6994c1422b0c0' into glitch-soc/merge-upstream
2024-06-20 18:36:13 +02:00
Claire
bb2d77b4a0
Change /api/v2_alpha/notifications to only return historical data in pages ( #30781 )
2024-06-20 15:54:50 +00:00
Claire
f723370c69
Fix missing account_warning delegation in NotificationGroup ( #30779 )
2024-06-20 13:44:49 +00:00
Claire
395b9011ee
Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, just upstream adding a method textually adjacent to
glitch-soc only code.
Ported upstream's change.
2024-06-17 18:30:28 +02:00
Claire
677f73f793
Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream
2024-06-17 13:41:58 +02:00
Claire
8eb27c60e1
Add most_recent_notification_id to NotificationGroup ( #30707 )
2024-06-14 10:33:06 +00:00
Claire
37f53542fe
Fix limit handling in grouped notifications CTE ( #30685 )
2024-06-13 12:42:40 +00:00
Claire
4daed855e5
Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream
2024-06-11 19:46:11 +02:00
Matt Jankowski
d818ddd687
Extract SIGN_COUNT_LIMIT constant in WebauthnCredential class ( #30636 )
2024-06-11 15:36:21 +00:00
Matt Jankowski
665f6f09a0
Add expired/revoked scopes for doorkeeper models via extension modules ( #29936 )
2024-06-11 08:50:51 +00:00
Claire
be68f8f4af
Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream
2024-06-10 18:20:08 +02:00
Matt Jankowski
9bf2e2eda0
Extract TEXT_LENGTH_LIMIT constant in Appeal class ( #30638 )
2024-06-10 15:23:17 +00:00
Claire
7277d2f130
Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream
2024-06-07 20:30:51 +02:00
Claire
9e9613b286
Fix mentions.account_id and mentions.status_id not having NOT NULL database constraints ( #30591 )
2024-06-07 13:45:11 +00:00
Claire
1408733386
Fix Mastodon relying on ImageMagick even with MASTODON_USE_LIBVIPS ( #30590 )
2024-06-07 09:27:59 +00:00
Claire
30b00ca2b5
Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream
2024-06-06 12:27:26 +02:00
Eugen Rochko
a2505e8611
Add timeline of public posts about a trending link to REST API ( #30381 )
2024-06-06 08:43:04 +00:00
Emelia Smith
4655be0da6
Fix add validation to webpush subscription keys ( #30542 )
2024-06-05 19:16:47 +00:00
Eugen Rochko
5f15a892fa
Add support for libvips in addition to ImageMagick ( #30090 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-05 19:15:39 +00:00
Emelia Smith
eef2cc054f
Add url validation to Web::PushSubscription endpoints ( #30540 )
2024-06-05 08:06:06 +00:00
Claire
974335e414
Add experimental server-side notification grouping ( #29889 )
2024-06-03 08:35:59 +00:00
Claire
c827a98f19
Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Not a real conflict, just a line adjacent to a glitch-soc only dependency
getting updated.
Updated dependencies as upstream did.
2024-05-29 17:03:24 +02:00
Eugen Rochko
128987eded
Add support for fediverse:creator OpenGraph tag ( #30398 )
2024-05-29 01:34:33 +02:00
Matt Jankowski
4a77e477ee
Consolidate account scopes for LOWER (index using) username/domain queries ( #30451 )
2024-05-28 14:11:31 +00:00
Matt Jankowski
c61e356475
Add Status::MEDIA_ATTACHMENTS_LIMIT configuration constant ( #30433 )
2024-05-27 09:49:44 +00:00
Claire
d76106da12
Merge commit 'ccb6aeddacbab950d7d7f1b0d2b64212d7aa99eb' into glitch-soc/merge-upstream
2024-05-24 17:08:21 +02:00
Matt Jankowski
9b5055d34d
Fix Style/SuperArguments cop ( #30406 )
2024-05-24 08:36:21 +00:00
Claire
edf6ca56e3
Fix rubocop error and cleanup Status.as_direct_timeline a little
2024-05-21 13:12:46 +02:00
Claire
d3136e6d58
Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream
2024-05-21 12:06:38 +02:00
Claire
89f89d738f
Revert "Allow unblocking email addresses from any matching account ( #29305 )" ( #30385 )
2024-05-21 08:56:08 +00:00
Claire
e46321e63d
Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream
2024-05-20 12:17:36 +02:00
Matt Jankowski
def6b686ff
Fix Rails/WhereRange cop ( #30343 )
2024-05-20 09:37:36 +00:00
Claire
57fb2cf948
Merge commit '12472e7f407c42bcff6ee204b9f1887b5824734f' into glitch-soc/merge-upstream
2024-05-17 12:33:41 +02:00
Jeong Arm
a627219b25
Fix moderation action logs ( #30342 )
2024-05-17 09:18:54 +00:00
Claire
2810231180
Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Upstream renamed a helper method everywhere.
There was one glitch-soc line involving changes because of the local-only post
feature.
Ported upstream's change.
2024-05-16 19:30:10 +02:00
Emelia Smith
5fd56512de
Improve Report Notes and Account Moderation Notes ( #30288 )
2024-05-15 13:38:36 +00:00
Claire
21c904b0f6
Merge commit 'd8c428472356abd70aaf1f514b99114464ee7f61' into glitch-soc/merge-upstream
2024-05-07 20:30:17 +02:00
