From 566db6c406c9b6905fbf154e18a89312258c41f0 Mon Sep 17 00:00:00 2001 From: Ben Parsons Date: Tue, 25 Feb 2020 17:29:59 +0000 Subject: [PATCH 1/6] link to matrix.org/security-disclosure-policy in help screen --- .../views/settings/tabs/user/HelpUserSettingsTab.js | 9 +++++++++ src/i18n/strings/en_EN.json | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js index 258b55bb4e..1222cc1634 100644 --- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js +++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js @@ -225,6 +225,15 @@ export default class HelpUserSettingsTab extends React.Component { {_t("Clear cache and reload")} + { + _t( "To submit a security-related bug report, please read the Matrix.org " + + "Security Disclosure Policy.", {}, + { + 'a': (sub) => + {sub}, + }) + }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index f702da6b4c..9223c13408 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -2133,5 +2133,6 @@ "Message downloading sleep time(ms)": "Message downloading sleep time(ms)", "Failed to set direct chat tag": "Failed to set direct chat tag", "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room", - "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room" + "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room", + "To submit a security-related bug report, please read the Matrix.org Security Disclosure Policy.": "To submit a security-related bug report, please read the Matrix.org Security Disclosure Policy." } From 92bc3e83ef08d99739961f81c22eeb529a72ca6a Mon Sep 17 00:00:00 2001 From: Ben Parsons Date: Tue, 25 Feb 2020 17:57:31 +0000 Subject: [PATCH 2/6] yarn i18n --- src/i18n/strings/en_EN.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 9223c13408..c0470af357 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -725,6 +725,7 @@ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.", "Submit debug logs": "Submit debug logs", "Clear cache and reload": "Clear cache and reload", + "To submit a security-related bug report, please read the Matrix.org Security Disclosure Policy.": "To submit a security-related bug report, please read the Matrix.org Security Disclosure Policy.", "FAQ": "FAQ", "Versions": "Versions", "riot-web version:": "riot-web version:", @@ -2133,6 +2134,5 @@ "Message downloading sleep time(ms)": "Message downloading sleep time(ms)", "Failed to set direct chat tag": "Failed to set direct chat tag", "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room", - "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room", - "To submit a security-related bug report, please read the Matrix.org Security Disclosure Policy.": "To submit a security-related bug report, please read the Matrix.org Security Disclosure Policy." + "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room" } From c99db2c38543abc9b983d4ae7ed4142383c2d642 Mon Sep 17 00:00:00 2001 From: Ben Parsons Date: Thu, 27 Feb 2020 18:54:11 +0000 Subject: [PATCH 3/6] sanitise quotes --- .../views/settings/tabs/user/HelpUserSettingsTab.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js index 1222cc1634..84403fe76e 100644 --- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js +++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js @@ -163,7 +163,7 @@ export default class HelpUserSettingsTab extends React.Component { render() { let faqText = _t('For help with using Riot, click here.', {}, { 'a': (sub) => - {sub}, + {sub}, }); if (SdkConfig.get().welcomeUserId && getCurrentLanguage().startsWith('en')) { faqText = ( @@ -231,7 +231,7 @@ export default class HelpUserSettingsTab extends React.Component { { 'a': (sub) => {sub}, + rel="noreferrer noopener" target="_blank">{sub}, }) }
From a6882cece188c95b988c1d815771088e36b946bd Mon Sep 17 00:00:00 2001 From: Ben Parsons Date: Thu, 5 Mar 2020 14:10:44 +0000 Subject: [PATCH 4/6] increase margin between Settings sections --- res/css/views/settings/tabs/_SettingsTab.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss index 794c8106be..9727946893 100644 --- a/res/css/views/settings/tabs/_SettingsTab.scss +++ b/res/css/views/settings/tabs/_SettingsTab.scss @@ -45,6 +45,10 @@ limitations under the License. margin: 10px 100px 10px 0; // Align with the rest of the view } +.mx_SettingsTab_section { + margin-bottom: 24px; +} + .mx_SettingsTab_section .mx_SettingsFlag { margin-right: 100px; margin-bottom: 10px; From ce849672257e395ee0cd21a7e05db86fcebc6ea6 Mon Sep 17 00:00:00 2001 From: Ben Parsons Date: Thu, 5 Mar 2020 14:18:12 +0000 Subject: [PATCH 5/6] update Security Disclosure Policy link text --- src/components/views/settings/tabs/user/HelpUserSettingsTab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js index 84403fe76e..8e7983970a 100644 --- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js +++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js @@ -226,7 +226,7 @@ export default class HelpUserSettingsTab extends React.Component { { - _t( "To submit a security-related bug report, please read the Matrix.org " + + _t( "To report a Matrix-related security issue, please read the Matrix.org " + "Security Disclosure Policy.", {}, { 'a': (sub) => From d28d330b330dce39857678f033315f3814eb9dc0 Mon Sep 17 00:00:00 2001 From: Ben Parsons Date: Thu, 5 Mar 2020 14:33:40 +0000 Subject: [PATCH 6/6] run yarn i18n --- src/i18n/strings/en_EN.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index c0470af357..d3dc1f0652 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -725,7 +725,7 @@ "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.", "Submit debug logs": "Submit debug logs", "Clear cache and reload": "Clear cache and reload", - "To submit a security-related bug report, please read the Matrix.org Security Disclosure Policy.": "To submit a security-related bug report, please read the Matrix.org Security Disclosure Policy.", + "To report a Matrix-related security issue, please read the Matrix.org Security Disclosure Policy.": "To report a Matrix-related security issue, please read the Matrix.org Security Disclosure Policy.", "FAQ": "FAQ", "Versions": "Versions", "riot-web version:": "riot-web version:",