Merge branch 'develop' of github.com:vector-im/riot-web into develop

config.sample.json

@@ -6,6 +6,7 @@
     "integrations_rest_url": "https://scalar.vector.im/api",
     "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
     "enableLabs": true,
+    "default_federate": true,
     "roomDirectory": {
         "servers": [
             "matrix.org"

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;
+            }
         }
     });
 

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": "Сервер можа быць недаступны ці перагружаны"
 }

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/_QuestionDialog.scss";
 @import "./matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss";

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;

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;
+}

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;