From e6e89747854e34765b5291fe19fd76bc2d97b26d Mon Sep 17 00:00:00 2001 From: diondiondion Date: Tue, 1 Jul 2025 10:53:43 +0200 Subject: [PATCH 1/4] fix: Fix column header overlapping mobile menu on old Safari (#35225) --- app/javascript/styles/mastodon/components.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index d783d717ef1..6ab225369d7 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -3247,6 +3247,7 @@ a.account__display-name { .columns-area__panels__pane--overlay { pointer-events: auto; background: rgba($base-overlay-background, 0.5); + z-index: 3; .columns-area__panels__pane__inner { box-shadow: var(--dropdown-shadow); From dd064aaa36ddcab1d3f70ca1e5ef089d39d9d527 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 1 Jul 2025 11:02:26 +0200 Subject: [PATCH 2/4] New Crowdin Translations (automated) (#35224) Co-authored-by: GitHub Actions --- app/javascript/mastodon/locales/ko.json | 3 +++ app/javascript/mastodon/locales/sv.json | 1 + config/locales/ko.yml | 3 ++- config/locales/sv.yml | 9 +++++++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 337cf16ba9d..6c2cc7ea142 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -222,6 +222,9 @@ "confirmations.discard_draft.confirm": "삭제 및 계속", "confirmations.discard_draft.edit.cancel": "계속 편집", "confirmations.discard_draft.edit.message": "편집중인 게시물 변경사항을 모두 잃게 됩니다.", + "confirmations.discard_draft.edit.title": "게시물 변경사항을 삭제할까요?", + "confirmations.discard_draft.post.cancel": "초안으로 돌아가기", + "confirmations.discard_draft.post.message": "작성하고 있던 변경사항을 잃게 됩니다.", "confirmations.discard_draft.post.title": "게시물 초안을 삭제할까요?", "confirmations.discard_edit_media.confirm": "저장 안함", "confirmations.discard_edit_media.message": "미디어 설명이나 미리보기에 대한 저장하지 않은 변경사항이 있습니다. 버리시겠습니까?", diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json index 3bb5e547eae..9eee2e750f9 100644 --- a/app/javascript/mastodon/locales/sv.json +++ b/app/javascript/mastodon/locales/sv.json @@ -219,6 +219,7 @@ "confirmations.delete_list.confirm": "Radera", "confirmations.delete_list.message": "Är du säker på att du vill radera denna lista permanent?", "confirmations.delete_list.title": "Ta bort listan?", + "confirmations.discard_draft.confirm": "Släng bort och fortsätt", "confirmations.discard_edit_media.confirm": "Kasta", "confirmations.discard_edit_media.message": "Du har osparade ändringar till mediabeskrivningen eller förhandsgranskningen, kasta bort dem ändå?", "confirmations.follow_to_list.confirm": "Följ och lägg till i listan", diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 926e98a87f3..cc6665c1cb7 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -500,7 +500,7 @@ ko: title: FASP 가입 확인 save: 저장 select_capabilities: 권한 선택 - sign_in: 가입 + sign_in: 로그인 status: 상태 title: 연합우주 보조 서비스 제공자 title: FASP @@ -574,6 +574,7 @@ ko: created_msg: 서버 중재 참고사항을 만들었습니다! description_html: 확인하고 다른 중재자나 미래의 자신을 위해 참고사항을 작성합니다 destroyed_msg: 서버 중재 참고사항을 삭제했습니다! + placeholder: 이 인스턴스에 대한 정보, 취한 조치, 이후 이 서버를 중재하기 위해 도움이 될 어떤 것이든 좋습니다. title: 중재 참고사항 private_comment: 비공개 주석 public_comment: 공개 주석 diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 055c3457e20..4f011da36ba 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -578,6 +578,13 @@ sv: all: Alla limited: Begränsad title: Moderering + moderation_notes: + create: Lägg till anteckning för modereringen + created_msg: Skapandet av anteckningen för modereringen av den här instansen lyckades! + description_html: Visa och lämna anteckningar för andra moderatorer och ditt framtida jag + destroyed_msg: Borttagningen av anteckningen för modereringen av instansen lyckades! + placeholder: Information om den här instansen, åtgärder som har vidtagits eller något annat som kommer att hjälpa dig att moderera den här instansen i framtiden. + title: Anteckningar för modereringen private_comment: Privat kommentar public_comment: Offentlig kommentar purge: Rensa @@ -1996,6 +2003,8 @@ sv: terms_of_service_changed: agreement: Genom att fortsätta använda %{domain} godkänner du dessa villkor. Om du inte håller med om de uppdaterade villkoren kan du när som helst säga upp ditt avtal med %{domain} genom att radera ditt konto. changelog: 'I korthet, här är vad denna uppdatering innebär för dig:' + description: 'Du får det här e-postmeddelandet eftersom att vi gör vissa ändringar i våra användarvillkor för %{domain}. De här uppdateringarna kommer att börja gälla %{date}. Vi uppmuntrar dig att granska de uppdaterade villkoren här i sin helhet:' + description_html: Du får det här e-postmeddelandet eftersom att vi gör några ändringar till våra användningsvillkor för %{domain}. De här uppdateringarna kommer att börja gälla från %{date}. Vi uppmuntrar dig att granska de uppdaterade villkoren i sin helhet här. sign_off: "%{domain} teamet" subject: Uppdateringar till våra användarvillkor subtitle: Villkoren för tjänsten på %{domain} ändras From 68090cd8be947f3fee0f8f8fc8cfa3fe0d6f5913 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 1 Jul 2025 11:21:32 +0200 Subject: [PATCH 3/4] Bump version to v4.4.0-rc.1 (#35196) --- CHANGELOG.md | 29 ++++++++++++++++++++--------- lib/mastodon/version.rb | 2 +- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26d157c198b..2c00f115c29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,7 @@ All notable changes to this project will be documented in this file. Support for verifying remote quotes according to [FEP-044f](https://codeberg.org/fediverse/fep/src/branch/main/fep/044f/fep-044f.md) and displaying them in the Web UI has been implemented.\ Quoting other people is not implemented yet, and it is currently not possible to mark your own posts as allowing quotes. However, a new “Who can quote” setting has been added to the “Posting defaults” section of the user settings. This setting allows you to set a default that will be used for new posts made on Mastodon 4.5 and newer, when quote posts will be fully implemented.\ In the REST API, quote posts are represented by a new `quote` attribute on `Status` and `StatusEdit` entities: https://docs.joinmastodon.org/entities/StatusEdit/#quote https://docs.joinmastodon.org/entities/Status/#quote -- Add ability to reorder and translate server rules (#34637, #34737, #34494, #34756, #34820 and #34997 by @ChaosExAnima and @ClearlyClaire)\ +- Add ability to reorder and translate server rules (#34637, #34737, #34494, #34756, #34820, #34997, #35170, #35174 and #35174 by @ChaosExAnima and @ClearlyClaire)\ Rules are now shown in the user’s language, if a translation has been set.\ In the REST API, `Rule` entities now have a new `translations` attribute: https://docs.joinmastodon.org/entities/Rule/#translations - Add emoji from Twemoji 15.1.0, including in the emoji picker/completion (#33395, #34321, #34620, and #34677 by @ChaosExAnima, @ClearlyClaire, @TheEssem, and @eramdam) @@ -38,9 +38,11 @@ All notable changes to this project will be documented in this file. Server administrators can now chose to opt in to transmit referrer information when following an external link. Only the domain name is transmitted, not the referrer path. - Add double tap to zoom and swipe to dismiss to media modal in web UI (#34210 by @Gargron) - Add link from Web UI for Hashtags to the Moderation UI (#31448 by @ThisIsMissEm) -- **Add terms of service** (#33055, #33233, #33230, #33703, #33699, #33994, #33993, #34105, #34122, #34200, #34527 and #35053 by @ClearlyClaire, @Gargron, @mjankowski, and @oneiros)\ - Server administrators can now fill in Terms of Service, optionally using a provided template. -- **Add age verification on sign-up** (#34150, #34663, and #34636 by @ClearlyClaire and @Gargron)\ +- **Add terms of service** (#33055, #33233, #33230, #33703, #33699, #33994, #33993, #34105, #34122, #34200, #34527, #35053, #35115, #35126 and #35127 by @ClearlyClaire, @Gargron, @mjankowski, and @oneiros)\ + Server administrators can now fill in Terms of Service and notify their users of upcoming changes. +- Add optional bulk mailer settings (#35191 and #35203 by @oneiros)\ + This adds the optional environment variables `BULK_SMTP_PORT`, `BULK_SMTP_SERVER`, `BULK_SMTP_LOGIN` and so on analogous to `SMTP_PORT`, `SMTP_SERVER`, `SMTP_LOGIN` and related SMTP configuration environment variables.\ + When `BULK_SMTP_SERVER` is set, this group of variables is used instead of the regular ones for sending announcement notification emails and Terms of Service notification emails.- **Add age verification on sign-up** (#34150, #34663, and #34636 by @ClearlyClaire and @Gargron)\ Server administrators now have a setting to set a minimum age requirement for creating a new server, asking users for their date of birth. The date of birth is checked against the minimum age requirement server-side but not stored.\ The following REST API changes have been made to accommodate this: - `registrations.min_age` has been added to the `Instance` entity: https://docs.joinmastodon.org/entities/Instance/#registrations-min_age @@ -48,10 +50,12 @@ All notable changes to this project will be documented in this file. - Add ability to dismiss alt text badge by tapping it in web UI (#33737 by @Gargron) - Add loading indicator to timeline gap indicators in web UI (#33762 by @Gargron) - Add interaction modal when trying to interact with a poll while logged out (#32609 by @ThisIsMissEm) -- **Add experimental FASP support** (#34031, #34415, #34765, #34965, and #34964 by @oneiros)\ +- **Add experimental FASP support** (#34031, #34415, #34765, #34965, #34964, #34033 and #35218 by @oneiros)\ This is a first step towards supporting “Fediverse Auxiliary Service Providers” (https://github.com/mastodon/fediverse_auxiliary_service_provider_specifications). This is mostly interesting to developers who would like to implement their own FASP, but also includes the capability to share data with a discovery provider (see https://www.fediscovery.org). - Add ability for admins to send announcements to all users via email (#33928 and #34411 by @ClearlyClaire)\ This is meant for critical announcements only, as this will potentially send a lot of emails and cannot be opted out of by users. +- Add Server Moderation Notes (#31529 by @ThisIsMissEm) +- Add loading spinner to “Post” button when sending a post (#35153 by @diondiondion) - Add option to use system scrollbar styling (#32117 by @vmstan) - Add hover cards to follow suggestions (#33749 by @ClearlyClaire) - Add `t` hotkey for post translations (#33441 by @ClearlyClaire) @@ -59,7 +63,7 @@ All notable changes to this project will be documented in this file. - Add dropdown menu with quick actions to lists of accounts in web UI (#34391, #34709, and #34767 by @Gargron, @diondiondion, and @mkljczk) - Add support for displaying “year in review” notification in web UI (#32710, #32765, #32709, #32807, #32914, #33148, and #33882 by @Gargron and @mjankowski)\ Note that the notification is currently not generated automatically, and at the moment requires a manual undocumented administrator action. -- Add experimental support for receiving HTTP Message Signatures (RFC9421) (#34814 and #35033 by @oneiros)\ +- Add experimental support for receiving HTTP Message Signatures (RFC9421) (#34814, #35033 and #35109 by @oneiros)\ For now, this needs to be explicitly enabled through the `http_message_signatures` feature flag (`EXPERIMENTAL_FEATURES=http_message_signatures`). This currently only covers verifying such signatures (inbound HTTP requests), not issuing them (outbound HTTP requests). - Add experimental Async Refreshes API (#34918 by @oneiros) - Add experimental server-side feature to fetch remote replies (#32615, #34147, #34149, #34151, #34615, #34682, and #34702 by @ClearlyClaire and @sneakers-the-rat)\ @@ -112,7 +116,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Change design of navigation panel in Web UI, change layout on narrow screens (#34910, #34987, #35017, #34986, #35029, #35065, #35067 and #35072 by @ClearlyClaire, @Gargron, and @diondiondion) +- Change design of navigation panel in Web UI, change layout on narrow screens (#34910, #34987, #35017, #34986, #35029, #35065, #35067, #35072, #35074, #35075, #35101, #35173, #35183, #35193 and #35225 by @ClearlyClaire, @Gargron, and @diondiondion) - Change design of lists in web UI (#32881, #33054, and #33036 by @Gargron) - Change design of edit media modal in web UI (#33516, #33702, #33725, #33725, #33771, and #34345 by @Gargron) - Change design of audio player in web UI (#34520, #34740, #34865, #34929, #34933, and #35034 by @ClearlyClaire, @Gargron, and @diondiondion) @@ -126,15 +130,17 @@ All notable changes to this project will be documented in this file. Moderators will still be able to access them while they are kept, but they won't be accessible to the public in the meantime. - Change language names in compose box language picker to be localized (#33402 by @c960657) - Change onboarding flow in web UI (#32998, #33119, #33471 and #34962 by @ClearlyClaire and @Gargron) +- Change Advanced Web UI to use the new main menu instead of the “Getting started” column (#35117 by @diondiondion) - Change emoji categories in admin interface to be ordered by name (#33630 by @ShadowJonathan) - Change design of rich text elements in web UI (#32633 by @Gargron) - Change wording of “single choice” to “pick one” in poll authoring form (#32397 by @ThisIsMissEm) - Change returned favorite and boost counts to use those provided by the remote server, if available (#32620, #34594, #34618, and #34619 by @ClearlyClaire and @sneakers-the-rat) - Change label of favourite notifications on private mentions (#31659 by @ClearlyClaire) +- Change wording of "discard draft?" confirmation dialogs (#35192 by @diondiondion) - Change `libvips` to be enabled by default in place of ImageMagick (#34741 and #34753 by @ClearlyClaire and @diondiondion) - Change avatar and header size limits from 2MB to 8MB when using libvips (#33002 by @Gargron) - Change search to use query params in web UI (#32949 and #33670 by @ClearlyClaire and @Gargron) -- Change build system from Webpack to Vite (#34454, #34450, #34758, #34768, #34813, #34808, #34837, #34732, #35007 and #35035 by @ChaosExAnima, @ClearlyClaire, @mjankowski, and @renchap) +- Change build system from Webpack to Vite (#34454, #34450, #34758, #34768, #34813, #34808, #34837, #34732, #35007, #35035 and #35177 by @ChaosExAnima, @ClearlyClaire, @mjankowski, and @renchap) - Change account creation API to forbid creation from user tokens (#34828 by @ThisIsMissEm) - Change `/api/v2/instance` to be enabled without authentication when limited federation mode is enabled (#34576 by @ClearlyClaire) - Change `DEFAULT_LOCALE` to not override unauthenticated users’ browser language (#34535 by @ClearlyClaire)\ @@ -202,17 +208,22 @@ All notable changes to this project will be documented in this file. - Fix not being able to scroll dropdown on touch devices in web UI (#34873 by @Gargron) - Fix inconsistent filtering of silenced accounts for other silenced accounts (#34863 by @ClearlyClaire) - Fix update checker listing updates older or equal to current running version (#33906 by @ClearlyClaire) +- Fix clicking a status multiple times causing duplicate entries in browser history (#35118 by @ClearlyClaire) +- Fix “Alt text” button submitting form in moderation interface (#35147 by @ClearlyClaire) +- Fix Firefox sometimes not updating spellcheck language in textarea (#35148 by @ClearlyClaire) - Fix `NoMethodError` in edge case of emoji cache handling (#34749 by @dariusk) - Fix handling of inlined `featured` collections in ActivityPub actor objects (#34789 and #34811 by @ClearlyClaire) - Fix long link names in admin sidebar being truncated (#34727 by @diondiondion) - Fix admin dashboard crash on specific Elasticsearch connection errors (#34683 by @ClearlyClaire) - Fix OIDC account creation failing for long display names (#34639 by @defnull) - Fix use of the deprecated `/api/v1/instance` endpoint in the moderation interface (#34613 by @renchap) +- Fix search operators sometimes getting lost (#35190 by @ClearlyClaire) - Fix directory scroll position reset (#34560 by @przucidlo) - Fix needlessly complex SVG paths for oEmbed and logo (#34538 by @edent) - Fix avatar sizing with long account name in some UI elements (#34514 by @gomasy) - Fix empty menu section in status dropdown (#34431 by @ClearlyClaire) - Fix the delete suggestion button not working (#34396 and #34398 by @ClearlyClaire and @renchap) +- Fix popover/dialog backgrounds not being blurred on older Webkit browsers (#35220 by @diondiondion) - Fix radio buttons not always being correctly centered (#34389 by @ChaosExAnima) - Fix visual glitches with adding post filters (#34387 by @ChaosExAnima) - Fix bugs with upload progress (#34325 by @ChaosExAnima) @@ -220,7 +231,7 @@ All notable changes to this project will be documented in this file. - Fix extra space under left-indented vertical videos (#34313 by @ClearlyClaire) - Fix glitchy iOS media attachment drag interactions (#35057 by @diondiondion) - Fix zoomed images being blurry in Safari (#35052 by @diondiondion) -- Fix redundant focus stop within status component in Web UI (#35037 and #35051 by @diondiondion) +- Fix redundant focus stop within status component in Web UI and make focus style more noticeable (#35037, #35051, #35096 and #35150 by @diondiondion) - Fix digits in media player time readout not having a consistent width (#35038 by @diondiondion) - Fix wrong text color for “Open in advanced web interface” banner in high-contrast theme (#35032 by @diondiondion) - Fix hover card for limited accounts not hiding information as expected (#35024 by @diondiondion) diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index c30fd7ae1e8..a06a2b0226b 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -17,7 +17,7 @@ module Mastodon end def default_prerelease - 'beta.2' + 'rc.1' end def prerelease From a203a05eb10db82e1db2d75398e0261cfe4d33e4 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 1 Jul 2025 14:31:55 +0200 Subject: [PATCH 4/4] Fix missing newline in changelog (#35227) --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c00f115c29..efdd3adf120 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,7 +42,8 @@ All notable changes to this project will be documented in this file. Server administrators can now fill in Terms of Service and notify their users of upcoming changes. - Add optional bulk mailer settings (#35191 and #35203 by @oneiros)\ This adds the optional environment variables `BULK_SMTP_PORT`, `BULK_SMTP_SERVER`, `BULK_SMTP_LOGIN` and so on analogous to `SMTP_PORT`, `SMTP_SERVER`, `SMTP_LOGIN` and related SMTP configuration environment variables.\ - When `BULK_SMTP_SERVER` is set, this group of variables is used instead of the regular ones for sending announcement notification emails and Terms of Service notification emails.- **Add age verification on sign-up** (#34150, #34663, and #34636 by @ClearlyClaire and @Gargron)\ + When `BULK_SMTP_SERVER` is set, this group of variables is used instead of the regular ones for sending announcement notification emails and Terms of Service notification emails. +- **Add age verification on sign-up** (#34150, #34663, and #34636 by @ClearlyClaire and @Gargron)\ Server administrators now have a setting to set a minimum age requirement for creating a new server, asking users for their date of birth. The date of birth is checked against the minimum age requirement server-side but not stored.\ The following REST API changes have been made to accommodate this: - `registrations.min_age` has been added to the `Instance` entity: https://docs.joinmastodon.org/entities/Instance/#registrations-min_age