From 85040a2e6d77c2a33262df92f8cf2cbfa5cc01e3 Mon Sep 17 00:00:00 2001 From: rubo77 Date: Thu, 5 Jan 2017 23:18:56 +0100 Subject: [PATCH 0001/1890] Hide Options button from copy to clipboard --- .../vector/css/matrix-react-sdk/views/rooms/EventTile.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css index fd3f486b7d..cbae864396 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css @@ -172,6 +172,10 @@ limitations under the License. cursor: pointer; top: 6px; right: 6px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } .mx_EventTile:hover .mx_EventTile_editButton, From 5020307a6c01122706dff1e835d8f0a93495bb23 Mon Sep 17 00:00:00 2001 From: Ruben Barkow Date: Mon, 2 Jan 2017 01:44:04 +0100 Subject: [PATCH 0002/1890] Add a   after timestamp This solves part of the problem that the timestamp is gluing at the message, when copied in your clipboard. Example: 23:02test message see https://github.com/vector-im/riot-web/issues/893 --- src/components/views/messages/MessageTimestamp.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/views/messages/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js index dda87767a6..3a8dd91dc0 100644 --- a/src/components/views/messages/MessageTimestamp.js +++ b/src/components/views/messages/MessageTimestamp.js @@ -26,9 +26,8 @@ module.exports = React.createClass({ var date = new Date(this.props.ts); return ( - { DateUtils.formatTime(date) } + { DateUtils.formatTime(date)+' ' } ); }, }); - From 53796f55be5924c94ed3ee07a21363be29272a3e Mon Sep 17 00:00:00 2001 From: Pablo Saavedra Date: Mon, 8 May 2017 12:25:45 +0200 Subject: [PATCH 0003/1890] Added default_federate property --- config.sample.json | 1 + 1 file changed, 1 insertion(+) diff --git a/config.sample.json b/config.sample.json index a65646ac77..94df4943ac 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 553c53e7e858a5f0e8f5975bfcc033335874ea7f Mon Sep 17 00:00:00 2001 From: Richard Lewis Date: Wed, 17 May 2017 12:33:58 +0100 Subject: [PATCH 0004/1890] Add apps menu icons --- .../views/rooms/_MessageComposer.scss | 6 +++-- src/skins/vector/img/icons-apps-active.svg | 24 +++++++++++++++++++ src/skins/vector/img/icons-apps.svg | 14 +++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 src/skins/vector/img/icons-apps-active.svg create mode 100644 src/skins/vector/img/icons-apps.svg diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss index 525cc1f654..ac49722711 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss @@ -128,7 +128,8 @@ limitations under the License. .mx_MessageComposer_upload, .mx_MessageComposer_hangup, .mx_MessageComposer_voicecall, -.mx_MessageComposer_videocall { +.mx_MessageComposer_videocall, +.mx_MessageComposer_apps { /*display: table-cell;*/ /*vertical-align: middle;*/ /*padding-left: 10px;*/ @@ -140,7 +141,8 @@ limitations under the License. .mx_MessageComposer_upload object, .mx_MessageComposer_hangup object, .mx_MessageComposer_voicecall object, -.mx_MessageComposer_videocall object { +.mx_MessageComposer_videocall object, +.mx_MessageComposer_apps object { pointer-events: none; } diff --git a/src/skins/vector/img/icons-apps-active.svg b/src/skins/vector/img/icons-apps-active.svg new file mode 100644 index 0000000000..ea222d0511 --- /dev/null +++ b/src/skins/vector/img/icons-apps-active.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/skins/vector/img/icons-apps.svg b/src/skins/vector/img/icons-apps.svg new file mode 100644 index 0000000000..affd8e6408 --- /dev/null +++ b/src/skins/vector/img/icons-apps.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + From 7ea6157b6749d08e0917f6a5338a6ac2e62ef608 Mon Sep 17 00:00:00 2001 From: Richard Lewis Date: Wed, 17 May 2017 21:16:15 +0100 Subject: [PATCH 0005/1890] App drawer styling --- .../css/matrix-react-sdk/views/rooms/_MessageComposer.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss index ac49722711..b7de8dcd93 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss @@ -202,3 +202,8 @@ limitations under the License. padding: 4px 4px 4px 0; opacity: 0.8; } + +.mx_AppsDrawer { + height: 50px; + width: 100%; +} From 7a63cfd71746c5626f2ee0ae286939a0421ebcb6 Mon Sep 17 00:00:00 2001 From: Richard Lewis Date: Wed, 17 May 2017 23:17:53 +0100 Subject: [PATCH 0006/1890] Add stylesheet for apps --- src/skins/vector/css/_components.scss | 1 + .../views/rooms/_AppsDrawer.scss | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss index c22fbc06a3..7d78404d58 100644 --- a/src/skins/vector/css/_components.scss +++ b/src/skins/vector/css/_components.scss @@ -51,6 +51,7 @@ @import "./matrix-react-sdk/views/rooms/_SearchableEntityList.scss"; @import "./matrix-react-sdk/views/rooms/_TabCompleteBar.scss"; @import "./matrix-react-sdk/views/rooms/_TopUnreadMessagesBar.scss"; +@import "./matrix-react-sdk/views/rooms/_AppsDrawer.scss"; @import "./matrix-react-sdk/views/settings/_DevicesPanel.scss"; @import "./matrix-react-sdk/views/settings/_IntegrationsManager.scss"; @import "./matrix-react-sdk/views/voip/_CallView.scss"; diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss new file mode 100644 index 0000000000..7b20e4dbf8 --- /dev/null +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss @@ -0,0 +1,22 @@ +/* +Copyright 2015, 2016 OpenMarket Ltd + +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_AddWidget_button { + order: 2; + cursor: pointer; + padding-left: 12px; + padding-right: 12px; +} From 8afc9f9a09d9efd00d22dd3dfa3d929383880d68 Mon Sep 17 00:00:00 2001 From: Richard Lewis Date: Fri, 19 May 2017 17:17:48 +0100 Subject: [PATCH 0007/1890] Add widget iframes and styling --- .../views/rooms/_AppsDrawer.scss | 44 +++++++++++++++++++ .../views/rooms/_MessageComposer.scss | 5 --- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss index 7b20e4dbf8..23c4ca4868 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss @@ -14,9 +14,53 @@ See the License for the specific language governing permissions and limitations under the License. */ +.mx_AppsDrawer { +} + +.mx_AppsContainer { + display: flex; + flex-direction: row; + align-items: center; +} + .mx_AddWidget_button { order: 2; cursor: pointer; padding-left: 12px; padding-right: 12px; + margin: 0 20px 20px 20px; + color: $accent-color; +} + +.mx_SetAppURLDialog_input { + border-radius: 3px; + border: 1px solid $input-border-color; + padding: 9px; + color: $primary-fg-color; + background-color: $primary-bg-color; + font-size: 15px; +} + +.mx_AppTile { + width: 48%; + margin: 2px 5px; + border: 1px solid $greyed-fg-color; + border-radius: 2px; + height: 200px; + // display: inline-block; +} + +.mx_AppTileMenuBar { + // height: 15px; + margin: 0; + padding: 2px 10px; + // background-color: $e2e-verified-color; + border-bottom: 1px solid $greyed-fg-color; +} + +.mx_AppTileBody iframe { + width: 100%; + height: 175px; + overflow: hidden; + border: none; } diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss index b7de8dcd93..ac49722711 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss @@ -202,8 +202,3 @@ limitations under the License. padding: 4px 4px 4px 0; opacity: 0.8; } - -.mx_AppsDrawer { - height: 50px; - width: 100%; -} From 998739a7dcc0c98b29fa19e016c5f825761a36ac Mon Sep 17 00:00:00 2001 From: Richard Lewis Date: Mon, 22 May 2017 18:00:40 +0100 Subject: [PATCH 0008/1890] Edit icon and styling --- .../views/rooms/_AppsDrawer.scss | 33 ++++++++++++++----- src/skins/vector/img/edit.svg | 13 ++++++++ 2 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 src/skins/vector/img/edit.svg diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss index 23c4ca4868..bf838b85ee 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss @@ -26,25 +26,26 @@ limitations under the License. .mx_AddWidget_button { order: 2; cursor: pointer; - padding-left: 12px; padding-right: 12px; - margin: 0 20px 20px 20px; + padding: 0; + margin: 0 0 5px 0; color: $accent-color; + font-size: 12px; } .mx_SetAppURLDialog_input { border-radius: 3px; border: 1px solid $input-border-color; padding: 9px; - color: $primary-fg-color; + color: $primary-hairline-color; background-color: $primary-bg-color; font-size: 15px; } .mx_AppTile { - width: 48%; - margin: 2px 5px; - border: 1px solid $greyed-fg-color; + width: 50%; + margin: 0 5px 2px 0; + border: 1px solid $primary-hairline-color; border-radius: 2px; height: 200px; // display: inline-block; @@ -55,12 +56,28 @@ limitations under the License. margin: 0; padding: 2px 10px; // background-color: $e2e-verified-color; - border-bottom: 1px solid $greyed-fg-color; + border-bottom: 1px solid $primary-hairline-color; + font-size: 10px; +} + +.mx_AppTileMenuBarWidgets { + float: right; +} +.mx_AppTileMenuBarWidget { + // pointer-events: none; + cursor: pointer; } .mx_AppTileBody iframe { width: 100%; - height: 175px; + height: 181px; overflow: hidden; border: none; } + +.mx_CloseAppWidget { +} + +.mx_AppTileMenuBarWidgetPadding { + margin-right: 5px; +} diff --git a/src/skins/vector/img/edit.svg b/src/skins/vector/img/edit.svg new file mode 100644 index 0000000000..a0be3454e1 --- /dev/null +++ b/src/skins/vector/img/edit.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + From 16357a9bc7ed4a635911811642fe04b368194108 Mon Sep 17 00:00:00 2001 From: Oliver Hunt Date: Sat, 27 May 2017 17:31:28 +0100 Subject: [PATCH 0009/1890] Sorting of networks within a protocol based on name Signed-off-by: Oliver Hunt --- .../views/directory/NetworkDropdown.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js index c891ee5b29..9c19cdbced 100644 --- a/src/components/views/directory/NetworkDropdown.js +++ b/src/components/views/directory/NetworkDropdown.js @@ -150,7 +150,21 @@ export default class NetworkDropdown extends React.Component { if (this.props.protocols) { for (const proto of Object.keys(this.props.protocols)) { if (!this.props.protocols[proto].instances) continue; - for (const instance of this.props.protocols[proto].instances) { + + const sortedInstances = this.props.protocols[proto].instances; + sortedInstances.sort(function(x, y) { + const a = x.desc + const b = y.desc + if (a < b) { + return -1; + } else if (a > b) { + return 1; + } else { + return 0; + } + }); + + for (const instance of sortedInstances) { if (!instance.instance_id) continue; options.push(this._makeMenuOption(server, instance, false)); } From ac9075a82a24234f8b6698f4070549b0d45abcd1 Mon Sep 17 00:00:00 2001 From: Richard Lewis Date: Tue, 30 May 2017 10:47:29 +0100 Subject: [PATCH 0010/1890] Increase panel height --- .../vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss index bf838b85ee..ae39e7f781 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss @@ -47,7 +47,7 @@ limitations under the License. margin: 0 5px 2px 0; border: 1px solid $primary-hairline-color; border-radius: 2px; - height: 200px; + height: 350px; // display: inline-block; } @@ -70,7 +70,7 @@ limitations under the License. .mx_AppTileBody iframe { width: 100%; - height: 181px; + height: 331px; overflow: hidden; border: none; } From 113533ad6148bcc6d22178293cf9e2dc1cfa5717 Mon Sep 17 00:00:00 2001 From: Richard Lewis Date: Wed, 31 May 2017 10:08:23 +0100 Subject: [PATCH 0011/1890] Add styling for full-width widgets --- .../css/matrix-react-sdk/views/rooms/_AppsDrawer.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss index ae39e7f781..0d8ada3633 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss @@ -51,6 +51,15 @@ limitations under the License. // display: inline-block; } +.mx_AppTileFullWidth { + width: 100%; + margin: 0 5px 2px 0; + border: 1px solid $primary-hairline-color; + border-radius: 2px; + height: 350px; + // display: inline-block; +} + .mx_AppTileMenuBar { // height: 15px; margin: 0; From 884322f82c3799da2194749123d2c477485b6943 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 2 Jun 2017 21:57:42 +0100 Subject: [PATCH 0012/1890] remove unused imports Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/HomePage.js | 2 -- src/components/views/rooms/DNDRoomTile.js | 1 - 2 files changed, 3 deletions(-) diff --git a/src/components/structures/HomePage.js b/src/components/structures/HomePage.js index 8d44c90a2e..9864b2e9ca 100644 --- a/src/components/structures/HomePage.js +++ b/src/components/structures/HomePage.js @@ -18,8 +18,6 @@ limitations under the License. 'use strict'; import React from 'react'; -import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg'; -import sdk from 'matrix-react-sdk'; module.exports = React.createClass({ displayName: 'HomePage', diff --git a/src/components/views/rooms/DNDRoomTile.js b/src/components/views/rooms/DNDRoomTile.js index 6abb5bd06c..7857da9dbe 100644 --- a/src/components/views/rooms/DNDRoomTile.js +++ b/src/components/views/rooms/DNDRoomTile.js @@ -20,7 +20,6 @@ import React from 'react'; import {DragSource} from 'react-dnd'; import {DropTarget} from 'react-dnd'; -import dis from 'matrix-react-sdk/lib/dispatcher'; import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg'; import sdk from 'matrix-react-sdk'; import { _t } from 'matrix-react-sdk/lib/languageHandler'; From cb3fa16cd0958d7ae8a7f3c86157bdcc8c1516b1 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 2 Jun 2017 22:04:01 +0100 Subject: [PATCH 0013/1890] install text-encoding-utf-8 so we're not relying on it from react-sdk implicitly/transitively (not nice) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 73ebc00950..bcbd89fa9b 100644 --- a/package.json +++ b/package.json @@ -76,6 +76,7 @@ "react-dom": "^15.4.0", "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef", "sanitize-html": "^1.11.1", + "text-encoding-utf-8": "^1.0.1", "ua-parser-js": "^0.7.10", "url": "^0.11.0" }, From 0e6012ad4561102c72bbdcb2c29c300a57927f4e Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 3 Jun 2017 12:50:47 +0100 Subject: [PATCH 0014/1890] absorb updater.js into the Platforms, gets rid of pointless setInterval in Electron Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit 24e8a30) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/vector/index.js | 7 +++--- src/vector/platform/VectorBasePlatform.js | 6 +++++ src/vector/platform/WebPlatform.js | 7 ++++++ src/vector/updater.js | 30 ----------------------- 4 files changed, 17 insertions(+), 33 deletions(-) delete mode 100644 src/vector/updater.js diff --git a/src/vector/index.js b/src/vector/index.js index 9f16205164..d26e480e30 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -59,7 +59,6 @@ var sdk = require("matrix-react-sdk"); const PlatformPeg = require("matrix-react-sdk/lib/PlatformPeg"); sdk.loadSkin(require('../component-index')); var VectorConferenceHandler = require('../VectorConferenceHandler'); -var UpdateChecker = require("./updater"); var q = require('q'); var request = require('browser-request'); import * as UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore'; @@ -277,7 +276,9 @@ async function loadApp() { Unable to load config file: please refresh the page to try again. , document.getElementById('matrixchat')); } else if (validBrowser) { - UpdateChecker.start(); + const platform = PlatformPeg.get(); + platform.startUpdater(); + const MatrixChat = sdk.getComponent('structures.MatrixChat'); window.matrixChat = ReactDOM.render( , document.getElementById('matrixchat') ); diff --git a/src/vector/platform/VectorBasePlatform.js b/src/vector/platform/VectorBasePlatform.js index 76707d1d58..8e998402c4 100644 --- a/src/vector/platform/VectorBasePlatform.js +++ b/src/vector/platform/VectorBasePlatform.js @@ -74,6 +74,12 @@ export default class VectorBasePlatform extends BasePlatform { this._updateFavicon(); } + /** + * Begin update polling, if applicable + */ + startUpdater() { + } + /** * Check for the availability of an update to the version of the * app that's currently running. diff --git a/src/vector/platform/WebPlatform.js b/src/vector/platform/WebPlatform.js index 8397a7f703..c589af38b8 100644 --- a/src/vector/platform/WebPlatform.js +++ b/src/vector/platform/WebPlatform.js @@ -26,6 +26,8 @@ import q from 'q'; import url from 'url'; import UAParser from 'ua-parser-js'; +var POKE_RATE_MS = 10 * 60 * 1000; // 10 min + export default class WebPlatform extends VectorBasePlatform { constructor() { super(); @@ -132,6 +134,11 @@ export default class WebPlatform extends VectorBasePlatform { return this._getVersion(); } + startUpdater() { + this.pollForUpdate(); + setInterval(this.pollForUpdate, POKE_RATE_MS); + } + pollForUpdate() { this._getVersion().done((ver) => { if (this.runningVersion === null) { diff --git a/src/vector/updater.js b/src/vector/updater.js deleted file mode 100644 index 19d40b4f38..0000000000 --- a/src/vector/updater.js +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2016 OpenMarket Ltd - -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. -*/ - -import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg'; - -var POKE_RATE_MS = 10 * 60 * 1000; // 10 min - -module.exports = { - start: function() { - module.exports.poll(); - setInterval(module.exports.poll, POKE_RATE_MS); - }, - - poll: function() { - PlatformPeg.get().pollForUpdate(); - } -}; From efc68c078ebe80ec2b499cb644c8eccda33a973d Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 3 Jun 2017 15:12:46 +0100 Subject: [PATCH 0015/1890] basic manual update stuff + update check bar Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- electron_app/src/electron-main.js | 1 + .../views/globals/UpdateCheckBar.js | 89 +++++++++++++++++++ src/vector/platform/ElectronPlatform.js | 29 ++++-- src/vector/platform/VectorBasePlatform.js | 18 +++- src/vector/platform/WebPlatform.js | 13 +-- 5 files changed, 139 insertions(+), 11 deletions(-) create mode 100644 src/components/views/globals/UpdateCheckBar.js diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js index ef0d173c00..f1a9e37a73 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -120,6 +120,7 @@ process.on('uncaughtException', function(error) { }); electron.ipcMain.on('install_update', installUpdate); +electron.ipcMain.on('checkForUpdates', pollForUpdates); let focusHandlerAttached = false; electron.ipcMain.on('setBadgeCount', function(ev, count) { diff --git a/src/components/views/globals/UpdateCheckBar.js b/src/components/views/globals/UpdateCheckBar.js new file mode 100644 index 0000000000..65fe84c989 --- /dev/null +++ b/src/components/views/globals/UpdateCheckBar.js @@ -0,0 +1,89 @@ +/* +Copyright 2015, 2016 OpenMarket Ltd + +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. +*/ + +'use strict'; + +import React from 'react'; +import dis from 'matrix-react-sdk/lib/dispatcher'; +import { _t } from 'matrix-react-sdk/lib/languageHandler'; +import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg'; +import {updateStateEnum} from '../../../vector/platform/VectorBasePlatform'; +import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/AccessibleButton'; + +export default React.createClass({ + + getInitialState: function() { + return { + message: 'Checking for an update...', + done: false, + }; + }, + + componentWillMount: function() { + PlatformPeg.get().checkForUpdate().done((state) => { + if (this._unmounted) return; + + console.log('checkForUpdate done, ', state); + + // We will be replaced by NewVersionBar + if (state === updateStateEnum.Ready) return; + + let done = true; + let message; + switch (state) { + case updateStateEnum.Error: + message = 'Error encountered when checking for an update'; + break; + case updateStateEnum.NotAvailable: + message = 'No update found'; + break; + case updateStateEnum.Downloading: + message = 'Update is being downloaded'; + done = false; + break; + } + + this.setState({message, done}); + }); + }, + + componentWillUnmount: function() { + this._unmounted = true; + }, + + hideToolbar: function() { + dis.dispatch({ + action: 'check_updates', + value: false, + }); + }, + + render: function() { + const imgSrc = this.state.done ? 'img/warning.svg' : 'img/spinner.gif'; + + return ( +
+ /!\ +
+ {this.state.message} +
+ + + +
+ ); + } +}); diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js index fa0f999cb8..1ed1c0d8c7 100644 --- a/src/vector/platform/ElectronPlatform.js +++ b/src/vector/platform/ElectronPlatform.js @@ -17,7 +17,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import VectorBasePlatform from './VectorBasePlatform'; +import VectorBasePlatform, {updateStateEnum} from './VectorBasePlatform'; import dis from 'matrix-react-sdk/lib/dispatcher'; import { _t } from 'matrix-react-sdk/lib/languageHandler'; import q from 'q'; @@ -66,6 +66,7 @@ export default class ElectronPlatform extends VectorBasePlatform { constructor() { super(); dis.register(_onAction); + this.updatable = Boolean(remote.autoUpdater.getFeedURL()); } getHumanReadableName(): string { @@ -137,10 +138,28 @@ export default class ElectronPlatform extends VectorBasePlatform { return q(remote.app.getVersion()); } - pollForUpdate() { - // In electron we control the update process ourselves, since - // it needs to run in the main process, so we just run the timer - // loop in the main electron process instead. + checkForUpdate() { // manual update check for this platform + const deferred = q.defer(); + + const _onUpdateAvailable = function() { + electron.autoUpdater.removeListener('update-not-available', _onUpdateNotAvailable); + deferred.resolve(updateStateEnum.Downloading); + } + + const _onUpdateNotAvailable = function() { + electron.autoUpdater.removeListener('update-available', _onUpdateAvailable); + deferred.resolve(updateStateEnum.NotAvailable); + } + + electron.autoUpdater.once('update-available', _onUpdateAvailable); + electron.autoUpdater.once('update-not-available', _onUpdateNotAvailable); + + electron.ipcRenderer.send('checkForUpdates'); + return deferred.promise.timeout(10000).catch(() => { + electron.autoUpdater.removeListener('update-not-available', _onUpdateNotAvailable); + electron.autoUpdater.removeListener('update-available', _onUpdateAvailable); + return updateStateEnum.Error; + }); } installUpdate() { diff --git a/src/vector/platform/VectorBasePlatform.js b/src/vector/platform/VectorBasePlatform.js index 8e998402c4..5ae620cb01 100644 --- a/src/vector/platform/VectorBasePlatform.js +++ b/src/vector/platform/VectorBasePlatform.js @@ -22,6 +22,13 @@ import { _t } from 'matrix-react-sdk/lib/languageHandler'; import Favico from 'favico.js'; +export const updateStateEnum = { + Error: -1, + NotAvailable: 0, + Downloading: 1, + Ready: 2, +}; + /** * Vector-specific extensions to the BasePlatform template */ @@ -35,6 +42,7 @@ export default class VectorBasePlatform extends BasePlatform { // so we'd need to fix that if enabling the animation. this.favicon = new Favico({animation: 'none'}); this._updateFavicon(); + this.updatable = true; } getHumanReadableName(): string { @@ -80,13 +88,21 @@ export default class VectorBasePlatform extends BasePlatform { startUpdater() { } + /** + * Whether we can call checkForUpdate on this platform build + */ + canSelfUpdate(): boolean { + return this.updatable; + } + /** * Check for the availability of an update to the version of the * app that's currently running. * If an update is available, this function should dispatch the * 'new_version' action. + * @returns Promise */ - pollForUpdate() { + checkForUpdate(): Promise { } /** diff --git a/src/vector/platform/WebPlatform.js b/src/vector/platform/WebPlatform.js index c589af38b8..318a3fe9a1 100644 --- a/src/vector/platform/WebPlatform.js +++ b/src/vector/platform/WebPlatform.js @@ -17,7 +17,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import VectorBasePlatform from './VectorBasePlatform'; +import VectorBasePlatform, {updateStateEnum} from './VectorBasePlatform'; import request from 'browser-request'; import dis from 'matrix-react-sdk/lib/dispatcher.js'; import { _t } from 'matrix-react-sdk/lib/languageHandler'; @@ -135,12 +135,12 @@ export default class WebPlatform extends VectorBasePlatform { } startUpdater() { - this.pollForUpdate(); - setInterval(this.pollForUpdate, POKE_RATE_MS); + this.checkForUpdate(); + setInterval(this.checkForUpdate, POKE_RATE_MS); } - pollForUpdate() { - this._getVersion().done((ver) => { + checkForUpdate() { + return this._getVersion().then((ver) => { if (this.runningVersion === null) { this.runningVersion = ver; } else if (this.runningVersion !== ver) { @@ -149,9 +149,12 @@ export default class WebPlatform extends VectorBasePlatform { currentVersion: this.runningVersion, newVersion: ver, }); + return updateStateEnum.Ready; } + return updateStateEnum.NotAvailable; }, (err) => { console.error("Failed to poll for update", err); + return updateStateEnum.Error; }); } From b95ad701afcf4cada8c209de505eb53e19bc1e5f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 3 Jun 2017 15:17:58 +0100 Subject: [PATCH 0016/1890] match ENUM style to others in project Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit a871815) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/globals/UpdateCheckBar.js | 8 ++++---- src/vector/platform/ElectronPlatform.js | 6 +++--- src/vector/platform/VectorBasePlatform.js | 8 ++++---- src/vector/platform/WebPlatform.js | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/components/views/globals/UpdateCheckBar.js b/src/components/views/globals/UpdateCheckBar.js index 65fe84c989..95c78cf634 100644 --- a/src/components/views/globals/UpdateCheckBar.js +++ b/src/components/views/globals/UpdateCheckBar.js @@ -39,18 +39,18 @@ export default React.createClass({ console.log('checkForUpdate done, ', state); // We will be replaced by NewVersionBar - if (state === updateStateEnum.Ready) return; + if (state === updateStateEnum.READY) return; let done = true; let message; switch (state) { - case updateStateEnum.Error: + case updateStateEnum.ERROR: message = 'Error encountered when checking for an update'; break; - case updateStateEnum.NotAvailable: + case updateStateEnum.NOTAVAILABLE: message = 'No update found'; break; - case updateStateEnum.Downloading: + case updateStateEnum.DOWNLOADING: message = 'Update is being downloaded'; done = false; break; diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js index 1ed1c0d8c7..b4f17d6e42 100644 --- a/src/vector/platform/ElectronPlatform.js +++ b/src/vector/platform/ElectronPlatform.js @@ -143,12 +143,12 @@ export default class ElectronPlatform extends VectorBasePlatform { const _onUpdateAvailable = function() { electron.autoUpdater.removeListener('update-not-available', _onUpdateNotAvailable); - deferred.resolve(updateStateEnum.Downloading); + deferred.resolve(updateStateEnum.DOWNLOADING); } const _onUpdateNotAvailable = function() { electron.autoUpdater.removeListener('update-available', _onUpdateAvailable); - deferred.resolve(updateStateEnum.NotAvailable); + deferred.resolve(updateStateEnum.NOTAVAILABLE); } electron.autoUpdater.once('update-available', _onUpdateAvailable); @@ -158,7 +158,7 @@ export default class ElectronPlatform extends VectorBasePlatform { return deferred.promise.timeout(10000).catch(() => { electron.autoUpdater.removeListener('update-not-available', _onUpdateNotAvailable); electron.autoUpdater.removeListener('update-available', _onUpdateAvailable); - return updateStateEnum.Error; + return updateStateEnum.ERROR; }); } diff --git a/src/vector/platform/VectorBasePlatform.js b/src/vector/platform/VectorBasePlatform.js index 5ae620cb01..0bbcb8f3e7 100644 --- a/src/vector/platform/VectorBasePlatform.js +++ b/src/vector/platform/VectorBasePlatform.js @@ -23,10 +23,10 @@ import { _t } from 'matrix-react-sdk/lib/languageHandler'; import Favico from 'favico.js'; export const updateStateEnum = { - Error: -1, - NotAvailable: 0, - Downloading: 1, - Ready: 2, + ERROR: 'ERROR', + NOTAVAILABLE: 'NOTAVAILABLE', + DOWNLOADING: 'DOWNLOADING', + READY: 'READY', }; /** diff --git a/src/vector/platform/WebPlatform.js b/src/vector/platform/WebPlatform.js index 318a3fe9a1..dd6b91de91 100644 --- a/src/vector/platform/WebPlatform.js +++ b/src/vector/platform/WebPlatform.js @@ -149,12 +149,12 @@ export default class WebPlatform extends VectorBasePlatform { currentVersion: this.runningVersion, newVersion: ver, }); - return updateStateEnum.Ready; + return updateStateEnum.READY; } - return updateStateEnum.NotAvailable; + return updateStateEnum.NOTAVAILABLE; }, (err) => { console.error("Failed to poll for update", err); - return updateStateEnum.Error; + return updateStateEnum.ERROR; }); } From 3ebd90565c37f07c29c23d1eb217a853c2a3a83b Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 3 Jun 2017 15:31:08 +0100 Subject: [PATCH 0017/1890] add clearer concept of timeout vs error Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit 104c804) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/globals/UpdateCheckBar.js | 9 ++++++--- src/vector/platform/ElectronPlatform.js | 2 +- src/vector/platform/VectorBasePlatform.js | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/components/views/globals/UpdateCheckBar.js b/src/components/views/globals/UpdateCheckBar.js index 95c78cf634..c39754c85f 100644 --- a/src/components/views/globals/UpdateCheckBar.js +++ b/src/components/views/globals/UpdateCheckBar.js @@ -45,13 +45,16 @@ export default React.createClass({ let message; switch (state) { case updateStateEnum.ERROR: - message = 'Error encountered when checking for an update'; + message = 'Error encountered when checking for an update.'; + break; + case updateStateEnum.TIMEOUT: + message = 'Update Check timed out, try again later.'; break; case updateStateEnum.NOTAVAILABLE: - message = 'No update found'; + message = 'No update found.'; break; case updateStateEnum.DOWNLOADING: - message = 'Update is being downloaded'; + message = 'Update is being downloaded.'; done = false; break; } diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js index b4f17d6e42..f84fe8d570 100644 --- a/src/vector/platform/ElectronPlatform.js +++ b/src/vector/platform/ElectronPlatform.js @@ -158,7 +158,7 @@ export default class ElectronPlatform extends VectorBasePlatform { return deferred.promise.timeout(10000).catch(() => { electron.autoUpdater.removeListener('update-not-available', _onUpdateNotAvailable); electron.autoUpdater.removeListener('update-available', _onUpdateAvailable); - return updateStateEnum.ERROR; + return updateStateEnum.TIMEOUT; }); } diff --git a/src/vector/platform/VectorBasePlatform.js b/src/vector/platform/VectorBasePlatform.js index 0bbcb8f3e7..074be91c83 100644 --- a/src/vector/platform/VectorBasePlatform.js +++ b/src/vector/platform/VectorBasePlatform.js @@ -24,6 +24,7 @@ import Favico from 'favico.js'; export const updateStateEnum = { ERROR: 'ERROR', + TIMEOUT: 'TIMEOUT', NOTAVAILABLE: 'NOTAVAILABLE', DOWNLOADING: 'DOWNLOADING', READY: 'READY', From f5ba6fa95293b973505b56685b031226f56ef4c8 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 3 Jun 2017 15:36:03 +0100 Subject: [PATCH 0018/1890] i18n things Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit d878c72) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/globals/UpdateCheckBar.js | 10 +++++----- src/i18n/strings/en_EN.json | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/views/globals/UpdateCheckBar.js b/src/components/views/globals/UpdateCheckBar.js index c39754c85f..0a9029222a 100644 --- a/src/components/views/globals/UpdateCheckBar.js +++ b/src/components/views/globals/UpdateCheckBar.js @@ -27,7 +27,7 @@ export default React.createClass({ getInitialState: function() { return { - message: 'Checking for an update...', + message: _t('Checking for an update...'), done: false, }; }, @@ -45,16 +45,16 @@ export default React.createClass({ let message; switch (state) { case updateStateEnum.ERROR: - message = 'Error encountered when checking for an update.'; + message = _t('Error encountered when checking for an update.'); break; case updateStateEnum.TIMEOUT: - message = 'Update Check timed out, try again later.'; + message = _t('Update Check timed out, try again later.'); break; case updateStateEnum.NOTAVAILABLE: - message = 'No update found.'; + message = _t('No update found.'); break; case updateStateEnum.DOWNLOADING: - message = 'Update is being downloaded.'; + message = _t('Update is being downloaded.'); done = false; break; } diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index e148248cc6..2bce407061 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -158,6 +158,11 @@ "Today": "Today", "Yesterday": "Yesterday", "OK": "OK", + "Checking for an update...": "Checking for an update...", + "Error encountered when checking for an update.": "Error encountered when checking for an update.", + "Update Check timed out, try again later.": "Update Check timed out, try again later.", + "No update found.": "No update found.", + "Update is being downloaded.": "Update is being downloaded.", "You need to be using HTTPS to place a screen-sharing call.": "You need to be using HTTPS to place a screen-sharing call.", "Welcome page": "Welcome page", "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!" From a4c1aee5eac715b779e0ccef1f420b767d8e8e15 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 3 Jun 2017 16:00:49 +0100 Subject: [PATCH 0019/1890] correct file header Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/globals/UpdateCheckBar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/globals/UpdateCheckBar.js b/src/components/views/globals/UpdateCheckBar.js index 0a9029222a..8d7cc281da 100644 --- a/src/components/views/globals/UpdateCheckBar.js +++ b/src/components/views/globals/UpdateCheckBar.js @@ -1,5 +1,5 @@ /* -Copyright 2015, 2016 OpenMarket Ltd +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. From 5981887705ba324177810f6b48ef24cf05d905fb Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 3 Jun 2017 16:04:01 +0100 Subject: [PATCH 0020/1890] fix UpdateCheckBar image alt Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/globals/UpdateCheckBar.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/views/globals/UpdateCheckBar.js b/src/components/views/globals/UpdateCheckBar.js index 8d7cc281da..d72ccefff4 100644 --- a/src/components/views/globals/UpdateCheckBar.js +++ b/src/components/views/globals/UpdateCheckBar.js @@ -75,11 +75,16 @@ export default React.createClass({ }, render: function() { - const imgSrc = this.state.done ? 'img/warning.svg' : 'img/spinner.gif'; + let image; + if (this.state.done) { + image = /!\; + } else { + image = {this.state.message}/; + } return (
- /!\ + {image}
{this.state.message}
From 93f148fca33c2c1a89a7a8fc407828ea90aa68d6 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 3 Jun 2017 16:22:14 +0100 Subject: [PATCH 0021/1890] fix type electron vs remote don't break when running a non Squirrel Windows build that has an update url Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/vector/platform/ElectronPlatform.js | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js index f84fe8d570..519cadc09d 100644 --- a/src/vector/platform/ElectronPlatform.js +++ b/src/vector/platform/ElectronPlatform.js @@ -142,22 +142,30 @@ export default class ElectronPlatform extends VectorBasePlatform { const deferred = q.defer(); const _onUpdateAvailable = function() { - electron.autoUpdater.removeListener('update-not-available', _onUpdateNotAvailable); + remote.autoUpdater.removeListener('update-not-available', _onUpdateNotAvailable); + remote.autoUpdater.removeListener('error', _onError); deferred.resolve(updateStateEnum.DOWNLOADING); } - const _onUpdateNotAvailable = function() { - electron.autoUpdater.removeListener('update-available', _onUpdateAvailable); + remote.autoUpdater.removeListener('update-available', _onUpdateAvailable); + remote.autoUpdater.removeListener('error', _onError); deferred.resolve(updateStateEnum.NOTAVAILABLE); } + const _onError = function() { + remote.autoUpdater.removeListener('update-not-available', _onUpdateNotAvailable); + remote.autoUpdater.removeListener('update-available', _onUpdateAvailable); + deferred.resolve(updateStateEnum.ERROR); + } - electron.autoUpdater.once('update-available', _onUpdateAvailable); - electron.autoUpdater.once('update-not-available', _onUpdateNotAvailable); + remote.autoUpdater.once('update-available', _onUpdateAvailable); + remote.autoUpdater.once('update-not-available', _onUpdateNotAvailable); + remote.autoUpdater.once('error', _onError); - electron.ipcRenderer.send('checkForUpdates'); + remote.ipcRenderer.send('checkForUpdates'); return deferred.promise.timeout(10000).catch(() => { - electron.autoUpdater.removeListener('update-not-available', _onUpdateNotAvailable); - electron.autoUpdater.removeListener('update-available', _onUpdateAvailable); + remote.autoUpdater.removeListener('update-not-available', _onUpdateNotAvailable); + remote.autoUpdater.removeListener('update-available', _onUpdateAvailable); + remote.autoUpdater.removeListener('error', _onError); return updateStateEnum.TIMEOUT; }); } From 0ef800073bac036ed797ff10d6911ff2d39271e4 Mon Sep 17 00:00:00 2001 From: Richard Lewis Date: Mon, 5 Jun 2017 18:21:52 +0100 Subject: [PATCH 0022/1890] App drawer styling --- .../matrix-react-sdk/views/rooms/_AppsDrawer.scss | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss index 0d8ada3633..db2175732f 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss @@ -47,16 +47,17 @@ limitations under the License. margin: 0 5px 2px 0; border: 1px solid $primary-hairline-color; border-radius: 2px; - height: 350px; + // height: 350px; // display: inline-block; } .mx_AppTileFullWidth { width: 100%; - margin: 0 5px 2px 0; + margin: 0; + padding: 0; border: 1px solid $primary-hairline-color; border-radius: 2px; - height: 350px; + // height: 350px; // display: inline-block; } @@ -79,9 +80,12 @@ limitations under the License. .mx_AppTileBody iframe { width: 100%; - height: 331px; + height: 350px; overflow: hidden; border: none; + padding: 0; + margin: 0; + display: block; } .mx_CloseAppWidget { From 7098ca9df0675debe7351480ba3dad22750c8150 Mon Sep 17 00:00:00 2001 From: Oliver Hunt Date: Tue, 6 Jun 2017 00:24:30 +0100 Subject: [PATCH 0023/1890] Added styling for copy to clipboard button - currently using the edit button's image as a placeholder Signed-off-by: Oliver Hunt --- .../views/rooms/_EventTile.scss | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss index 9d970ad454..e99609e039 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss @@ -332,6 +332,24 @@ limitations under the License. .mx_EventTile_content .markdown-body code { background-color: #f8f8f8; } +.mx_EventTile_copyButton { + position: absolute; + display: inline-block; + visibility: hidden; + cursor: pointer; + top: 6px; + right: 6px; + width: 19px; + height: 19px; + background-image: url($edit-button-url); +} +.mx_EventTile_body pre { + position: relative; +} +.mx_EventTile_body pre:hover .mx_EventTile_copyButton +{ + visibility: visible; +} .mx_EventTile_content .markdown-body h1, .mx_EventTile_content .markdown-body h2, From fd42698cf02a750cd94a9854cf74a2cf847f750f Mon Sep 17 00:00:00 2001 From: Oliver Hunt Date: Tue, 6 Jun 2017 13:21:50 +0100 Subject: [PATCH 0024/1890] Added svg for copy icon - I'm not a designer, someone else should probably replace these! Signed-off-by: Oliver Hunt --- .../views/rooms/_EventTile.scss | 2 +- src/skins/vector/css/themes/_base.scss | 3 +- src/skins/vector/css/themes/_dark.scss | 1 + src/skins/vector/img/icon_copy_message.svg | 86 +++++++++++++++++++ .../vector/img/icon_copy_message_dark.svg | 77 +++++++++++++++++ 5 files changed, 167 insertions(+), 2 deletions(-) create mode 100644 src/skins/vector/img/icon_copy_message.svg create mode 100644 src/skins/vector/img/icon_copy_message_dark.svg diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss index e99609e039..8f3c6d6c7b 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss @@ -341,7 +341,7 @@ limitations under the License. right: 6px; width: 19px; height: 19px; - background-image: url($edit-button-url); + background-image: url($copy-button-url); } .mx_EventTile_body pre { position: relative; diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss index b601191348..fc24af93e2 100644 --- a/src/skins/vector/css/themes/_base.scss +++ b/src/skins/vector/css/themes/_base.scss @@ -102,6 +102,7 @@ $event-redacted-img: url('../../img/redacted.jpg'); $event-timestamp-color: #acacac; $edit-button-url: "../../img/icon_context_message.svg"; +$copy-button-url: "../../img/icon_copy_message.svg"; // e2e $e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color @@ -114,4 +115,4 @@ $lightbox-fg-color: #ffffff; $lightbox-border-color: #ffffff; // unused? -$progressbar-color: #000; \ No newline at end of file +$progressbar-color: #000; diff --git a/src/skins/vector/css/themes/_dark.scss b/src/skins/vector/css/themes/_dark.scss index 72c21b7572..fe2e7591cf 100644 --- a/src/skins/vector/css/themes/_dark.scss +++ b/src/skins/vector/css/themes/_dark.scss @@ -102,6 +102,7 @@ $event-redacted-img: url('../../img/redacted-dark.jpg'); $event-timestamp-color: #acacac; $edit-button-url: "../../img/icon_context_message_dark.svg"; +$copy-button-url: "../../img/icon_copy_message_dark.svg"; // e2e $e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color diff --git a/src/skins/vector/img/icon_copy_message.svg b/src/skins/vector/img/icon_copy_message.svg new file mode 100644 index 0000000000..8d8887bb22 --- /dev/null +++ b/src/skins/vector/img/icon_copy_message.svg @@ -0,0 +1,86 @@ + + + + + + image/svg+xml + + ED5D3E59-2561-4AC1-9B43-82FBC51767FC + + + + + + ED5D3E59-2561-4AC1-9B43-82FBC51767FC + Created with sketchtool. + + + + + + + + + diff --git a/src/skins/vector/img/icon_copy_message_dark.svg b/src/skins/vector/img/icon_copy_message_dark.svg new file mode 100644 index 0000000000..b81e617d8c --- /dev/null +++ b/src/skins/vector/img/icon_copy_message_dark.svg @@ -0,0 +1,77 @@ + + + + + + image/svg+xml + + ED5D3E59-2561-4AC1-9B43-82FBC51767FC + + + + + + ED5D3E59-2561-4AC1-9B43-82FBC51767FC + Created with sketchtool. + + + + + + + From 79d6ced201380710ef360f894ea306067fea4e20 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 6 Jun 2017 18:39:54 +0100 Subject: [PATCH 0025/1890] change electron -> electron_app which was previously missed Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bb3edc4075..c31514002a 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "start:prod": "parallelshell \"npm run reskindex:watch\" \"npm run start:res\" \"npm run start:js:prod\"", "lint": "eslint src/", "lintall": "eslint src/ test/", - "clean": "rimraf lib webapp electron/dist", + "clean": "rimraf lib webapp electron_app/dist", "prepublish": "npm run build:compile", "test": "karma start --single-run=true --autoWatch=false --browsers PhantomJS --colors=false", "test-multi": "karma start" From f815097ee93c6152498e1b0870e9c573db7cf93c Mon Sep 17 00:00:00 2001 From: Szimszon Date: Tue, 6 Jun 2017 20:36:21 +0000 Subject: [PATCH 0026/1890] Translated using Weblate (Hungarian) Currently translated at 100.0% (162 of 162 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/hu/ --- src/i18n/strings/hu.json | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 598c2dfda1..d5d33930ab 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -139,5 +139,26 @@ "Failed to send report: ": "A jelentést nem lehetett elküldeni: ", "Forward Message": "Üzenet továbbküldése", "Hide panel": "Panel elrejtése", - "Loading bug report module": "Hibabejelentő modul betöltése" + "Loading bug report module": "Hibabejelentő modul betöltése", + "Please describe the bug and/or send logs.": "Írd le a hibát és/vagy küld el a naplókat.", + "Report a bug": "Hiba bejelentése", + "Riot Desktop on %(platformName)s": "Riot Desktop ezen: %(platformName)s", + "Riot is not supported on mobile web. Install the app?": "Riot nem támogatott mobil webböngészőn. Telepíted az alkalmazást?", + "Search": "Keresés", + "Search…": "Keresés…", + "Send": "Küld", + "Send logs": "Naplók elküldése", + "This Room": "Ez a szoba", + "Unavailable": "Elérhetetlen", + "Unknown device": "Ismeretlen eszköz", + "Update": "Frissítés", + "Uploading report": "Jelentés feltöltése", + "What's New": "Mik az újdonságok", + "What's new?": "Mik az újdonságok?", + "Waiting for response from server": "Válasz várása a szervertől", + "You are Rioting as a guest. Register or sign in to access more rooms and features!": "Vendégként használod a Riot-ot. Regisztrálj vagy jelentkezz be további szobák és lehetőségek eléréséhez!", + "OK": "Rendben", + "You need to be using HTTPS to place a screen-sharing call.": "HTTPS-t kell használnod hogy képernyőmegosztásos hívást kezdeményezz.", + "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "A problémák diagnosztizálása érdekében erről a kliensről a hibajelentésben naplók lesznek elküldve. Ha csak az alábbi szöveget szeretnéd elküldeni akkor ezt ne jelöld meg:", + "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Írd le a hibát. Mit csináltál? Mi az amit szerettél volna ha történik? Ezzel szemben mi az ami történt?" } From 76880e0de7a7e982283432d141c69acd5520f5e2 Mon Sep 17 00:00:00 2001 From: Richard Lewis Date: Tue, 6 Jun 2017 23:46:27 +0100 Subject: [PATCH 0027/1890] App icon tile styling --- .../views/rooms/_AppsDrawer.scss | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss index db2175732f..840fd963ca 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss @@ -94,3 +94,20 @@ limitations under the License. .mx_AppTileMenuBarWidgetPadding { margin-right: 5px; } + +.mx_AppIconTile { + box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2); + transition: 0.3s; +} + +.mx_AppIconTile:hover { + box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2); +} + +.mx_AppIconTile_content { + padding: 2px 16px; +} + +.mx_AppIconTile_image { + width: 100%; +} From fe4738996a43406d5153c47248eca5bf76e29ceb Mon Sep 17 00:00:00 2001 From: Stanislav N Date: Wed, 7 Jun 2017 05:19:23 +0000 Subject: [PATCH 0028/1890] Translated using Weblate (Russian) Currently translated at 100.0% (162 of 162 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/ --- src/i18n/strings/ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index cc5ca1e861..eda85493b4 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -129,7 +129,7 @@ "A new version of Riot is available.": "Доступна новая версия Riot.", "All Rooms": "Все комнаты", "Cancel": "Отмена", - "Changelog": "Истоея изменений", + "Changelog": "История изменений", "Collapse panel": "Закрыпть панель", "Collecting app version information": "Сбор информации о версиях программы", "Collecting logs": "Сбор протоколов", From 9302c60b47699d42a5dcf08a7b7cca4a564be9f8 Mon Sep 17 00:00:00 2001 From: Richard Lewis Date: Wed, 7 Jun 2017 10:55:35 +0100 Subject: [PATCH 0029/1890] App icon styling --- .../views/rooms/_AppsDrawer.scss | 34 +++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss index 840fd963ca..cc473048c7 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss @@ -96,18 +96,48 @@ limitations under the License. } .mx_AppIconTile { + background-color: #666; + border: 1px solid #666; + width: 200px; box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2); transition: 0.3s; + border-radius: 3px; + margin: 5px; + display: inline-block; } .mx_AppIconTile:hover { - box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2); + border: 1px solid $accent-color; + box-shadow: 0 0 10px 5px rgba(200,200,200,0.5); } .mx_AppIconTile_content { padding: 2px 16px; + height: 60px; + overflow: hidden; +} + +.mx_AppIconTile_content h4 { + margin-top: 5px; + margin-bottom: 2px; +} + +.mx_AppIconTile_content p { + margin-top: 0; + margin-bottom: 5px; + font-size: smaller; } .mx_AppIconTile_image { - width: 100%; + width: 75%; + margin: 10px; + max-height: 100px; +} + +.mx_AppIconTile_imageContainer { + text-align: center; + width: 100%; + background-color: white; + border-radius: 3px 3px 0 0; + max-height: 155px; } From 272d36995bb3886bbc6ddcb932d184bd2fdc0485 Mon Sep 17 00:00:00 2001 From: Richard Lewis Date: Wed, 7 Jun 2017 15:28:58 +0100 Subject: [PATCH 0030/1890] Fix active styling --- .../views/rooms/_AppsDrawer.scss | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss index cc473048c7..798c9af102 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss @@ -96,8 +96,8 @@ limitations under the License. } .mx_AppIconTile { - background-color: #666; - border: 1px solid #666; + background-color: $lightbox-bg-color; + border: 1px solid rgba(0, 0, 0, 0); width: 200px; box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2); transition: 0.3s; @@ -106,6 +106,11 @@ limitations under the License. display: inline-block; } +.mx_AppIconTile.mx_AppIconTile_active { + color: $accent-color; + border-color: $accent-color; +} + .mx_AppIconTile:hover { border: 1px solid $accent-color; box-shadow: 0 0 10px 5px rgba(200,200,200,0.5); @@ -129,9 +134,12 @@ limitations under the License. } .mx_AppIconTile_image { + padding: 10px; width: 75%; - margin: 10px; - max-height: 100px; + max-width:100px; + max-height:100px; + width: auto; + height: auto; } .mx_AppIconTile_imageContainer { From 5a94cecc626fc0cedde57754b2635011a8879cbc Mon Sep 17 00:00:00 2001 From: Bamstam Date: Wed, 7 Jun 2017 14:20:27 +0000 Subject: [PATCH 0031/1890] Translated using Weblate (German) Currently translated at 100.0% (162 of 162 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ --- src/i18n/strings/de_DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 59483af82d..97d8db9061 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -120,7 +120,7 @@ "Advanced notification settings": "Erweiterte Benachrichtigungs-Einstellungen", "Call invitation": "Anruf-Einladung", "Messages containing my display name": "Nachrichten, die meinen Anzeigenamen enthalten", - "Messages containing my user name": "Nachrichten, die meinen Nutzernamen enthalten", + "Messages containing my user name": "Nachrichten, die meinen Benutzernamen enthalten", "Messages in group chats": "Nachrichten in Gruppen-Chats", "Messages in one-to-one chats": "Nachrichten in Einzel-Chats", "Messages sent by bot": "Nachrichten von Bots", From fc7e20ab6278e64e1a4c8276c6d04344f0dc9381 Mon Sep 17 00:00:00 2001 From: Stanislav N Date: Wed, 7 Jun 2017 09:34:32 +0000 Subject: [PATCH 0032/1890] Translated using Weblate (Russian) Currently translated at 100.0% (162 of 162 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/ --- src/i18n/strings/ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index eda85493b4..e080a67c99 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -40,7 +40,7 @@ " from room": " из комнаты", "Guests can join": "Гость может присоединиться", "Guest users can't invite users. Please register to invite.": "Гость не может приглашать пользователей. Зарегистрируйтесь для приглошений.", - "Invite to this room": "Пригласить в эту комнату", + "Invite to this room": "Пригласить", "Keywords": "Ключевые слова", "Leave": "Покинуть", "Low Priority": "Низкий приоритет", From 0e6c25122bc52c24b2ba480467b695a8c85739ea Mon Sep 17 00:00:00 2001 From: Bamstam Date: Wed, 7 Jun 2017 14:20:27 +0000 Subject: [PATCH 0033/1890] Translated using Weblate (German) Currently translated at 82.7% (163 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ --- src/i18n/strings/de_DE.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 97d8db9061..2fd4769f3a 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -168,5 +168,6 @@ "Waiting for response from server": "Warte auf eine Antwort vom Server", "You are Rioting as a guest. Register or sign in to access more rooms and features!": "Du verwendest Riot als Gast. Registriere oder melde dich an um Zugang zu mehr Räumen und Funktionen zu bekommen!", "You need to be using HTTPS to place a screen-sharing call.": "Du musst HTTPS nutzen um einen Anruf mit Bildschirmfreigabe durchzuführen.", - "OK": "OK" + "OK": "OK", + "Login": "Anmeldung" } From 41df1e676df51f79c5a5ab51b34abff287052817 Mon Sep 17 00:00:00 2001 From: Bamstam Date: Wed, 7 Jun 2017 14:20:27 +0000 Subject: [PATCH 0034/1890] Translated using Weblate (German) Currently translated at 83.2% (164 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ --- src/i18n/strings/de_DE.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 2fd4769f3a..63b9d743b2 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -169,5 +169,6 @@ "You are Rioting as a guest. Register or sign in to access more rooms and features!": "Du verwendest Riot als Gast. Registriere oder melde dich an um Zugang zu mehr Räumen und Funktionen zu bekommen!", "You need to be using HTTPS to place a screen-sharing call.": "Du musst HTTPS nutzen um einen Anruf mit Bildschirmfreigabe durchzuführen.", "OK": "OK", - "Login": "Anmeldung" + "Login": "Anmeldung", + "Welcome to Riot.im": "Willkommen bei Riot.im" } From a2400baf59904e0e2ca5b3350ff83f1d6580b891 Mon Sep 17 00:00:00 2001 From: Bamstam Date: Wed, 7 Jun 2017 14:20:27 +0000 Subject: [PATCH 0035/1890] Translated using Weblate (German) Currently translated at 83.7% (165 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ --- src/i18n/strings/de_DE.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 63b9d743b2..bc7e5ded5d 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -170,5 +170,6 @@ "You need to be using HTTPS to place a screen-sharing call.": "Du musst HTTPS nutzen um einen Anruf mit Bildschirmfreigabe durchzuführen.", "OK": "OK", "Login": "Anmeldung", - "Welcome to Riot.im": "Willkommen bei Riot.im" + "Welcome to Riot.im": "Willkommen bei Riot.im", + "Decentralised, encrypted chat & collaboration powered by": "Dezentralisierter, verschlüsselter Chat" } From 87996b3a8aebb47507a6742aa1d22147d0d246d9 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Wed, 7 Jun 2017 17:14:36 +0100 Subject: [PATCH 0036/1890] Update CSS for ChatInviteDialog for https://github.com/matrix-org/matrix-react-sdk/pull/1050 - Remove address selector header - Adjust dialog content so that the error message ("No results" or otherwise) doesn't cause a change in height --- .../views/dialogs/_ChatInviteDialog.scss | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss index 4a214b51ce..38bb4f01c3 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss @@ -34,6 +34,10 @@ limitations under the License. word-wrap: nowrap; } +.mx_ChatInviteDialog .mx_Dialog_content { + min-height: 50px +} + .mx_ChatInviteDialog_inputContainer { border-radius: 3px; border: solid 1px $input-border-color; @@ -64,8 +68,3 @@ limitations under the License. pointer-events: none; } -.mx_ChatInviteDialog_addressSelectHeader { - font-weight: bold; - line-height: 150%; - text-indent: 4px; -} From a7c0c805d426c4393f8e85bc6f7f8c2649ff2c50 Mon Sep 17 00:00:00 2001 From: Bamstam Date: Wed, 7 Jun 2017 14:20:27 +0000 Subject: [PATCH 0037/1890] Translated using Weblate (German) Currently translated at 83.7% (165 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ --- src/i18n/strings/de_DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index bc7e5ded5d..f0901cb406 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -171,5 +171,5 @@ "OK": "OK", "Login": "Anmeldung", "Welcome to Riot.im": "Willkommen bei Riot.im", - "Decentralised, encrypted chat & collaboration powered by": "Dezentralisierter, verschlüsselter Chat" + "Decentralised, encrypted chat & collaboration powered by": "Dezentralisierter, verschlüsselter Chat & Zusammenarbeit" } From a2081f7d2a6b44e7eeee00889f0ebaea74d2441e Mon Sep 17 00:00:00 2001 From: Bamstam Date: Wed, 7 Jun 2017 14:20:27 +0000 Subject: [PATCH 0038/1890] Translated using Weblate (German) Currently translated at 83.7% (165 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ --- src/i18n/strings/de_DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index f0901cb406..3414f184df 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -171,5 +171,5 @@ "OK": "OK", "Login": "Anmeldung", "Welcome to Riot.im": "Willkommen bei Riot.im", - "Decentralised, encrypted chat & collaboration powered by": "Dezentralisierter, verschlüsselter Chat & Zusammenarbeit" + "Decentralised, encrypted chat & collaboration powered by": "Dezentralisierter, verschlüsselter Chat & Zusammenarbeit unterstützt von" } From 4a60dc5a209cf85e988da3a03965b6ad830b5dae Mon Sep 17 00:00:00 2001 From: Krombel Date: Wed, 7 Jun 2017 16:28:39 +0000 Subject: [PATCH 0039/1890] Translated using Weblate (German) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ --- src/i18n/strings/de_DE.json | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 3414f184df..e170c9754f 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -171,5 +171,37 @@ "OK": "OK", "Login": "Anmeldung", "Welcome to Riot.im": "Willkommen bei Riot.im", - "Decentralised, encrypted chat & collaboration powered by": "Dezentralisierter, verschlüsselter Chat & Zusammenarbeit unterstützt von" + "Decentralised, encrypted chat & collaboration powered by": "Dezentralisierter, verschlüsselter Chat & Zusammenarbeit unterstützt von", + "Search the room directory": "Durchsuche Raum-Verzeichnis", + "Chat with Riot Bot": "Chatte mit dem Riot-Bot", + "Get started with some tips from Riot Bot!": "Beginne mit einigen Tipps vom Riot-Bot!", + "General discussion about Matrix": "Generelle Diskussion über Matrix", + "Discussion of all things Matrix!": "\"Diskussion über alle Dinge\"-Matrix!", + "Riot/Web & Desktop chat": "Riot-Web & Desktop-Chat", + "Riot/iOS & matrix-ios-sdk chat": "Riot-iOS & \"matrix-ios-sdk\"-Chat", + "Riot/Android & matrix-android-sdk chat": "Riot-Android & matrix-android-sdk-Chat", + "Matrix technical discussions": "Technische Diskussion über Matrix", + "Running Matrix services": "Matrix-Dienste betreiben", + "Community-run support for Synapse": "Synapse-Support von der Community", + "Admin support for Dendrite": "Admin-Unterstützung für Dendrite", + "Announcements about Synapse releases": "Ankündigungen über Synapse-Versionen", + "Support for those using and running matrix-appservice-irc": "Unterstützung für die, die \"matrix-appservice-irc\" betreiben und nutzen", + "Building services on Matrix": "Dienste bauen für Matrix", + "Support for those using the Matrix spec": "Unterstützung für die Nutzer der Matrix-Spezification", + "Design and implementation of E2E in Matrix": "Design und Implementierung von Ende-zu-Ende-Verschlüsselung in Matrix", + "Implementing VR services with Matrix": "Implementierung von VR-Diensten mit Matrix", + "Implementing VoIP services with Matrix": "Implementierung von VoIP-Diensten mit Matrix", + "Discussion of the Identity Service API": "Diskussion der Identitätsdienst-API", + "Support for those using, running and writing other bridges": "Unterstützung für die, die andere Brücken nutzen, betreiben oder schreiben", + "Contributing code to Matrix and Riot": "Code zu Matrix und Riot beitragen", + "Dev chat for the Riot/Web dev team": "Entwickler-Chat für das Riot-Web-Entwickler-Team", + "Co-ordination for Riot/Web translators": "Koordination für Riot-Web-Übersetzer", + "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Viele Räume, die in Matrix existieren, sind verknüpft mit existierenden Netzwerken (Slack, IRC, Gitter usw.) oder unabhängig. Schau mal ins Verzeichnis!", + "Failed to change password. Is your password correct?": "Passwortänderung fehlgeschlagen. Ist dein Passwort richtig?", + "You have successfully set a password!": "Du hast erfolgreich ein Passwort gesetzt!", + "You can now return to your account after signing out, and sign in on other devices.": "Du kannst nun zu deinem Konto zurückkehren nach dem du dich an anderen Geräten ab- und angemeldet hast.", + "Continue": "Fortfahren", + "Please set a password!": "Bitte setze ein Passwort!", + "This will allow you to return to your account after signing out, and sign in on other devices.": "Dies erlaubt dir, dich wieder an deinem Konto anzumelden, nachdem du dich abgemeldet hast.", + "Dev chat for the Dendrite dev team": "Entwickler-Chat for das Dendrite-Entwickler-Team" } From e6889716aaeb841ef8b176e307d4381572651ec5 Mon Sep 17 00:00:00 2001 From: Krombel Date: Wed, 7 Jun 2017 16:41:35 +0000 Subject: [PATCH 0040/1890] Translated using Weblate (German) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ --- src/i18n/strings/de_DE.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index e170c9754f..e89edc15f6 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -6,9 +6,9 @@ "Notifications": "Benachrichtigungen", "Invite to this room": "In diesen Raum einladen", "Filter room names": "Raum-Namen filtern", - "Start chat": "Neuen Chat starten", + "Start chat": "Starte Chat", "Room directory": "Raum-Verzeichnis", - "Create new room": "Neuen Raum erstellen", + "Create new room": "Erstelle neuen Raum", "Settings": "Einstellungen", "powered by Matrix": "betrieben mit Matrix", "Custom Server Options": "Erweiterte Server-Optionen", From 4518776561c8bb8be60fda7e648caf2e2a4d257a Mon Sep 17 00:00:00 2001 From: Stanislav N Date: Wed, 7 Jun 2017 16:26:45 +0000 Subject: [PATCH 0041/1890] Translated using Weblate (Russian) Currently translated at 84.7% (167 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/ --- src/i18n/strings/ru.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index e080a67c99..1fa04d956b 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -167,5 +167,10 @@ "You are Rioting as a guest. Register or sign in to access more rooms and features!": "Вы пользуетесь Riot как гость. Зарегистрируйтесь или войдите в систему и плучите доступ к огромному количеству комнат и функций!", "OK": "ОК", "You need to be using HTTPS to place a screen-sharing call.": "Вы должны пользоваться HTTPS чтобы пользоваться видиозвонком.", - "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Еали ваш браузер не корректно отображает информацию и все или некоторые фукции отключены, вы можете и дальше этим браузеом пользоваться но но ваши проблемы останутся с вами!" + "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Еали ваш браузер не корректно отображает информацию и все или некоторые фукции отключены, вы можете и дальше этим браузеом пользоваться но но ваши проблемы останутся с вами!", + "Login": "Войти", + "Welcome to Riot.im": "Добро пожаловать на Riot.im", + "Decentralised, encrypted chat & collaboration powered by": "Децентрализованное, шифрованное общение и сотрудничество на основе", + "Search the room directory": "Поиск по директории комнат", + "Chat with Riot Bot": "Пообщаться с Riot Bot" } From c44d4a57ac34bd6926d0bcb9f1e09436f72d1d14 Mon Sep 17 00:00:00 2001 From: Pitchaya Boonsarngsuk Date: Wed, 7 Jun 2017 16:50:34 +0000 Subject: [PATCH 0042/1890] Translated using Weblate (Thai) Currently translated at 97.9% (193 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/ --- src/i18n/strings/th.json | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json index f885c15616..e46070bcb9 100644 --- a/src/i18n/strings/th.json +++ b/src/i18n/strings/th.json @@ -160,5 +160,36 @@ "Call invitation": "คำเชิญเข้าร่วมการโทร", "Failed to forget room %(errCode)s": "การลืมห้องล้มเหลว %(errCode)s", "Forget": "ลืม", - "Notifications on the following keywords follow rules which can’t be displayed here:": "การแจ้งเตือนจากคีย์เวิร์ดเหล่านี้ เป็นไปตามกฏที่ไม่สามารถแสดงที่นี่ได้:" + "Notifications on the following keywords follow rules which can’t be displayed here:": "การแจ้งเตือนจากคีย์เวิร์ดเหล่านี้ เป็นไปตามกฏที่ไม่สามารถแสดงที่นี่ได้:", + "Login": "เข้าสู่ระบบ", + "Welcome to Riot.im": "ยินดีต้อนรับสู่ Riot.im", + "Search the room directory": "ค้นหาในไดเรกทอรีห้อง", + "Chat with Riot Bot": "แชทกับบอท Riot", + "Get started with some tips from Riot Bot!": "มาเริ่มกันด้วยเคล็ดลับเล็กน้อยจากบอท Riot!", + "General discussion about Matrix": "พูดคุยเรื่องทั่วไปเกี่ยวกับ Matrix", + "Discussion of all things Matrix!": "พูดคุยทุกเรื่อง เรื่อง Matrix!", + "Riot/Web & Desktop chat": "แชทเกี่ยวกับ Riot บนเว็บและเดสก์ทอป", + "Riot/iOS & matrix-ios-sdk chat": "แชทเกี่ยวกับ Riot บน iOS และ matrix-ios-sdk", + "Riot/Android & matrix-android-sdk chat": "แชทเกี่ยวกับ Riot บน Android และ matrix-android-sdk", + "Matrix technical discussions": "พูดคุยเรื่อง Matrix ทางเทคนิค", + "Running Matrix services": "การติดตั้งบริการ Matrix", + "Community-run support for Synapse": "ฝ่ายสนับสนุน Synapse โดยชุมชนผู้ใช้", + "Admin support for Dendrite": "ฝ่ายสนับสนุน Dendrite จากผู้ดูแล", + "Announcements about Synapse releases": "ประกาศเกี่ยวกับ Synapse รุ่นใหม่", + "Support for those using and running matrix-appservice-irc": "ฝ่ายสนับสนุนสำหรับผู้ใช้ matrix-appservice-irc", + "Building services on Matrix": "การพัฒนาบริการบน Matrix", + "Support for those using the Matrix spec": "ฝ่ายสนับสนุนสำหรับผู้ใช้สเปค Matrix", + "Implementing VR services with Matrix": "การอิมพลีเมนต์บริการ VR ด้วย Matrix", + "Implementing VoIP services with Matrix": "การอิมพลีเมนต์บริการ VoIP ด้วย Matrix", + "Support for those using, running and writing other bridges": "ฝ่ายสนับสนุนสำหรับผู้ใช้หรือพัฒนาตัวเชื่อม Matrix", + "Contributing code to Matrix and Riot": "สมทบโค๊ดกับ Matrix และ Riot", + "Dev chat for the Riot/Web dev team": "แชทสำหรับทีมพัฒนา Riot บนเว็บ", + "Dev chat for the Dendrite dev team": "แชทสำหรับทีมพัฒนา Dendrite", + "Co-ordination for Riot/Web translators": "แชทสำหรับประสานงานการแปล Riot บนเว็บ", + "Failed to change password. Is your password correct?": "การเปลี่ยนรหัสผ่านล้มเหลว รหัสผ่านของคุณถูกต้องหรือไม่?", + "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "มีห้องอยู่มากมายใน Matrix ทั้งห้องที่เชื่อมไปยังเคีือข่ายอื่น (Slack, IRC, Gitter ฯลฯ) และห้องที่อยู่ด้วยตัวเอง ลองดูไดเรกทอรีสิ!", + "You have successfully set a password!": "การตั้งรหัสผ่านเสร็จสมบูรณ์!", + "You can now return to your account after signing out, and sign in on other devices.": "คุณสามารถกลับไปยังบัญชีของคุณหลังจากออกจากระบบ แล้วกลับเขาระบบอีกครั้งบนอุปกรณ์อื่น ๆ", + "Continue": "ดำเนินการต่อ", + "Please set a password!": "กรุณาตั้งรหัสผ่าน!" } From 8e161748ef9c3ca6a6cb559a81509cae3abcb9c9 Mon Sep 17 00:00:00 2001 From: Pitchaya Boonsarngsuk Date: Wed, 7 Jun 2017 16:52:53 +0000 Subject: [PATCH 0043/1890] Translated using Weblate (Thai) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/ --- src/i18n/strings/th.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json index e46070bcb9..16ba2a8f5b 100644 --- a/src/i18n/strings/th.json +++ b/src/i18n/strings/th.json @@ -189,7 +189,11 @@ "Failed to change password. Is your password correct?": "การเปลี่ยนรหัสผ่านล้มเหลว รหัสผ่านของคุณถูกต้องหรือไม่?", "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "มีห้องอยู่มากมายใน Matrix ทั้งห้องที่เชื่อมไปยังเคีือข่ายอื่น (Slack, IRC, Gitter ฯลฯ) และห้องที่อยู่ด้วยตัวเอง ลองดูไดเรกทอรีสิ!", "You have successfully set a password!": "การตั้งรหัสผ่านเสร็จสมบูรณ์!", - "You can now return to your account after signing out, and sign in on other devices.": "คุณสามารถกลับไปยังบัญชีของคุณหลังจากออกจากระบบ แล้วกลับเขาระบบอีกครั้งบนอุปกรณ์อื่น ๆ", + "You can now return to your account after signing out, and sign in on other devices.": "คุณสามารถกลับไปยังบัญชีของคุณหลังจากออกจากระบบ แล้วกลับเขาสู่ระบบบนอุปกรณ์อื่น ๆ", "Continue": "ดำเนินการต่อ", - "Please set a password!": "กรุณาตั้งรหัสผ่าน!" + "Please set a password!": "กรุณาตั้งรหัสผ่าน!", + "This will allow you to return to your account after signing out, and sign in on other devices.": "เพื่อคุณจะได้กลับมายังบัญชีเดิมของคุณได้ หลังจากออกจากระบบ แล้วกลับเข้าสู่ระบบในอุปกรณ์อื่น ๆ", + "Design and implementation of E2E in Matrix": "การออกแบบและใช้งาน E2E ใน Matrix", + "Discussion of the Identity Service API": "พูดคุยเกี่ยวกับ Identity Service API", + "Decentralised, encrypted chat & collaboration powered by": "แชทและประสานงานบนระบบที่ทั้งเข้ารหัสได้และกระจายศูนย์กลาง โดยใช้เทคโนโลยีจาก" } From 8e2609d23e2dedadeaed3e5af7fe93b30ba6b6a5 Mon Sep 17 00:00:00 2001 From: RiotTranslate Date: Wed, 7 Jun 2017 19:46:24 +0200 Subject: [PATCH 0044/1890] Update from Weblate. (#4218) * Translated using Weblate (Hungarian) Currently translated at 100.0% (162 of 162 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/hu/ * Translated using Weblate (Russian) Currently translated at 100.0% (162 of 162 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/ * Translated using Weblate (German) Currently translated at 100.0% (162 of 162 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (Russian) Currently translated at 100.0% (162 of 162 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/ * Translated using Weblate (German) Currently translated at 82.7% (163 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 83.2% (164 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 83.7% (165 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 83.7% (165 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 83.7% (165 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (German) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ * Translated using Weblate (Russian) Currently translated at 84.7% (167 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/ * Translated using Weblate (Thai) Currently translated at 97.9% (193 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/ * Translated using Weblate (Thai) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/ --- src/i18n/strings/de_DE.json | 43 +++++++++++++++++++++++++++++++++---- src/i18n/strings/ru.json | 11 +++++++--- src/i18n/strings/th.json | 37 ++++++++++++++++++++++++++++++- 3 files changed, 83 insertions(+), 8 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 59483af82d..e89edc15f6 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -6,9 +6,9 @@ "Notifications": "Benachrichtigungen", "Invite to this room": "In diesen Raum einladen", "Filter room names": "Raum-Namen filtern", - "Start chat": "Neuen Chat starten", + "Start chat": "Starte Chat", "Room directory": "Raum-Verzeichnis", - "Create new room": "Neuen Raum erstellen", + "Create new room": "Erstelle neuen Raum", "Settings": "Einstellungen", "powered by Matrix": "betrieben mit Matrix", "Custom Server Options": "Erweiterte Server-Optionen", @@ -120,7 +120,7 @@ "Advanced notification settings": "Erweiterte Benachrichtigungs-Einstellungen", "Call invitation": "Anruf-Einladung", "Messages containing my display name": "Nachrichten, die meinen Anzeigenamen enthalten", - "Messages containing my user name": "Nachrichten, die meinen Nutzernamen enthalten", + "Messages containing my user name": "Nachrichten, die meinen Benutzernamen enthalten", "Messages in group chats": "Nachrichten in Gruppen-Chats", "Messages in one-to-one chats": "Nachrichten in Einzel-Chats", "Messages sent by bot": "Nachrichten von Bots", @@ -168,5 +168,40 @@ "Waiting for response from server": "Warte auf eine Antwort vom Server", "You are Rioting as a guest. Register or sign in to access more rooms and features!": "Du verwendest Riot als Gast. Registriere oder melde dich an um Zugang zu mehr Räumen und Funktionen zu bekommen!", "You need to be using HTTPS to place a screen-sharing call.": "Du musst HTTPS nutzen um einen Anruf mit Bildschirmfreigabe durchzuführen.", - "OK": "OK" + "OK": "OK", + "Login": "Anmeldung", + "Welcome to Riot.im": "Willkommen bei Riot.im", + "Decentralised, encrypted chat & collaboration powered by": "Dezentralisierter, verschlüsselter Chat & Zusammenarbeit unterstützt von", + "Search the room directory": "Durchsuche Raum-Verzeichnis", + "Chat with Riot Bot": "Chatte mit dem Riot-Bot", + "Get started with some tips from Riot Bot!": "Beginne mit einigen Tipps vom Riot-Bot!", + "General discussion about Matrix": "Generelle Diskussion über Matrix", + "Discussion of all things Matrix!": "\"Diskussion über alle Dinge\"-Matrix!", + "Riot/Web & Desktop chat": "Riot-Web & Desktop-Chat", + "Riot/iOS & matrix-ios-sdk chat": "Riot-iOS & \"matrix-ios-sdk\"-Chat", + "Riot/Android & matrix-android-sdk chat": "Riot-Android & matrix-android-sdk-Chat", + "Matrix technical discussions": "Technische Diskussion über Matrix", + "Running Matrix services": "Matrix-Dienste betreiben", + "Community-run support for Synapse": "Synapse-Support von der Community", + "Admin support for Dendrite": "Admin-Unterstützung für Dendrite", + "Announcements about Synapse releases": "Ankündigungen über Synapse-Versionen", + "Support for those using and running matrix-appservice-irc": "Unterstützung für die, die \"matrix-appservice-irc\" betreiben und nutzen", + "Building services on Matrix": "Dienste bauen für Matrix", + "Support for those using the Matrix spec": "Unterstützung für die Nutzer der Matrix-Spezification", + "Design and implementation of E2E in Matrix": "Design und Implementierung von Ende-zu-Ende-Verschlüsselung in Matrix", + "Implementing VR services with Matrix": "Implementierung von VR-Diensten mit Matrix", + "Implementing VoIP services with Matrix": "Implementierung von VoIP-Diensten mit Matrix", + "Discussion of the Identity Service API": "Diskussion der Identitätsdienst-API", + "Support for those using, running and writing other bridges": "Unterstützung für die, die andere Brücken nutzen, betreiben oder schreiben", + "Contributing code to Matrix and Riot": "Code zu Matrix und Riot beitragen", + "Dev chat for the Riot/Web dev team": "Entwickler-Chat für das Riot-Web-Entwickler-Team", + "Co-ordination for Riot/Web translators": "Koordination für Riot-Web-Übersetzer", + "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Viele Räume, die in Matrix existieren, sind verknüpft mit existierenden Netzwerken (Slack, IRC, Gitter usw.) oder unabhängig. Schau mal ins Verzeichnis!", + "Failed to change password. Is your password correct?": "Passwortänderung fehlgeschlagen. Ist dein Passwort richtig?", + "You have successfully set a password!": "Du hast erfolgreich ein Passwort gesetzt!", + "You can now return to your account after signing out, and sign in on other devices.": "Du kannst nun zu deinem Konto zurückkehren nach dem du dich an anderen Geräten ab- und angemeldet hast.", + "Continue": "Fortfahren", + "Please set a password!": "Bitte setze ein Passwort!", + "This will allow you to return to your account after signing out, and sign in on other devices.": "Dies erlaubt dir, dich wieder an deinem Konto anzumelden, nachdem du dich abgemeldet hast.", + "Dev chat for the Dendrite dev team": "Entwickler-Chat for das Dendrite-Entwickler-Team" } diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index cc5ca1e861..1fa04d956b 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -40,7 +40,7 @@ " from room": " из комнаты", "Guests can join": "Гость может присоединиться", "Guest users can't invite users. Please register to invite.": "Гость не может приглашать пользователей. Зарегистрируйтесь для приглошений.", - "Invite to this room": "Пригласить в эту комнату", + "Invite to this room": "Пригласить", "Keywords": "Ключевые слова", "Leave": "Покинуть", "Low Priority": "Низкий приоритет", @@ -129,7 +129,7 @@ "A new version of Riot is available.": "Доступна новая версия Riot.", "All Rooms": "Все комнаты", "Cancel": "Отмена", - "Changelog": "Истоея изменений", + "Changelog": "История изменений", "Collapse panel": "Закрыпть панель", "Collecting app version information": "Сбор информации о версиях программы", "Collecting logs": "Сбор протоколов", @@ -167,5 +167,10 @@ "You are Rioting as a guest. Register or sign in to access more rooms and features!": "Вы пользуетесь Riot как гость. Зарегистрируйтесь или войдите в систему и плучите доступ к огромному количеству комнат и функций!", "OK": "ОК", "You need to be using HTTPS to place a screen-sharing call.": "Вы должны пользоваться HTTPS чтобы пользоваться видиозвонком.", - "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Еали ваш браузер не корректно отображает информацию и все или некоторые фукции отключены, вы можете и дальше этим браузеом пользоваться но но ваши проблемы останутся с вами!" + "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Еали ваш браузер не корректно отображает информацию и все или некоторые фукции отключены, вы можете и дальше этим браузеом пользоваться но но ваши проблемы останутся с вами!", + "Login": "Войти", + "Welcome to Riot.im": "Добро пожаловать на Riot.im", + "Decentralised, encrypted chat & collaboration powered by": "Децентрализованное, шифрованное общение и сотрудничество на основе", + "Search the room directory": "Поиск по директории комнат", + "Chat with Riot Bot": "Пообщаться с Riot Bot" } diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json index f885c15616..16ba2a8f5b 100644 --- a/src/i18n/strings/th.json +++ b/src/i18n/strings/th.json @@ -160,5 +160,40 @@ "Call invitation": "คำเชิญเข้าร่วมการโทร", "Failed to forget room %(errCode)s": "การลืมห้องล้มเหลว %(errCode)s", "Forget": "ลืม", - "Notifications on the following keywords follow rules which can’t be displayed here:": "การแจ้งเตือนจากคีย์เวิร์ดเหล่านี้ เป็นไปตามกฏที่ไม่สามารถแสดงที่นี่ได้:" + "Notifications on the following keywords follow rules which can’t be displayed here:": "การแจ้งเตือนจากคีย์เวิร์ดเหล่านี้ เป็นไปตามกฏที่ไม่สามารถแสดงที่นี่ได้:", + "Login": "เข้าสู่ระบบ", + "Welcome to Riot.im": "ยินดีต้อนรับสู่ Riot.im", + "Search the room directory": "ค้นหาในไดเรกทอรีห้อง", + "Chat with Riot Bot": "แชทกับบอท Riot", + "Get started with some tips from Riot Bot!": "มาเริ่มกันด้วยเคล็ดลับเล็กน้อยจากบอท Riot!", + "General discussion about Matrix": "พูดคุยเรื่องทั่วไปเกี่ยวกับ Matrix", + "Discussion of all things Matrix!": "พูดคุยทุกเรื่อง เรื่อง Matrix!", + "Riot/Web & Desktop chat": "แชทเกี่ยวกับ Riot บนเว็บและเดสก์ทอป", + "Riot/iOS & matrix-ios-sdk chat": "แชทเกี่ยวกับ Riot บน iOS และ matrix-ios-sdk", + "Riot/Android & matrix-android-sdk chat": "แชทเกี่ยวกับ Riot บน Android และ matrix-android-sdk", + "Matrix technical discussions": "พูดคุยเรื่อง Matrix ทางเทคนิค", + "Running Matrix services": "การติดตั้งบริการ Matrix", + "Community-run support for Synapse": "ฝ่ายสนับสนุน Synapse โดยชุมชนผู้ใช้", + "Admin support for Dendrite": "ฝ่ายสนับสนุน Dendrite จากผู้ดูแล", + "Announcements about Synapse releases": "ประกาศเกี่ยวกับ Synapse รุ่นใหม่", + "Support for those using and running matrix-appservice-irc": "ฝ่ายสนับสนุนสำหรับผู้ใช้ matrix-appservice-irc", + "Building services on Matrix": "การพัฒนาบริการบน Matrix", + "Support for those using the Matrix spec": "ฝ่ายสนับสนุนสำหรับผู้ใช้สเปค Matrix", + "Implementing VR services with Matrix": "การอิมพลีเมนต์บริการ VR ด้วย Matrix", + "Implementing VoIP services with Matrix": "การอิมพลีเมนต์บริการ VoIP ด้วย Matrix", + "Support for those using, running and writing other bridges": "ฝ่ายสนับสนุนสำหรับผู้ใช้หรือพัฒนาตัวเชื่อม Matrix", + "Contributing code to Matrix and Riot": "สมทบโค๊ดกับ Matrix และ Riot", + "Dev chat for the Riot/Web dev team": "แชทสำหรับทีมพัฒนา Riot บนเว็บ", + "Dev chat for the Dendrite dev team": "แชทสำหรับทีมพัฒนา Dendrite", + "Co-ordination for Riot/Web translators": "แชทสำหรับประสานงานการแปล Riot บนเว็บ", + "Failed to change password. Is your password correct?": "การเปลี่ยนรหัสผ่านล้มเหลว รหัสผ่านของคุณถูกต้องหรือไม่?", + "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "มีห้องอยู่มากมายใน Matrix ทั้งห้องที่เชื่อมไปยังเคีือข่ายอื่น (Slack, IRC, Gitter ฯลฯ) และห้องที่อยู่ด้วยตัวเอง ลองดูไดเรกทอรีสิ!", + "You have successfully set a password!": "การตั้งรหัสผ่านเสร็จสมบูรณ์!", + "You can now return to your account after signing out, and sign in on other devices.": "คุณสามารถกลับไปยังบัญชีของคุณหลังจากออกจากระบบ แล้วกลับเขาสู่ระบบบนอุปกรณ์อื่น ๆ", + "Continue": "ดำเนินการต่อ", + "Please set a password!": "กรุณาตั้งรหัสผ่าน!", + "This will allow you to return to your account after signing out, and sign in on other devices.": "เพื่อคุณจะได้กลับมายังบัญชีเดิมของคุณได้ หลังจากออกจากระบบ แล้วกลับเข้าสู่ระบบในอุปกรณ์อื่น ๆ", + "Design and implementation of E2E in Matrix": "การออกแบบและใช้งาน E2E ใน Matrix", + "Discussion of the Identity Service API": "พูดคุยเกี่ยวกับ Identity Service API", + "Decentralised, encrypted chat & collaboration powered by": "แชทและประสานงานบนระบบที่ทั้งเข้ารหัสได้และกระจายศูนย์กลาง โดยใช้เทคโนโลยีจาก" } From 96e3c43570f65e47a6a48d876837cf10238a0e99 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 7 Jun 2017 18:48:14 +0100 Subject: [PATCH 0045/1890] tweak welcome page text --- res/home.html | 2 +- src/i18n/strings/en_EN.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/home.html b/res/home.html index 8a94d4af22..c77b38090c 100644 --- a/res/home.html +++ b/res/home.html @@ -32,7 +32,7 @@
-

_t("General discussion about Matrix")

+

_t("General discussion about Matrix and Riot")

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index b57dbb65be..afc8cc687e 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -167,7 +167,7 @@ "Search the room directory": "Search the room directory", "Chat with Riot Bot": "Chat with Riot Bot", "Get started with some tips from Riot Bot!": "Get started with some tips from Riot Bot!", - "General discussion about Matrix": "General discussion about Matrix", + "General discussion about Matrix and Riot": "General discussion about Matrix and Riot", "Discussion of all things Matrix!": "Discussion of all things Matrix!", "Riot/Web & Desktop chat": "Riot/Web & Desktop chat", "Riot/iOS & matrix-ios-sdk chat": "Riot/iOS & matrix-ios-sdk chat", From f26b3fe9b2ab00ebeb203368886e415e77447ed8 Mon Sep 17 00:00:00 2001 From: Bamstam Date: Wed, 7 Jun 2017 18:23:16 +0000 Subject: [PATCH 0046/1890] Translated using Weblate (German) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/ --- src/i18n/strings/de_DE.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index e89edc15f6..294340ace3 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -8,7 +8,7 @@ "Filter room names": "Raum-Namen filtern", "Start chat": "Starte Chat", "Room directory": "Raum-Verzeichnis", - "Create new room": "Erstelle neuen Raum", + "Create new room": "Neuen Raum erstellen", "Settings": "Einstellungen", "powered by Matrix": "betrieben mit Matrix", "Custom Server Options": "Erweiterte Server-Optionen", @@ -175,7 +175,7 @@ "Search the room directory": "Durchsuche Raum-Verzeichnis", "Chat with Riot Bot": "Chatte mit dem Riot-Bot", "Get started with some tips from Riot Bot!": "Beginne mit einigen Tipps vom Riot-Bot!", - "General discussion about Matrix": "Generelle Diskussion über Matrix", + "General discussion about Matrix": "Allgemeine Diskussion über Matrix", "Discussion of all things Matrix!": "\"Diskussion über alle Dinge\"-Matrix!", "Riot/Web & Desktop chat": "Riot-Web & Desktop-Chat", "Riot/iOS & matrix-ios-sdk chat": "Riot-iOS & \"matrix-ios-sdk\"-Chat", @@ -196,12 +196,12 @@ "Contributing code to Matrix and Riot": "Code zu Matrix und Riot beitragen", "Dev chat for the Riot/Web dev team": "Entwickler-Chat für das Riot-Web-Entwickler-Team", "Co-ordination for Riot/Web translators": "Koordination für Riot-Web-Übersetzer", - "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Viele Räume, die in Matrix existieren, sind verknüpft mit existierenden Netzwerken (Slack, IRC, Gitter usw.) oder unabhängig. Schau mal ins Verzeichnis!", + "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Im Matrix-Netzwerk gibt es bereits jetzt zahlreiche Räume, die entweder mit bekannten Netzwerken wie Slack, IRC, Gitter, usw. verknüpft sind oder auch komplett eigenständig betrieben werden. Einen genauen Überblick erhältst du im Raum-Verzeichnis!", "Failed to change password. Is your password correct?": "Passwortänderung fehlgeschlagen. Ist dein Passwort richtig?", "You have successfully set a password!": "Du hast erfolgreich ein Passwort gesetzt!", "You can now return to your account after signing out, and sign in on other devices.": "Du kannst nun zu deinem Konto zurückkehren nach dem du dich an anderen Geräten ab- und angemeldet hast.", "Continue": "Fortfahren", - "Please set a password!": "Bitte setze ein Passwort!", + "Please set a password!": "Bitte ein Passwort einrichten!", "This will allow you to return to your account after signing out, and sign in on other devices.": "Dies erlaubt dir, dich wieder an deinem Konto anzumelden, nachdem du dich abgemeldet hast.", "Dev chat for the Dendrite dev team": "Entwickler-Chat for das Dendrite-Entwickler-Team" } From 8398e19cead960bcfa2110488474baa04b91a92f Mon Sep 17 00:00:00 2001 From: Pitchaya Boonsarngsuk Date: Wed, 7 Jun 2017 18:35:43 +0000 Subject: [PATCH 0047/1890] Translated using Weblate (Thai) Currently translated at 100.0% (197 of 197 strings) Translation: Riot Web/Riot Web Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/ --- src/i18n/strings/th.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json index 16ba2a8f5b..f2f6d17c78 100644 --- a/src/i18n/strings/th.json +++ b/src/i18n/strings/th.json @@ -138,7 +138,7 @@ "All notifications are currently disabled for all targets.": "การแจ้งเตือนทั้งหมดถูกปิดใช้งานสำหรับทุกอุปกรณ์", "An error occurred whilst saving your email notification preferences.": "เกิดข้อผิดพลาดระหว่างบันทึกการตั้งค่าการแจ้งเตือนทางอีเมล", "Couldn't find a matching Matrix room": "ไม่พบห้อง Matrix ที่ตรงกับคำค้นหา", - "customServer_text": "คุณสามารถกำหนดเซิร์ฟเวอร์บ้านเองได้โดยใส่ URL ของเซิร์ฟเวอร์นั้น เพื่อเข้าสู่ระบบของเซิร์ฟเวอร์ Matrix อื่น
ทั้งนี่เพื่อให้คุณสามารถใช้ Riot กับบัญชี Matrix ที่มีอยู่แล้วบนเซิร์ฟเวอร์บ้านอื่น ๆ ได้

คุณอาจเลือกเซิร์ฟเวอร์ยืนยันตัวตนเองด้วยก็ได้ แต่คุณจะไม่สามารถเชิญผู้ใช้อื่นด้วยที่อยู่อีเมล หรือรับคำเชิญจากผู้ใช้อื่นทางที่อยู่อีเมลได้", + "customServer_text": "คุณสามารถกำหนดเซิร์ฟเวอร์บ้านเองได้โดยใส่ URL ของเซิร์ฟเวอร์นั้น เพื่อเข้าสู่ระบบของเซิร์ฟเวอร์ Matrix อื่น
ทั้งนี่เพื่อให้คุณสามารถใช้ Riot กับบัญชี Matrix ที่มีอยู่แล้วบนเซิร์ฟเวอร์บ้านอื่น ๆ ได้

คุณอาจเลือกเซิร์ฟเวอร์ระบุตัวตนเองด้วยก็ได้ แต่คุณจะไม่สามารถเชิญผู้ใช้อื่นด้วยที่อยู่อีเมล หรือรับคำเชิญจากผู้ใช้อื่นทางที่อยู่อีเมลได้", "delete the alias.": "ลบนามแฝง", "Drop here %(toAction)s": "ปล่อยที่นี่ %(toAction)s", "Error saving email notification preferences": "การบันทึกการตั้งค่าการแจ้งเตือนทางอีเมลผิดพลาด", @@ -150,7 +150,7 @@ "Failed to set Direct Message status of room": "การตั้งสถานะข้อความตรงของห้องล้มเหลว", "Favourite": "รายการโปรด", "Failed to": "ล้มเหลวในการ", - "Fetching third party location failed": "กำลังเรียกข้อมูลตำแหน่งจากบุคคลที่สามล้มเหลว", + "Fetching third party location failed": "การเรียกข้อมูลตำแหน่งจากบุคคลที่สามล้มเหลว", "Guest users can't invite users. Please register to invite.": "แขกไม่สามารถเชิญผู้ใช้ได้ กรุณาลงทะเบียนเพื่อเชิญผู้อื่น", "The Home Server may be too old to support third party networks": "เซิร์ฟเวอร์บ้านอาจเก่าเกินกว่าจะรองรับเครือข่ายของบุคคลที่สาม", "The server may be unavailable or overloaded": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งานหรือทำงานหนักเกินไป", @@ -181,7 +181,7 @@ "Support for those using the Matrix spec": "ฝ่ายสนับสนุนสำหรับผู้ใช้สเปค Matrix", "Implementing VR services with Matrix": "การอิมพลีเมนต์บริการ VR ด้วย Matrix", "Implementing VoIP services with Matrix": "การอิมพลีเมนต์บริการ VoIP ด้วย Matrix", - "Support for those using, running and writing other bridges": "ฝ่ายสนับสนุนสำหรับผู้ใช้หรือพัฒนาตัวเชื่อม Matrix", + "Support for those using, running and writing other bridges": "ฝ่ายสนับสนุนสำหรับผู้ใช้หรือพัฒนาตัวเชื่อมอื่น ๆ", "Contributing code to Matrix and Riot": "สมทบโค๊ดกับ Matrix และ Riot", "Dev chat for the Riot/Web dev team": "แชทสำหรับทีมพัฒนา Riot บนเว็บ", "Dev chat for the Dendrite dev team": "แชทสำหรับทีมพัฒนา Dendrite", From 873656232fceba83979edffc0deda41fa8e3029b Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 8 Jun 2017 11:42:03 +0100 Subject: [PATCH 0048/1890] fix vector-im/riot-web#3298 correctly, and unbreak scrolling fixes https://github.com/vector-im/riot-web/issues/4241 and https://github.com/vector-im/riot-web/issues/4154 --- res/home.html | 117 +++++++++++++++++- res/home/css/welcome.css | 106 ---------------- .../css/vector-web/structures/_HomePage.scss | 5 +- 3 files changed, 118 insertions(+), 110 deletions(-) delete mode 100644 res/home/css/welcome.css diff --git a/res/home.html b/res/home.html index c77b38090c..efe2da4b89 100644 --- a/res/home.html +++ b/res/home.html @@ -1,5 +1,118 @@ - -