1
0
mirror of https://github.com/funamitech/mastodon synced 2024-11-23 14:46:52 +09:00
Commit Graph

14653 Commits

Author SHA1 Message Date
Noa Himesaka
ce801c6e63
Merge branch 'glitch-soc:main' into main 2024-11-19 20:05:03 +09:00
Claire
e8c108d270
Fix collapse icon opening the post (#2899) 2024-11-16 21:39:12 +01:00
Emelia Smith
0e9ab5363a [Glitch] Improve display of statuses in admin panel
Port ddfb3d123b to glitch-soc (CSS only)

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-11-15 19:06:23 +01:00
Claire
18aa0d8871 [Glitch] Fix Content Warning and filter states not applying to boosted posts properly (refactor only)
Port ec663eaba1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-11-15 19:03:39 +01:00
Eugen Rochko
e86c1c814b [Glitch] Fix a few visual issues with annual reports in web UI
Port 32e5e1d3f1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-11-15 19:00:15 +01:00
Christian Schmidt
e98891f4e5 [Glitch] Backspace hotkey should override default behaviour
Port 157fba4698 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-11-15 18:51:06 +01:00
Claire
4f1242964b Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream 2024-11-15 18:44:32 +01:00
Matt Jankowski
319109029d
Fix logic in "last used at per application" oauth token list (#32912) 2024-11-15 15:52:37 +00:00
Matt Jankowski
297ce9ef44
Move body class to shared partial for web app controller concern views (#31797) 2024-11-15 15:49:26 +00:00
Shlee
34d7c9edae
Rails 7+: primary_abstract_class recommendation (#32909) 2024-11-15 15:37:30 +00:00
Claire
0838cf1e05
Fix domain attribution field having autocorrect and autocapitalize enabled (#32903) 2024-11-15 13:37:45 +00:00
github-actions[bot]
c546aa57cb
New Crowdin Translations (automated) (#32900)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-15 10:30:11 +00:00
Emelia Smith
ddfb3d123b
Improve display of statuses in admin panel (#30813) 2024-11-15 09:38:01 +00:00
Claire
2de018256a
Fix filters not being correctly applied to boosted posts (#32895) 2024-11-14 19:42:43 +00:00
Matt Jankowski
766358e52b
Add coverage for malformed version cleanup in SoftwareUpdateCheckService, add helper query methods (#32876) 2024-11-14 14:03:57 +00:00
Matt Jankowski
62d65504f6
Add DomainResource class to wrap MX lookup/normalize (#32864) 2024-11-14 13:47:29 +00:00
Claire
e8b6607ece
Fix titles being escaped twice (#32889) 2024-11-14 13:28:00 +00:00
Claire
ec663eaba1
Fix Content Warning and filter states not applying to boosted posts properly (#32887) 2024-11-14 12:50:36 +00:00
github-actions[bot]
aaebf142aa
New Crowdin Translations (automated) (#32884)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-14 09:39:33 +00:00
Claire
8f5cbf5370
Fix list creation limit check (#32869) 2024-11-13 10:22:11 +00:00
github-actions[bot]
baad795384
New Crowdin Translations (automated) (#32868)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-13 09:33:02 +00:00
Emelia Smith
2bd56f726a
Add client_secret_expires_at to OAuth Applications (#30317) 2024-11-12 22:06:13 +00:00
Claire
f5f6273d2b
Move ALLOWED_PRIVATE_ADDRESSES parsing to an initializer (#32850) 2024-11-12 13:00:52 +00:00
Eugen Rochko
32e5e1d3f1
Fix a few visual issues with annual reports in web UI (#32807) 2024-11-12 12:35:35 +00:00
Matt Jankowski
5d9dde3ec0
Add age/expiry duration constants to BulkImport class (#32839) 2024-11-12 08:57:06 +00:00
Emelia Smith
bf609090b1
Fix: prevent linking to pages which require extra permissions (#32843) 2024-11-12 08:55:17 +00:00
github-actions[bot]
0d06d70d11
New Crowdin Translations (automated) (#32811)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-12 08:47:59 +00:00
Matt Jankowski
ea6d3ca8c1
Define constants for sampling sizes in AccountReachFinder (#32805) 2024-11-12 08:38:08 +00:00
Emelia Smith
a34edc211f
Add audit logging to Relays (#32819) 2024-11-12 08:35:08 +00:00
Matt Jankowski
c099797700
Use mastodon config namespace to load software update default value via config_for (#30534) 2024-11-12 08:28:31 +00:00
Emelia Smith
aeae152006
Prevent Web::Push notification delivery if notification is outside of TTL window (#32842) 2024-11-11 19:56:28 +00:00
Claire
1ae5f84774
Fix clicking on avatar/display opening status instead of profile (#2897)
Fix regression from #2895
2024-11-11 16:11:24 +01:00
Matt Jankowski
c78dc23b49
Move account sensitize-related methods to concern (#28865) 2024-11-11 13:08:23 +00:00
Matt Jankowski
d033920b7e
Move account silence-related methods to concern (#28866) 2024-11-11 08:29:55 +00:00
Noa Himesaka
5c18104101 Merge branch 'pr2462' 2024-11-11 13:46:02 +09:00
Noa Himesaka
8f563dd680 Merge branch 'main' of https://github.com/glitch-soc/mastodon 2024-11-11 13:44:26 +09:00
Claire
b7a66c6eac
Fix status clickable area (#2895) 2024-11-10 22:43:27 +01:00
github-actions[bot]
d29f27fad7
New Crowdin Translations (automated) (#2851)
* New Crowdin translations

* Update simple_form.no.yml

* Update no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-11-10 22:07:04 +01:00
Christian Schmidt
157fba4698
Backspace hotkey should override default behaviour (#32826) 2024-11-10 16:16:07 +00:00
Claire
f3eac6f45a [Glitch] Fix list of follow requests not having a back button
Port 6ae1fcd059 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-11-10 13:50:14 +01:00
Claire
80378921e6 [Glitch] Fix out-of-view post contents being inconsistent with in-view post contents
Port d482211aa6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-11-10 13:50:14 +01:00
Eugen Rochko
3244926565 [Glitch] Add year in review feature to web UI
Port d6349c0e9a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-11-10 13:50:14 +01:00
Claire
d19d7a283e [Glitch] Fix alt-text pop-in not using the translated description
Port 0a1b5df202 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-11-10 13:29:04 +01:00
Claire
f0f807cec7 Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream 2024-11-10 13:18:43 +01:00
Matt Jankowski
1e71c4e247
Use enum-generated IpBlock.severity... scopes (#31210) 2024-11-08 14:23:52 +00:00
Matt Jankowski
10c895dc84
Use existing arel scopes instead of string ordering (#32801) 2024-11-08 14:21:44 +00:00
Matt Jankowski
bde0f1239a
Add InetContainer with scopes of containing and contained (#32802) 2024-11-08 10:08:36 +00:00
Matt Jankowski
df54196a14
Use touch_all with batches (#32799) 2024-11-08 10:00:15 +00:00
github-actions[bot]
8df867b20a
New Crowdin Translations (automated) (#32803)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-08 09:53:47 +00:00
Essem
4563b3a1c9
Fix invisible reactions on detailed statuses when logged out 2024-11-07 20:22:28 -06:00