From 62852252dd76c6cc559d1cfb3b276c84791b074e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=B5=E3=82=8B=E3=81=B5=E3=82=8B?= Date: Tue, 11 Jun 2019 02:26:43 +0900 Subject: [PATCH 1/2] Fix can't save preference other (#11042) --- app/views/settings/preferences/other/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml index c966a16bc..db7d806bc 100644 --- a/app/views/settings/preferences/other/show.html.haml +++ b/app/views/settings/preferences/other/show.html.haml @@ -1,7 +1,7 @@ - content_for :page_title do = t('settings.preferences') -= simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f| += simple_form_for current_user, url: settings_preferences_other_path, html: { method: :put } do |f| = render 'shared/error_messages', object: current_user .fields-group From 5bcd98172c2d0ec4827e396a3648eb1e94634c55 Mon Sep 17 00:00:00 2001 From: ThibG Date: Mon, 10 Jun 2019 19:27:10 +0200 Subject: [PATCH 2/2] Fix clicking on the left side of a conversation not marking it as read (#11041) --- app/javascript/mastodon/components/status.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js index a795b8ce9..aa5e870dc 100644 --- a/app/javascript/mastodon/components/status.js +++ b/app/javascript/mastodon/components/status.js @@ -171,6 +171,11 @@ class Status extends ImmutablePureComponent { } handleExpandClick = (e) => { + if (this.props.onClick) { + this.props.onClick(); + return; + } + if (e.button === 0) { if (!this.context.router) { return;