1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-12 13:48:35 +09:00
Commit Graph

23356 Commits

Author SHA1 Message Date
Matt Jankowski
db57fe80c8
Remove page_json var from ap/replies spec (#32000) 2024-09-26 08:54:01 +00:00
github-actions[bot]
278a075b22
New Crowdin Translations (automated) (#32103)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-26 08:47:38 +00:00
Claire
886baa5e35
Fix typo causing incorrect error being raised in blurhash processing failure (#32104) 2024-09-26 07:40:59 +00:00
Christian Schmidt
db332553c9
Rename "Data export" menu item (#32099) 2024-09-25 19:54:28 +00:00
Claire
f610fdd6e7
Merge pull request #2858 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 28966fa0a6
2024-09-25 21:15:51 +02:00
Eugen Rochko
3426ea2912
Add preview of followers removed in domain block modal in web UI (#32032) 2024-09-25 18:13:36 +00:00
Eugen Rochko
28c4eca0af
Change responsive break points on navigation panel in web UI (#32034) 2024-09-25 16:36:19 +00:00
Renaud Chaput
0b1310feb3 [Glitch] Keep the status action buttons at their position regardless of the counter size
Port 739ad0eed2 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-25 18:12:24 +02:00
Renaud Chaput
5716ebf390 [Glitch] Add notification grouping for follow notifications
Port d6f5ee75ab to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-25 18:09:19 +02:00
Renaud Chaput
36ce5813cb [Glitch] Fix search params being dropped when redirected to non-deck path
Port 3dc4ddc663 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-25 18:08:55 +02:00
Matt Jankowski
d9d84822bb [Glitch] Use not-allowed for cursor on disabled buttons
Port 69aa5699ce to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-25 18:08:12 +02:00
Claire
633165ba9c Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream 2024-09-25 17:41:37 +02:00
Renaud Chaput
28966fa0a6
Remove deprecated v2_alpha endpoint for grouped notifications (#32089) 2024-09-25 15:21:11 +00:00
Renaud Chaput
739ad0eed2
Keep the status action buttons at their position regardless of the counter size (#32084)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-25 14:33:58 +00:00
Matt Jankowski
51777fe3e2
Prefer structure checks over multi-line size/parts checks in parsed_body (#32063) 2024-09-25 13:54:22 +00:00
Renaud Chaput
d6f5ee75ab
Add notification grouping for follow notifications (#32085) 2024-09-25 13:36:19 +00:00
Renaud Chaput
3dc4ddc663
Fix search params being dropped when redirected to non-deck path (#31984) 2024-09-25 13:35:37 +00:00
Matt Jankowski
83574f641a
Add coverage and use mailer callback to check functional user in notification mailer (#32055) 2024-09-25 08:07:48 +00:00
Matt Jankowski
c2ef83ea4c
Consolidate shared a scope example parts into one attributes check (#32046) 2024-09-25 07:56:42 +00:00
Matt Jankowski
c3b6a7a297
Reduce factory creation (36 -> 12) in spec/controllers/oauth/* area (#32045) 2024-09-25 07:56:08 +00:00
Matt Jankowski
06ecf9008b
Remove single-use shared examples in controller specs (#32044) 2024-09-25 07:50:15 +00:00
Matt Jankowski
69aa5699ce
Use not-allowed for cursor on disabled buttons (#32076) 2024-09-25 07:43:12 +00:00
github-actions[bot]
4e6fc3a62f
New Crowdin Translations (automated) (#32083)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-25 07:40:14 +00:00
renovate[bot]
a773c239c3
Update dependency aws-sdk-s3 to v1.166.0 (#32079)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-25 07:33:37 +00:00
Claire
440b695b79
Fix polls not being displayed in detailed status (#2857) 2024-09-24 20:54:24 +02:00
Claire
5df7e36244
Merge pull request #2856 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 70988519df
2024-09-24 20:51:46 +02:00
Eugen Rochko
ba7b1f06c1 [Glitch] Fix too many requests caused by relationship look-ups in web UI
Port 70988519df to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-24 19:42:30 +02:00
Renaud Chaput
6142adc7d6 [Glitch] Fix wrapping in dashboard quick access buttons
Port f1b6a611aa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-24 19:41:37 +02:00
Claire
131696277c [Glitch] Fix multiple bugs in notification requests and notification policies
Port 0a6b75b71e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-24 19:41:04 +02:00
Eugen Rochko
aac6296183 [Glitch] Change hide media button to be in top right corner in web UI
Port d54ce67dc9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-24 19:40:34 +02:00
Claire
c6039f99ce Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-soc/merge-upstream 2024-09-24 19:34:30 +02:00
Eugen Rochko
70988519df
Fix too many requests caused by relationship look-ups in web UI (#32042)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-24 17:02:36 +00:00
Renaud Chaput
f1b6a611aa
Fix wrapping in dashboard quick access buttons (#32043) 2024-09-24 16:47:45 +00:00
André Menrath
556837f156
Fix the summary of converted object types to be treated as HTML (#28629) 2024-09-24 15:57:53 +00:00
Claire
c36a76b9eb
Fix error when accepting appeal for sensitive posts deleted in the meantime (#32037)
Co-authored-by: David Roetzel <david@roetzel.de>
2024-09-24 15:19:55 +00:00
Claire
0a6b75b71e
Fix multiple bugs in notification requests and notification policies (#32062) 2024-09-24 15:03:38 +00:00
David Roetzel
cfb8fc6222
Increase regexp timeout and allow override (#32056) 2024-09-24 13:16:58 +00:00
Matt Jankowski
19dedd7cfd
Set important mailer headers with after_action callback (#32057) 2024-09-24 13:16:31 +00:00
Matt Jankowski
780e2e9d66
Convert notification mailer spec shared examples to matchers (#32047) 2024-09-24 12:07:16 +00:00
renovate[bot]
7c61533111
Update dependency aws-sdk-s3 to v1.165.0 (#32050)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-24 09:54:25 +00:00
github-actions[bot]
11ac5c8929
New Crowdin Translations (automated) (#32052)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-24 09:42:14 +00:00
Claire
c808055fc3
Update dependency webrick (#32054) 2024-09-24 08:16:22 +00:00
Eugen Rochko
d54ce67dc9
Change hide media button to be in top right corner in web UI (#32048) 2024-09-24 08:00:20 +00:00
Claire
6551129aff
Merge pull request #2853 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 5dfdec6453
2024-09-24 09:44:10 +02:00
Claire
38744a4e51 [Glitch] Change mobile breakpoint back to old version and allow main column to shrink
Port b5bdc69f7b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-23 20:26:05 +02:00
Claire
c2c3a66478 Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream 2024-09-23 20:24:18 +02:00
Matt Jankowski
5dfdec6453
Convert settings/applications controller spec to system/request specs (#32006) 2024-09-23 13:37:32 +00:00
Eugen Rochko
aaab6b7adc
Add reblogs and favourites counts to statuses in ActivityPub (#32007) 2024-09-23 13:14:15 +00:00
Claire
b5bdc69f7b
Change mobile breakpoint back to old version and allow main column to shrink (#32033) 2024-09-23 12:53:35 +00:00
Matt Jankowski
bbf7752256
Combine assertions in Notification model spec (#32015) 2024-09-23 10:45:34 +00:00