Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3642757
Fix: Ignore non-http/https protocols in Service Worker handleFetch (#…
OriginalRoOhi Jun 22, 2026
7198db5
Fix visible transparent navigation link borders in Windows forced-con…
diondiondion Jun 26, 2026
27c66a9
fix tootctl media lookup fails on local media URLs (#39615)
brookmiles Jun 29, 2026
1fd5fe7
Always use `public/packs` and not `public/packs-test` for assets (#39…
ClearlyClaire Jun 25, 2026
a45af2e
Fix encryption warning "read more" link (#39635)
thomas-pike Jun 29, 2026
3a6e78e
Render post images in emails (#39636)
diondiondion Jun 26, 2026
ad3228b
Fix follow button floating on profiles when overview landing page is …
FFederi Jun 29, 2026
78681a3
Fix invisible username during post highlight animation (#39659)
diondiondion Jun 29, 2026
291b1d9
Fix visual glitch with the spoiler button (#39677)
ChaosExAnima Jul 1, 2026
9bd073b
Fix duplicate "clear" button shown in main search input in Chrome (#3…
diondiondion Jul 1, 2026
635764b
Add missing `to_json` to publish announcement reaction worker (#39685)
mjankowski Jul 1, 2026
94b897f
Fix incorrect filter cache key sometimes causing incorrect filters to…
ClearlyClaire Jul 2, 2026
06d6451
New Crowdin translations
web-flow Jul 2, 2026
7db2a99
Don't display 'view collection' menu item on collection page (#39694)
mkljczk Jul 2, 2026
f4cdbb9
Add “Update available” navigation item at top of navbar when new Mast…
ClearlyClaire Jul 3, 2026
03fe80c
Update dependency `crass`
ClearlyClaire Jul 3, 2026
c52e87d
Update dependency `msgpack`
ClearlyClaire Jul 3, 2026
776e667
New Crowdin translations
web-flow Jul 3, 2026
eeb6805
Bump version to v4.6.3
ClearlyClaire Jul 3, 2026
e0ed492
Merge remote-tracking branch 'parent/stable-4.6' into kb-draft-24.2-lts
kmycode Jul 3, 2026
2be51ad
Bump version to 24.2-lts
kmycode Jul 4, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,31 @@

All notable changes to this project will be documented in this file.

## [4.6.3] - 2026-07-03

### Security

- Update dependencies

### Added

- Add “Update available” navigation item at top of navbar when new Mastodon versions are available (#39705 by @ClearlyClaire)
- Add rendering of post images in emails (#39636 by @diondiondion)

### Fixed

- Fix “view collection” menu item appearing on collection page (#39694 by @mkljczk)
- Fix incorrect filter cache key sometimes causing incorrect filters to be applied (#39698 by @ClearlyClaire)
- Fix missing `to_json` to publish announcement reaction worker (#39685 by @mjankowski)
- Fix duplicate "clear" button shown in main search input in Chrome (#39679 by @diondiondion)
- Fix visual glitch with the spoiler button (#39677 by @ChaosExAnima)
- Fix invisible username during post highlight animation (#39659 by @diondiondion)
- Fix follow button floating on profiles when overview landing page is enabled (#39650 by @FFederi)
- Fix encryption warning "read more" link (#39635 by @thomas-pike)
- Fix `tootctl media lookup` failing on some setups (#39615 by @brookmiles)
- Fix visible transparent navigation link borders in Windows forced-contrast mode (#39614 by @diondiondion)
- Fix crash with some browser extensions injecting custom elements in the page (#39507 by @OriginalRoOhi)

## [4.6.2] - 2026-06-25

### Security
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ GEM
crack (1.0.1)
bigdecimal
rexml
crass (1.0.6)
crass (1.0.7)
css_parser (3.0.0)
addressable
ssrf_filter (~> 1.5)
Expand Down Expand Up @@ -451,7 +451,7 @@ GEM
minitest (6.0.6)
drb (~> 2.0)
prism (~> 1.5)
msgpack (1.8.1)
msgpack (1.8.3)
multi_json (1.21.1)
mutex_m (0.3.0)
net-http (0.9.1)
Expand Down
4 changes: 2 additions & 2 deletions app/javascript/mastodon/components/spoiler_button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const SpoilerButton: React.FC<Props> = ({
action = (
<FormattedMessage id='status.media.open' defaultMessage='Click to open' />
);
} else if (matchedFilters) {
} else if (matchedFilters?.length) {
warning = (
<FormattedMessage
id='filter_warning.matches_filter'
Expand Down Expand Up @@ -80,7 +80,7 @@ export const SpoilerButton: React.FC<Props> = ({
disabled={uncached}
>
<span className='spoiler-button__overlay__label'>
{warning}
<span className='spoiler-button__overlay__text'>{warning}</span>
<span className='spoiler-button__overlay__action'>{action}</span>
</span>
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,7 @@ export const CollectionMenu: React.FC<{
return ownerItems;
}
} else {
const nonOwnerItems: MenuItem[] = [
viewCollectionItem,
...shareItems,
null,
];
const nonOwnerItems: MenuItem[] = [...shareItems, null];

// Collection notifications already have a prominent 'Remove me' button
if (currentAccountInCollection && context !== 'notifications') {
Expand All @@ -189,6 +185,10 @@ export const CollectionMenu: React.FC<{
});
}

if (context !== 'collection') {
return [viewCollectionItem, ...nonOwnerItems];
}

return nonOwnerItems;
}
}, [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,8 @@ export const Search: React.FC<{
<input
ref={searchInputRef}
className='search__input'
type='search'
type='text'
inputMode='search'
placeholder={intl.formatMessage(
signedIn ? messages.placeholderSignedIn : messages.placeholder,
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ export const Warning = () => {
id='compose_form.encryption_warning'
defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.'
/>{' '}
<a href='/terms' target='_blank'>
<a
href='https://docs.joinmastodon.org/user/posting/#private'
rel='noreferrer'
target='_blank'
>
<FormattedMessage
id='compose_form.direct_message_warning_learn_more'
defaultMessage='Learn more'
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/mastodon/features/ui/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ class UI extends PureComponent {
cheat: this.handleDonate,
};

const minimalShell = !this.props.identity.signedIn && landingPage === 'overview';
const minimalShell = !this.props.identity.signedIn && landingPage === 'overview' && location.pathname.startsWith('/overview');

return (
<Hotkeys global handlers={handlers}>
Expand Down
3 changes: 2 additions & 1 deletion app/javascript/mastodon/locales/be.json
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@
"admin.impact_report.instance_followers": "Падпісчыкі, якіх страцяць нашыя карыстальнікі",
"admin.impact_report.instance_follows": "Падпісчыкі, якіх могуць страціць іх карыстальнікі",
"admin.impact_report.title": "Агульны ўплыў",
"alert.need_reload.message": "Mastodon быў абноўлены. Некаторыя функцыі могуць працаваць некарэктна, пакуль Вы не перазагрузіце старонку.",
"alert.rate_limited.message": "Калі ласка, паспрабуйце праз {retry_time, time, medium}.",
"alert.rate_limited.title": "Ліміт перавышаны",
"alert.unexpected.message": "Узнікла нечаканая памылка.",
Expand Down Expand Up @@ -637,7 +638,7 @@
"empty_column.account_featured.other": "{acct} пакуль нічога не адабраў(-ла) для паказу.",
"empty_column.account_featured_self.no_collections_button": "Стварыць калекцыю",
"empty_column.account_featured_self.no_collections_hide_tab": "Або схаваць гэтую ўкладку",
"empty_column.account_featured_self.showcase_accounts": "Паказаць Вашыя ўлюбёныя ўліковыя запісы",
"empty_column.account_featured_self.showcase_accounts": "Пакажыце свае ўлюбёныя ўліковыя запісы",
"empty_column.account_featured_self.showcase_accounts_desc": "Калекцыі — спісы адабраных уліковых запісаў, якія дапамагаюць іншым знаходзіць нешта новае ў федэральным сусвеце.",
"empty_column.account_featured_unknown.other": "Гэты ўліковы запіс пакуль нічога не адабраў для паказу.",
"empty_column.account_hides_collections": "Гэты карыстальнік вырашыў схаваць гэтую інфармацыю",
Expand Down
Loading
Loading