From 53796f55be5924c94ed3ee07a21363be29272a3e Mon Sep 17 00:00:00 2001
From: Pablo Saavedra <psaavedra@igalia.com>
Date: Mon, 8 May 2017 12:25:45 +0200
Subject: [PATCH 1/7] Added default_federate property
---
config.sample.json | 1 +
1 file changed, 1 insertion(+)
diff --git a/config.sample.json b/config.sample.json
index a65646ac..94df4943 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -6,6 +6,7 @@
"integrations_rest_url": "https://scalar.vector.im/api",
"bug_report_endpoint_url": "https://vector.im/bugs",
"enableLabs": true,
+ "default_federate": true,
"roomDirectory": {
"servers": [
"matrix.org"
From 29f43f8fe8d37449dcac358f65e2787bbab9d6e9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 2 Aug 2017 14:01:32 +0100
Subject: [PATCH 2/7] add styling for TextInputWithCheckboxDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/skins/vector/css/_common.scss | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/skins/vector/css/_common.scss b/src/skins/vector/css/_common.scss
index 3189deb0..b40ed56d 100644
--- a/src/skins/vector/css/_common.scss
+++ b/src/skins/vector/css/_common.scss
@@ -258,12 +258,12 @@ textarea {
color: $warning-color;
}
-.mx_TextInputDialog_label {
+.mx_TextInputDialog_label, .mx_TextInputWithCheckboxDialog_label {
text-align: left;
padding-bottom: 12px;
}
-.mx_TextInputDialog_input {
+.mx_TextInputDialog_input, .mx_TextInputWithCheckboxDialog_input {
font-size: 15px;
border-radius: 3px;
border: 1px solid $input-border-color;
From f0967d4f18188a926ebf0e495a40c1b56dcf04e6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 17 Aug 2017 13:31:09 +0100
Subject: [PATCH 3/7] split css out as the modal is no longer generic
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/skins/vector/css/_common.scss | 4 +--
src/skins/vector/css/_components.scss | 1 +
.../views/dialogs/_CreateRoomDialog.scss | 33 +++++++++++++++++++
3 files changed, 36 insertions(+), 2 deletions(-)
create mode 100644 src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateRoomDialog.scss
diff --git a/src/skins/vector/css/_common.scss b/src/skins/vector/css/_common.scss
index b40ed56d..3189deb0 100644
--- a/src/skins/vector/css/_common.scss
+++ b/src/skins/vector/css/_common.scss
@@ -258,12 +258,12 @@ textarea {
color: $warning-color;
}
-.mx_TextInputDialog_label, .mx_TextInputWithCheckboxDialog_label {
+.mx_TextInputDialog_label {
text-align: left;
padding-bottom: 12px;
}
-.mx_TextInputDialog_input, .mx_TextInputWithCheckboxDialog_input {
+.mx_TextInputDialog_input {
font-size: 15px;
border-radius: 3px;
border: 1px solid $input-border-color;
diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index 00c19b13..2cfad159 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -20,6 +20,7 @@
@import "./matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss";
@import "./matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss";
@import "./matrix-react-sdk/views/dialogs/_CreateGroupDialog.scss";
+@import "./matrix-react-sdk/views/dialogs/_CreateRoomDialog.scss";
@import "./matrix-react-sdk/views/dialogs/_EncryptedEventDialog.scss";
@import "./matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss";
@import "./matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss";
diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateRoomDialog.scss b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateRoomDialog.scss
new file mode 100644
index 00000000..888f147d
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateRoomDialog.scss
@@ -0,0 +1,33 @@
+/*
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_CreateRoomDialog_details_summary {
+ outline: none;
+}
+
+.mx_CreateRoomDialog_label {
+ text-align: left;
+ padding-bottom: 12px;
+}
+
+.mx_CreateRoomDialog_input {
+ font-size: 15px;
+ border-radius: 3px;
+ border: 1px solid $input-border-color;
+ padding: 9px;
+ color: $primary-fg-color;
+ background-color: $primary-bg-color;
+}
From 85a590ad5af64d9ebb7283b91648d7877c6eaffa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Wed, 4 Oct 2017 23:41:54 +0100
Subject: [PATCH 4/7] Remove trailing comma in JSON
---
src/i18n/strings/nb_NO.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 32304285..77132a61 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -108,5 +108,5 @@
"Friday": "Fredag",
"Saturday": "Lørdag",
"Today": "I dag",
- "Yesterday": "I går",
+ "Yesterday": "I går"
}
From a5e41102bc4d679aa41ba49445553ee01bcfa397 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Wed, 4 Oct 2017 23:42:27 +0100
Subject: [PATCH 5/7] Remove trailing comma in JSON
---
src/i18n/strings/be.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/i18n/strings/be.json b/src/i18n/strings/be.json
index 492513a3..ed831d39 100644
--- a/src/i18n/strings/be.json
+++ b/src/i18n/strings/be.json
@@ -72,5 +72,5 @@
"Source URL": "URL-адрас крыніцы",
"The Home Server may be too old to support third party networks": "Хатні сервер можа быць занадта стары для падтрымкі іншых сетак",
"There are advanced notifications which are not shown here": "Ёсць пашыраныя апавяшчэння, якія не паказаныя тут",
- "The server may be unavailable or overloaded": "Сервер можа быць недаступны ці перагружаны",
+ "The server may be unavailable or overloaded": "Сервер можа быць недаступны ці перагружаны"
}
From e39730d52e8fa3d5ca0b5d8955d79f64aaef414e Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Wed, 11 Oct 2017 09:56:38 +0100
Subject: [PATCH 6/7] Say which translation file failed (#5196)
So we can see which i18n file is invalid when it fails
---
scripts/copy-res.js | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/scripts/copy-res.js b/scripts/copy-res.js
index 59f71692..b461d030 100755
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -160,10 +160,15 @@ function genLangFile(lang, dest) {
let translations = {};
[reactSdkFile, riotWebFile].forEach(function(f) {
if (fs.existsSync(f)) {
- Object.assign(
- translations,
- JSON.parse(fs.readFileSync(f).toString())
- );
+ try {
+ Object.assign(
+ translations,
+ JSON.parse(fs.readFileSync(f).toString())
+ );
+ } catch (e) {
+ console.error("Failed: "+f, e);
+ throw e;
+ }
}
});
From 27a81c25d27a4505aab80a48f68aa0fc0a2d327a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 11 Oct 2017 14:06:12 +0100
Subject: [PATCH 7/7] CSS for greying out login form
---
.../css/matrix-react-sdk/structures/login/_Login.scss | 8 ++++++++
.../css/matrix-react-sdk/views/elements/_Dropdown.scss | 4 ++++
2 files changed, 12 insertions(+)
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss b/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
index 7faab6e7..86ab39be 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
@@ -67,6 +67,10 @@ limitations under the License.
margin-bottom: 14px;
}
+.mx_Login_field_disabled {
+ opacity: 0.3;
+}
+
.mx_Login_fieldLabel {
margin-top: -10px;
margin-left: 8px;
@@ -87,6 +91,10 @@ limitations under the License.
color: $accent-fg-color;
}
+.mx_Login_submit:disabled {
+ opacity: 0.3;
+}
+
.mx_Login_label {
font-size: 13px;
opacity: 0.8;
diff --git a/src/skins/vector/css/matrix-react-sdk/views/elements/_Dropdown.scss b/src/skins/vector/css/matrix-react-sdk/views/elements/_Dropdown.scss
index 637c5d12..2ddbb36c 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/elements/_Dropdown.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/elements/_Dropdown.scss
@@ -18,6 +18,10 @@ limitations under the License.
position: relative;
}
+.mx_Dropdown_disabled {
+ opacity: 0.3;
+}
+
.mx_Dropdown_input {
position: relative;
border-radius: 3px;