From b28ed6075bbf65fdb78bd09e4773ab2a6f25a936 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Thu, 17 May 2018 18:15:34 +0100 Subject: [PATCH 001/283] Implement slightly hacky CSS soln. to thumbnail sizing As the slightly nicer alternative to fixupHeight being applied once we actually have a timelineWidth. The niceness comes from not needing timelineWidth, which means we can implement at render time with CSS. (Despite still calculating aspect ratios when we render.) --- res/css/views/messages/_MImageBody.scss | 13 +++- src/components/views/messages/MImageBody.js | 66 ++++++--------------- 2 files changed, 29 insertions(+), 50 deletions(-) diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss index 1c809f0743..9f0e77f765 100644 --- a/res/css/views/messages/_MImageBody.scss +++ b/res/css/views/messages/_MImageBody.scss @@ -20,5 +20,14 @@ limitations under the License. } .mx_MImageBody_thumbnail { - max-width: 100%; -} \ No newline at end of file + position: absolute; + width: 100%; + height: 100%; + left: 0; + top: 0; +} + +.mx_MImageBody_thumbnail_container { + overflow: hidden; + position: relative; +} diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index 6cc492acf8..87fe8d906c 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -21,15 +21,15 @@ import PropTypes from 'prop-types'; import { MatrixClient } from 'matrix-js-sdk'; import MFileBody from './MFileBody'; -import ImageUtils from '../../../ImageUtils'; import Modal from '../../../Modal'; import sdk from '../../../index'; -import dis from '../../../dispatcher'; import { decryptFile } from '../../../utils/DecryptFile'; import Promise from 'bluebird'; import { _t } from '../../../languageHandler'; import SettingsStore from "../../../settings/SettingsStore"; +const THUMBNAIL_MAX_HEIGHT = 600; + export default class extends React.Component { displayName: 'MImageBody' @@ -48,14 +48,12 @@ export default class extends React.Component { constructor(props) { super(props); - this.onAction = this.onAction.bind(this); this.onImageError = this.onImageError.bind(this); this.onImageLoad = this.onImageLoad.bind(this); this.onImageEnter = this.onImageEnter.bind(this); this.onImageLeave = this.onImageLeave.bind(this); this.onClientSync = this.onClientSync.bind(this); this.onClick = this.onClick.bind(this); - this.fixupHeight = this.fixupHeight.bind(this); this._isGif = this._isGif.bind(this); this.state = { @@ -140,7 +138,6 @@ export default class extends React.Component { } onImageLoad() { - this.fixupHeight(); this.props.onWidgetLoad(); } @@ -176,7 +173,6 @@ export default class extends React.Component { } componentDidMount() { - this.dispatcherRef = dis.register(this.onAction); const content = this.props.mxEvent.getContent(); if (content.file !== undefined && this.state.decryptedUrl === null) { let thumbnailPromise = Promise.resolve(null); @@ -217,7 +213,6 @@ export default class extends React.Component { componentWillUnmount() { this.unmounted = true; - dis.unregister(this.dispatcherRef); this.context.matrixClient.removeListener('sync', this.onClientSync); this._afterComponentWillUnmount(); @@ -234,50 +229,25 @@ export default class extends React.Component { _afterComponentWillUnmount() { } - onAction(payload) { - if (payload.action === "timeline_resize") { - this.fixupHeight(); - } - } - - fixupHeight() { - if (!this.refs.image) { - console.warn(`Refusing to fix up height on ${this.displayName} with no image element`); - return; - } - - const content = this.props.mxEvent.getContent(); - const timelineWidth = this.refs.body.offsetWidth; - const maxHeight = 600; // let images take up as much width as they can so long as the height doesn't exceed 600px. - // the alternative here would be 600*timelineWidth/800; to scale them down to fit inside a 4:3 bounding box - - // FIXME: this will break on clientside generated thumbnails (as per e2e rooms) - // which may well be much smaller than the 800x600 bounding box. - - // FIXME: It will also break really badly for images with broken or missing thumbnails - - // FIXME: Because we don't know what size of thumbnail the server's actually going to send - // us, we can't even really layout the page nicely for it. Instead we have to assume - // it'll target 800x600 and we'll downsize if needed to make things fit. - - // console.log("trying to fit image into timelineWidth of " + this.refs.body.offsetWidth + " or " + this.refs.body.clientWidth); - let thumbHeight = null; - if (content.info) { - thumbHeight = ImageUtils.thumbHeight(content.info.w, content.info.h, timelineWidth, maxHeight); - } - this.refs.image.style.height = thumbHeight + "px"; - // console.log("Image height now", thumbHeight); - } - _messageContent(contentUrl, thumbUrl, content) { + const maxHeight = Math.min(THUMBNAIL_MAX_HEIGHT, content.info.h); + const maxWidth = content.info.w * maxHeight / content.info.h; const thumbnail = ( - {content.body} +
+ { /* Calculate aspect ratio, using %padding will size _container correctly */ } +
+ + { /* Thumbnail CSS class resizes to exactly container size with inline CSS + to restrict width */ } + {content.body} +
); From bbcf2fea53d81cb344e36e21221c298be46e30d5 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Fri, 18 May 2018 09:47:49 +0100 Subject: [PATCH 002/283] Fix e2e image thumbnail spinner containing box correct size --- src/components/views/messages/MImageBody.js | 55 ++++++++++----------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index 87fe8d906c..f1454d1ac5 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -232,7 +232,29 @@ export default class extends React.Component { _messageContent(contentUrl, thumbUrl, content) { const maxHeight = Math.min(THUMBNAIL_MAX_HEIGHT, content.info.h); const maxWidth = content.info.w * maxHeight / content.info.h; - const thumbnail = ( + + let img = null; + // e2e image hasn't been decrypted yet + if (content.file !== undefined && this.state.decryptedUrl === null) { + img =
+ {content.body} +
; + } else if (thumbUrl && !this.state.imgError) { + img = {content.body}; + } + const thumbnail = img ?
{ /* Calculate aspect ratio, using %padding will size _container correctly */ } @@ -240,20 +262,13 @@ export default class extends React.Component { { /* Thumbnail CSS class resizes to exactly container size with inline CSS to restrict width */ } - {content.body} + { img }
- - ); + : null; return ( - { thumbUrl && !this.state.imgError ? thumbnail : '' } + { thumbnail } ); @@ -271,24 +286,6 @@ export default class extends React.Component { ); } - if (content.file !== undefined && this.state.decryptedUrl === null) { - // Need to decrypt the attachment - // The attachment is decrypted in componentDidMount. - // For now add an img tag with a spinner. - return ( - -
- {content.body} -
- - ); - } const contentUrl = this._getContentUrl(); let thumbUrl; From b41b9aa4facd2e4767d993f1d173ec9fdbc03c37 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Fri, 18 May 2018 09:58:52 +0100 Subject: [PATCH 003/283] Remove fixupHeight call from MStickerBody --- src/components/views/messages/MStickerBody.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js index 3a412fc2e2..cdb60f0074 100644 --- a/src/components/views/messages/MStickerBody.js +++ b/src/components/views/messages/MStickerBody.js @@ -40,7 +40,6 @@ export default class MStickerBody extends MImageBody { } _onImageLoad() { - this.fixupHeight(); this.setState({ placeholderClasses: 'mx_MStickerBody_placeholder_invisible', }); @@ -110,8 +109,6 @@ export default class MStickerBody extends MImageBody { // The pixel size of sticker images is generally larger than their intended display // size so they render at native reolution on HiDPI displays. We therefore need to // explicity set the size so they render at the intended size. - // XXX: This will be clobberred when we run fixupHeight(), but we need to do it - // here otherwise the stickers are momentarily displayed at the pixel size. const imageStyle = { height: content.info.h, // leave the browser the calculate the width automatically From d11442de0434282c70052327420ab359de9bd161 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Fri, 18 May 2018 10:15:59 +0100 Subject: [PATCH 004/283] Adjust comment --- src/components/views/messages/MImageBody.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index f1454d1ac5..f98432a166 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -260,8 +260,7 @@ export default class extends React.Component { { /* Calculate aspect ratio, using %padding will size _container correctly */ }
- { /* Thumbnail CSS class resizes to exactly container size with inline CSS - to restrict width */ } + { /* mx_MImageBody_thumbnail resizes img to exactly container size */ } { img } : null; From 7e7e2a747313d2d9d45d67bb5019b1fc0b7ef20a Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Fri, 18 May 2018 10:27:22 +0100 Subject: [PATCH 005/283] Add more comments to explain thumbnail sizing --- res/css/views/messages/_MImageBody.scss | 4 ++++ src/components/views/messages/MImageBody.js | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss index 9f0e77f765..9667337f5a 100644 --- a/res/css/views/messages/_MImageBody.scss +++ b/res/css/views/messages/_MImageBody.scss @@ -28,6 +28,10 @@ limitations under the License. } .mx_MImageBody_thumbnail_container { + // Prevent the padding-bottom (added inline in MImageBody.js) from + // effecting elements below the container. overflow: hidden; + + // Make sure the _thumbnail is positioned relative to the _container position: relative; } diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index f98432a166..656bd02840 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -230,7 +230,10 @@ export default class extends React.Component { } _messageContent(contentUrl, thumbUrl, content) { + // The maximum height of the thumbnail as it is rendered as an const maxHeight = Math.min(THUMBNAIL_MAX_HEIGHT, content.info.h); + // The maximum width of the thumbnail, as dictated by it's natural + // maximum height. const maxWidth = content.info.w * maxHeight / content.info.h; let img = null; @@ -246,6 +249,8 @@ export default class extends React.Component { }} /> ; } else if (thumbUrl && !this.state.imgError) { + // Restrict the width of the thumbnail here, otherwise it will fill the container + // which has the same width as the timeline img = {content.body} Date: Fri, 18 May 2018 11:29:30 +0100 Subject: [PATCH 006/283] Spelling/grammar --- res/css/views/messages/_MImageBody.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss index 9667337f5a..5eef236b26 100644 --- a/res/css/views/messages/_MImageBody.scss +++ b/res/css/views/messages/_MImageBody.scss @@ -29,7 +29,7 @@ limitations under the License. .mx_MImageBody_thumbnail_container { // Prevent the padding-bottom (added inline in MImageBody.js) from - // effecting elements below the container. + // affecting elements below the container. overflow: hidden; // Make sure the _thumbnail is positioned relative to the _container From 015093b371074c1318fa140c166585c4c68b6778 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Fri, 18 May 2018 11:33:33 +0100 Subject: [PATCH 007/283] Move inline style to stylesheet --- res/css/views/messages/_MImageBody.scss | 10 ++++++++++ src/components/views/messages/MImageBody.js | 10 ++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss index 5eef236b26..64821434dd 100644 --- a/res/css/views/messages/_MImageBody.scss +++ b/res/css/views/messages/_MImageBody.scss @@ -35,3 +35,13 @@ limitations under the License. // Make sure the _thumbnail is positioned relative to the _container position: relative; } + +.mx_MImageBody_thumbnail_spinner { + display: flex; + align-items: center; + width: 100%; +} + +.mx_MImageBody_thumbnail_spinner img { + margin: auto; +} diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index 656bd02840..d9108a2fe1 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -239,14 +239,8 @@ export default class extends React.Component { let img = null; // e2e image hasn't been decrypted yet if (content.file !== undefined && this.state.decryptedUrl === null) { - img =
- {content.body} + img =
+ {content.body}
; } else if (thumbUrl && !this.state.imgError) { // Restrict the width of the thumbnail here, otherwise it will fill the container From 35ab573bc54c56911a6f566ce6227289658e6e22 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Mon, 21 May 2018 18:44:00 +0900 Subject: [PATCH 008/283] Update sinon to 5.0.7 --- package-lock.json | 2353 +++++++++-------- package.json | 2 +- .../structures/TimelinePanel-test.js | 2 +- 3 files changed, 1210 insertions(+), 1147 deletions(-) diff --git a/package-lock.json b/package-lock.json index f183f1635d..97ed7b5dea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,25 @@ { "name": "matrix-react-sdk", - "version": "0.12.2", + "version": "0.12.4", "lockfileVersion": 1, "requires": true, "dependencies": { + "@sinonjs/formatio": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz", + "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==", + "dev": true, + "requires": { + "samsam": "1.3.0" + } + }, "accepts": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=", "dev": true, "requires": { - "mime-types": "2.1.17", + "mime-types": "~2.1.11", "negotiator": "0.6.1" } }, @@ -26,7 +35,7 @@ "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", "dev": true, "requires": { - "acorn": "3.3.0" + "acorn": "^3.0.4" }, "dependencies": { "acorn": { @@ -44,14 +53,14 @@ "dev": true }, "ajv": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz", - "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=", + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.0.0", - "json-schema-traverse": "0.3.1", - "json-stable-stringify": "1.0.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } }, "ajv-keywords": { @@ -66,9 +75,9 @@ "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" } }, "amdefine": { @@ -106,8 +115,8 @@ "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", "dev": true, "requires": { - "micromatch": "2.3.11", - "normalize-path": "2.1.1" + "micromatch": "^2.1.5", + "normalize-path": "^2.0.0" } }, "argparse": { @@ -116,7 +125,7 @@ "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", "dev": true, "requires": { - "sprintf-js": "1.0.3" + "sprintf-js": "~1.0.2" }, "dependencies": { "sprintf-js": { @@ -133,7 +142,7 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "arr-flatten": { @@ -148,8 +157,8 @@ "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", "dev": true, "requires": { - "define-properties": "1.1.2", - "es-abstract": "1.9.0" + "define-properties": "^1.1.2", + "es-abstract": "^1.7.0" } }, "array-slice": { @@ -164,7 +173,7 @@ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "dev": true, "requires": { - "array-uniq": "1.0.3" + "array-uniq": "^1.0.1" } }, "array-uniq": { @@ -238,9 +247,9 @@ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, "aws4": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", - "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", + "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==" }, "babel-cli": { "version": "6.26.0", @@ -248,21 +257,21 @@ "integrity": "sha1-UCq1SHTX24itALiHoGODzgPQAvE=", "dev": true, "requires": { - "babel-core": "6.26.0", - "babel-polyfill": "6.26.0", - "babel-register": "6.26.0", - "babel-runtime": "6.26.0", - "chokidar": "1.7.0", - "commander": "2.11.0", - "convert-source-map": "1.5.0", - "fs-readdir-recursive": "1.0.0", - "glob": "7.1.2", - "lodash": "4.17.4", - "output-file-sync": "1.1.2", - "path-is-absolute": "1.0.1", - "slash": "1.0.0", - "source-map": "0.5.7", - "v8flags": "2.1.1" + "babel-core": "^6.26.0", + "babel-polyfill": "^6.26.0", + "babel-register": "^6.26.0", + "babel-runtime": "^6.26.0", + "chokidar": "^1.6.1", + "commander": "^2.11.0", + "convert-source-map": "^1.5.0", + "fs-readdir-recursive": "^1.0.0", + "glob": "^7.1.2", + "lodash": "^4.17.4", + "output-file-sync": "^1.1.2", + "path-is-absolute": "^1.0.1", + "slash": "^1.0.0", + "source-map": "^0.5.6", + "v8flags": "^2.1.1" }, "dependencies": { "glob": { @@ -271,12 +280,12 @@ "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } } } @@ -287,9 +296,9 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" } }, "babel-core": { @@ -298,25 +307,25 @@ "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-generator": "6.26.0", - "babel-helpers": "6.24.1", - "babel-messages": "6.23.0", - "babel-register": "6.26.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "convert-source-map": "1.5.0", - "debug": "2.6.9", - "json5": "0.5.1", - "lodash": "4.17.4", - "minimatch": "3.0.4", - "path-is-absolute": "1.0.1", - "private": "0.1.8", - "slash": "1.0.0", - "source-map": "0.5.7" + "babel-code-frame": "^6.26.0", + "babel-generator": "^6.26.0", + "babel-helpers": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-register": "^6.26.0", + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "convert-source-map": "^1.5.0", + "debug": "^2.6.8", + "json5": "^0.5.1", + "lodash": "^4.17.4", + "minimatch": "^3.0.4", + "path-is-absolute": "^1.0.1", + "private": "^0.1.7", + "slash": "^1.0.0", + "source-map": "^0.5.6" } }, "babel-eslint": { @@ -325,11 +334,11 @@ "integrity": "sha1-UpNBn+NnLWZZjTJ9qWlFZ7pqXy8=", "dev": true, "requires": { - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash.assign": "4.2.0", - "lodash.pickby": "4.6.0" + "babel-traverse": "^6.0.20", + "babel-types": "^6.0.19", + "babylon": "^6.0.18", + "lodash.assign": "^4.0.0", + "lodash.pickby": "^4.0.0" } }, "babel-generator": { @@ -338,14 +347,14 @@ "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=", "dev": true, "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.4", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.17.4", + "source-map": "^0.5.6", + "trim-right": "^1.0.1" } }, "babel-helper-builder-binary-assignment-operator-visitor": { @@ -354,9 +363,9 @@ "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", "dev": true, "requires": { - "babel-helper-explode-assignable-expression": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-explode-assignable-expression": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-builder-react-jsx": { @@ -365,9 +374,9 @@ "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "esutils": "2.0.2" + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "esutils": "^2.0.2" } }, "babel-helper-call-delegate": { @@ -376,10 +385,10 @@ "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", "dev": true, "requires": { - "babel-helper-hoist-variables": "6.24.1", - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-hoist-variables": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-define-map": { @@ -388,10 +397,10 @@ "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "lodash": "4.17.4" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" } }, "babel-helper-explode-assignable-expression": { @@ -400,9 +409,9 @@ "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-function-name": { @@ -411,11 +420,11 @@ "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", "dev": true, "requires": { - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-get-function-arity": { @@ -424,8 +433,8 @@ "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-hoist-variables": { @@ -434,8 +443,8 @@ "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-optimise-call-expression": { @@ -444,8 +453,8 @@ "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-regex": { @@ -454,9 +463,9 @@ "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "lodash": "4.17.4" + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" } }, "babel-helper-remap-async-to-generator": { @@ -465,11 +474,11 @@ "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-replace-supers": { @@ -478,12 +487,12 @@ "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", "dev": true, "requires": { - "babel-helper-optimise-call-expression": "6.24.1", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-optimise-call-expression": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helpers": { @@ -492,8 +501,8 @@ "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-loader": { @@ -502,10 +511,10 @@ "integrity": "sha1-CzQRLVsHSKjc2/Uaz2+b1C1QuMo=", "dev": true, "requires": { - "find-cache-dir": "0.1.1", - "loader-utils": "0.2.17", - "mkdirp": "0.5.1", - "object-assign": "4.1.1" + "find-cache-dir": "^0.1.1", + "loader-utils": "^0.2.16", + "mkdirp": "^0.5.1", + "object-assign": "^4.0.1" } }, "babel-messages": { @@ -514,7 +523,7 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-add-module-exports": { @@ -529,7 +538,7 @@ "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-syntax-async-functions": { @@ -580,10 +589,10 @@ "integrity": "sha1-Ruo+fFr2KXgqyfHtG3zTj4Qlr9Q=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-plugin-syntax-async-functions": "6.13.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0" + "babel-helper-function-name": "^6.8.0", + "babel-plugin-syntax-async-functions": "^6.8.0", + "babel-template": "^6.9.0", + "babel-traverse": "^6.10.4" } }, "babel-plugin-transform-async-to-generator": { @@ -592,9 +601,9 @@ "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", "dev": true, "requires": { - "babel-helper-remap-async-to-generator": "6.24.1", - "babel-plugin-syntax-async-functions": "6.13.0", - "babel-runtime": "6.26.0" + "babel-helper-remap-async-to-generator": "^6.24.1", + "babel-plugin-syntax-async-functions": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-class-properties": { @@ -603,10 +612,10 @@ "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-plugin-syntax-class-properties": "6.13.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-helper-function-name": "^6.24.1", + "babel-plugin-syntax-class-properties": "^6.8.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-arrow-functions": { @@ -615,7 +624,7 @@ "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-block-scoped-functions": { @@ -624,7 +633,7 @@ "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-block-scoping": { @@ -633,11 +642,11 @@ "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "lodash": "4.17.4" + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" } }, "babel-plugin-transform-es2015-classes": { @@ -646,15 +655,15 @@ "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", "dev": true, "requires": { - "babel-helper-define-map": "6.26.0", - "babel-helper-function-name": "6.24.1", - "babel-helper-optimise-call-expression": "6.24.1", - "babel-helper-replace-supers": "6.24.1", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-define-map": "^6.24.1", + "babel-helper-function-name": "^6.24.1", + "babel-helper-optimise-call-expression": "^6.24.1", + "babel-helper-replace-supers": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-computed-properties": { @@ -663,8 +672,8 @@ "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-destructuring": { @@ -673,7 +682,7 @@ "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-duplicate-keys": { @@ -682,8 +691,8 @@ "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-for-of": { @@ -692,7 +701,7 @@ "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-function-name": { @@ -701,9 +710,9 @@ "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-literals": { @@ -712,7 +721,7 @@ "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-modules-amd": { @@ -721,9 +730,9 @@ "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", "dev": true, "requires": { - "babel-plugin-transform-es2015-modules-commonjs": "6.26.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-modules-commonjs": { @@ -732,10 +741,10 @@ "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=", "dev": true, "requires": { - "babel-plugin-transform-strict-mode": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-types": "6.26.0" + "babel-plugin-transform-strict-mode": "^6.24.1", + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-types": "^6.26.0" } }, "babel-plugin-transform-es2015-modules-systemjs": { @@ -744,9 +753,9 @@ "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", "dev": true, "requires": { - "babel-helper-hoist-variables": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-helper-hoist-variables": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-modules-umd": { @@ -755,9 +764,9 @@ "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", "dev": true, "requires": { - "babel-plugin-transform-es2015-modules-amd": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-plugin-transform-es2015-modules-amd": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-object-super": { @@ -766,8 +775,8 @@ "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", "dev": true, "requires": { - "babel-helper-replace-supers": "6.24.1", - "babel-runtime": "6.26.0" + "babel-helper-replace-supers": "^6.24.1", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-parameters": { @@ -776,12 +785,12 @@ "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", "dev": true, "requires": { - "babel-helper-call-delegate": "6.24.1", - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-call-delegate": "^6.24.1", + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-shorthand-properties": { @@ -790,8 +799,8 @@ "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-spread": { @@ -800,7 +809,7 @@ "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-sticky-regex": { @@ -809,9 +818,9 @@ "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", "dev": true, "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-template-literals": { @@ -820,7 +829,7 @@ "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-typeof-symbol": { @@ -829,7 +838,7 @@ "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-unicode-regex": { @@ -838,9 +847,9 @@ "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", "dev": true, "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "regexpu-core": "2.0.0" + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "regexpu-core": "^2.0.0" } }, "babel-plugin-transform-exponentiation-operator": { @@ -849,9 +858,9 @@ "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", "dev": true, "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", - "babel-plugin-syntax-exponentiation-operator": "6.13.0", - "babel-runtime": "6.26.0" + "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", + "babel-plugin-syntax-exponentiation-operator": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-flow-strip-types": { @@ -860,8 +869,8 @@ "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=", "dev": true, "requires": { - "babel-plugin-syntax-flow": "6.18.0", - "babel-runtime": "6.26.0" + "babel-plugin-syntax-flow": "^6.18.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-object-rest-spread": { @@ -870,8 +879,8 @@ "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=", "dev": true, "requires": { - "babel-plugin-syntax-object-rest-spread": "6.13.0", - "babel-runtime": "6.26.0" + "babel-plugin-syntax-object-rest-spread": "^6.8.0", + "babel-runtime": "^6.26.0" } }, "babel-plugin-transform-react-display-name": { @@ -880,7 +889,7 @@ "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-react-jsx": { @@ -889,9 +898,9 @@ "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=", "dev": true, "requires": { - "babel-helper-builder-react-jsx": "6.26.0", - "babel-plugin-syntax-jsx": "6.18.0", - "babel-runtime": "6.26.0" + "babel-helper-builder-react-jsx": "^6.24.1", + "babel-plugin-syntax-jsx": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-react-jsx-self": { @@ -900,8 +909,8 @@ "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=", "dev": true, "requires": { - "babel-plugin-syntax-jsx": "6.18.0", - "babel-runtime": "6.26.0" + "babel-plugin-syntax-jsx": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-react-jsx-source": { @@ -910,8 +919,8 @@ "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=", "dev": true, "requires": { - "babel-plugin-syntax-jsx": "6.18.0", - "babel-runtime": "6.26.0" + "babel-plugin-syntax-jsx": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-regenerator": { @@ -920,7 +929,7 @@ "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", "dev": true, "requires": { - "regenerator-transform": "0.10.1" + "regenerator-transform": "^0.10.0" } }, "babel-plugin-transform-runtime": { @@ -929,7 +938,7 @@ "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-strict-mode": { @@ -938,8 +947,8 @@ "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-polyfill": { @@ -948,9 +957,9 @@ "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "core-js": "2.5.1", - "regenerator-runtime": "0.10.5" + "babel-runtime": "^6.26.0", + "core-js": "^2.5.0", + "regenerator-runtime": "^0.10.5" }, "dependencies": { "regenerator-runtime": { @@ -967,30 +976,30 @@ "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=", "dev": true, "requires": { - "babel-plugin-check-es2015-constants": "6.22.0", - "babel-plugin-transform-es2015-arrow-functions": "6.22.0", - "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0", - "babel-plugin-transform-es2015-block-scoping": "6.26.0", - "babel-plugin-transform-es2015-classes": "6.24.1", - "babel-plugin-transform-es2015-computed-properties": "6.24.1", - "babel-plugin-transform-es2015-destructuring": "6.23.0", - "babel-plugin-transform-es2015-duplicate-keys": "6.24.1", - "babel-plugin-transform-es2015-for-of": "6.23.0", - "babel-plugin-transform-es2015-function-name": "6.24.1", - "babel-plugin-transform-es2015-literals": "6.22.0", - "babel-plugin-transform-es2015-modules-amd": "6.24.1", - "babel-plugin-transform-es2015-modules-commonjs": "6.26.0", - "babel-plugin-transform-es2015-modules-systemjs": "6.24.1", - "babel-plugin-transform-es2015-modules-umd": "6.24.1", - "babel-plugin-transform-es2015-object-super": "6.24.1", - "babel-plugin-transform-es2015-parameters": "6.24.1", - "babel-plugin-transform-es2015-shorthand-properties": "6.24.1", - "babel-plugin-transform-es2015-spread": "6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "6.24.1", - "babel-plugin-transform-es2015-template-literals": "6.22.0", - "babel-plugin-transform-es2015-typeof-symbol": "6.23.0", - "babel-plugin-transform-es2015-unicode-regex": "6.24.1", - "babel-plugin-transform-regenerator": "6.26.0" + "babel-plugin-check-es2015-constants": "^6.22.0", + "babel-plugin-transform-es2015-arrow-functions": "^6.22.0", + "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0", + "babel-plugin-transform-es2015-block-scoping": "^6.24.1", + "babel-plugin-transform-es2015-classes": "^6.24.1", + "babel-plugin-transform-es2015-computed-properties": "^6.24.1", + "babel-plugin-transform-es2015-destructuring": "^6.22.0", + "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1", + "babel-plugin-transform-es2015-for-of": "^6.22.0", + "babel-plugin-transform-es2015-function-name": "^6.24.1", + "babel-plugin-transform-es2015-literals": "^6.22.0", + "babel-plugin-transform-es2015-modules-amd": "^6.24.1", + "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", + "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1", + "babel-plugin-transform-es2015-modules-umd": "^6.24.1", + "babel-plugin-transform-es2015-object-super": "^6.24.1", + "babel-plugin-transform-es2015-parameters": "^6.24.1", + "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1", + "babel-plugin-transform-es2015-spread": "^6.22.0", + "babel-plugin-transform-es2015-sticky-regex": "^6.24.1", + "babel-plugin-transform-es2015-template-literals": "^6.22.0", + "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0", + "babel-plugin-transform-es2015-unicode-regex": "^6.24.1", + "babel-plugin-transform-regenerator": "^6.24.1" } }, "babel-preset-es2016": { @@ -999,7 +1008,7 @@ "integrity": "sha1-+QC/k+LrwNJ235uKtZck6/2Vn4s=", "dev": true, "requires": { - "babel-plugin-transform-exponentiation-operator": "6.24.1" + "babel-plugin-transform-exponentiation-operator": "^6.24.1" } }, "babel-preset-es2017": { @@ -1008,8 +1017,8 @@ "integrity": "sha1-WXvq37n38gi8/YoS6bKym4svFNE=", "dev": true, "requires": { - "babel-plugin-syntax-trailing-function-commas": "6.22.0", - "babel-plugin-transform-async-to-generator": "6.24.1" + "babel-plugin-syntax-trailing-function-commas": "^6.22.0", + "babel-plugin-transform-async-to-generator": "^6.24.1" } }, "babel-preset-flow": { @@ -1018,7 +1027,7 @@ "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=", "dev": true, "requires": { - "babel-plugin-transform-flow-strip-types": "6.22.0" + "babel-plugin-transform-flow-strip-types": "^6.22.0" } }, "babel-preset-react": { @@ -1027,12 +1036,12 @@ "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=", "dev": true, "requires": { - "babel-plugin-syntax-jsx": "6.18.0", - "babel-plugin-transform-react-display-name": "6.25.0", - "babel-plugin-transform-react-jsx": "6.24.1", - "babel-plugin-transform-react-jsx-self": "6.22.0", - "babel-plugin-transform-react-jsx-source": "6.22.0", - "babel-preset-flow": "6.23.0" + "babel-plugin-syntax-jsx": "^6.3.13", + "babel-plugin-transform-react-display-name": "^6.23.0", + "babel-plugin-transform-react-jsx": "^6.24.1", + "babel-plugin-transform-react-jsx-self": "^6.22.0", + "babel-plugin-transform-react-jsx-source": "^6.22.0", + "babel-preset-flow": "^6.23.0" } }, "babel-register": { @@ -1041,13 +1050,13 @@ "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", "dev": true, "requires": { - "babel-core": "6.26.0", - "babel-runtime": "6.26.0", - "core-js": "2.5.1", - "home-or-tmp": "2.0.0", - "lodash": "4.17.4", - "mkdirp": "0.5.1", - "source-map-support": "0.4.18" + "babel-core": "^6.26.0", + "babel-runtime": "^6.26.0", + "core-js": "^2.5.0", + "home-or-tmp": "^2.0.0", + "lodash": "^4.17.4", + "mkdirp": "^0.5.1", + "source-map-support": "^0.4.15" } }, "babel-runtime": { @@ -1055,8 +1064,8 @@ "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "requires": { - "core-js": "2.5.1", - "regenerator-runtime": "0.11.0" + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" } }, "babel-template": { @@ -1065,11 +1074,11 @@ "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.4" + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" } }, "babel-traverse": { @@ -1078,15 +1087,15 @@ "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.2", - "lodash": "4.17.4" + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" } }, "babel-types": { @@ -1095,10 +1104,10 @@ "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.4", - "to-fast-properties": "1.0.3" + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" } }, "babylon": { @@ -1142,7 +1151,7 @@ "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", "optional": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "better-assert": { @@ -1189,28 +1198,23 @@ "dev": true, "requires": { "bytes": "3.0.0", - "content-type": "1.0.4", + "content-type": "~1.0.4", "debug": "2.6.9", - "depd": "1.1.1", - "http-errors": "1.6.2", + "depd": "~1.1.1", + "http-errors": "~1.6.2", "iconv-lite": "0.4.19", - "on-finished": "2.3.0", + "on-finished": "~2.3.0", "qs": "6.5.1", "raw-body": "2.3.2", - "type-is": "1.6.15" + "type-is": "~1.6.15" } }, - "boom": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", - "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=" - }, "brace-expansion": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -1220,9 +1224,9 @@ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "browser-encrypt-attachment": { @@ -1247,7 +1251,7 @@ "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=", "dev": true, "requires": { - "inherits": "2.0.3" + "inherits": "^2.0.1" } }, "browserify-zlib": { @@ -1256,7 +1260,7 @@ "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", "dev": true, "requires": { - "pako": "0.2.9" + "pako": "~0.2.0" }, "dependencies": { "pako": { @@ -1273,9 +1277,9 @@ "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "dev": true, "requires": { - "base64-js": "1.2.1", - "ieee754": "1.1.8", - "isarray": "1.0.0" + "base64-js": "^1.0.2", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" } }, "builtin-status-codes": { @@ -1296,7 +1300,7 @@ "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", "dev": true, "requires": { - "callsites": "0.2.0" + "callsites": "^0.2.0" } }, "callsite": { @@ -1328,8 +1332,8 @@ "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", "dev": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" } }, "chalk": { @@ -1338,11 +1342,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "chokidar": { @@ -1351,15 +1355,15 @@ "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "dev": true, "requires": { - "anymatch": "1.3.2", - "async-each": "1.0.1", - "fsevents": "1.1.2", - "glob-parent": "2.0.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "2.0.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0" + "anymatch": "^1.3.0", + "async-each": "^1.0.0", + "fsevents": "^1.0.0", + "glob-parent": "^2.0.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^2.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0" } }, "circular-json": { @@ -1379,7 +1383,7 @@ "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", "dev": true, "requires": { - "restore-cursor": "1.0.1" + "restore-cursor": "^1.0.1" } }, "cli-width": { @@ -1394,8 +1398,8 @@ "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", "dev": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", + "center-align": "^0.1.1", + "right-align": "^0.1.1", "wordwrap": "0.0.2" }, "dependencies": { @@ -1436,15 +1440,15 @@ "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=", "dev": true, "requires": { - "lodash": "4.17.4" + "lodash": "^4.5.0" } }, "combined-stream": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", - "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", + "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "commander": { @@ -1464,10 +1468,10 @@ "resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.28.1.tgz", "integrity": "sha1-Buq41SM4uDn6Gi11rwCF7tGxvq4=", "requires": { - "entities": "1.1.1", - "mdurl": "1.0.1", - "minimist": "1.2.0", - "string.prototype.repeat": "0.2.0" + "entities": "~ 1.1.1", + "mdurl": "~ 1.0.1", + "minimist": "~ 1.2.0", + "string.prototype.repeat": "^0.2.0" } }, "component-bind": { @@ -1499,9 +1503,9 @@ "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", "dev": true, "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.3", - "typedarray": "0.0.6" + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" } }, "connect": { @@ -1512,7 +1516,7 @@ "requires": { "debug": "2.6.9", "finalhandler": "1.0.6", - "parseurl": "1.3.2", + "parseurl": "~1.3.2", "utils-merge": "1.0.1" } }, @@ -1522,7 +1526,7 @@ "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", "dev": true, "requires": { - "date-now": "0.1.4" + "date-now": "^0.1.4" } }, "constants-browserify": { @@ -1563,11 +1567,11 @@ "resolved": "https://registry.npmjs.org/counterpart/-/counterpart-0.18.3.tgz", "integrity": "sha512-tli4qPAFeYB34LvvCc/1xYRLCWjf4WsUt6sXfpggDfGDKoI8rhnabz0SljDoBpAK8z1u8GBCg0YDkbvWb16uUQ==", "requires": { - "date-names": "0.1.10", - "except": "0.1.3", - "extend": "3.0.1", - "pluralizers": "0.1.6", - "sprintf-js": "1.1.1" + "date-names": "^0.1.9", + "except": "^0.1.3", + "extend": "^3.0.0", + "pluralizers": "^0.1.6", + "sprintf-js": "^1.0.3" } }, "create-react-class": { @@ -1575,24 +1579,9 @@ "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.2.tgz", "integrity": "sha1-zx7RXxKq1/FO9fLf4F5sQvke8Co=", "requires": { - "fbjs": "0.8.16", - "loose-envify": "1.3.1", - "object-assign": "4.1.1" - } - }, - "cryptiles": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", - "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", - "requires": { - "boom": "5.2.0" - }, - "dependencies": { - "boom": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", - "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==" - } + "fbjs": "^0.8.9", + "loose-envify": "^1.3.1", + "object-assign": "^4.1.1" } }, "crypto-browserify": { @@ -1619,7 +1608,7 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "0.10.35" + "es5-ext": "^0.10.9" } }, "dashdash": { @@ -1627,7 +1616,7 @@ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "date-names": { @@ -1668,8 +1657,8 @@ "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", "dev": true, "requires": { - "foreach": "2.0.5", - "object-keys": "1.0.11" + "foreach": "^2.0.5", + "object-keys": "^1.0.8" } }, "del": { @@ -1678,13 +1667,13 @@ "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", "dev": true, "requires": { - "globby": "5.0.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.0", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "rimraf": "2.6.2" + "globby": "^5.0.0", + "is-path-cwd": "^1.0.0", + "is-path-in-cwd": "^1.0.0", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "rimraf": "^2.2.8" } }, "delayed-stream": { @@ -1704,7 +1693,7 @@ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "di": { @@ -1713,14 +1702,20 @@ "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=", "dev": true }, + "diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "dev": true + }, "doctrine": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz", "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=", "dev": true, "requires": { - "esutils": "2.0.2", - "isarray": "1.0.0" + "esutils": "^2.0.2", + "isarray": "^1.0.0" } }, "dom-serialize": { @@ -1729,10 +1724,10 @@ "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", "dev": true, "requires": { - "custom-event": "1.0.1", - "ent": "2.2.0", - "extend": "3.0.1", - "void-elements": "2.0.1" + "custom-event": "~1.0.0", + "ent": "~2.2.0", + "extend": "^3.0.0", + "void-elements": "^2.0.0" } }, "dom-serializer": { @@ -1740,8 +1735,8 @@ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "requires": { - "domelementtype": "1.1.3", - "entities": "1.1.1" + "domelementtype": "~1.1.1", + "entities": "~1.1.1" }, "dependencies": { "domelementtype": { @@ -1767,7 +1762,7 @@ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz", "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=", "requires": { - "domelementtype": "1.3.0" + "domelementtype": "1" } }, "domutils": { @@ -1775,8 +1770,8 @@ "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz", "integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=", "requires": { - "dom-serializer": "0.1.0", - "domelementtype": "1.3.0" + "dom-serializer": "0", + "domelementtype": "1" } }, "draft-js": { @@ -1784,9 +1779,9 @@ "resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.11.0-alpha.tgz", "integrity": "sha1-MtshCPkn6bhEbaH3nkR1wrf4aK4=", "requires": { - "fbjs": "0.8.16", - "immutable": "3.7.6", - "object-assign": "4.1.1" + "fbjs": "^0.8.12", + "immutable": "~3.7.4", + "object-assign": "^4.1.0" } }, "draft-js-export-html": { @@ -1794,7 +1789,7 @@ "resolved": "https://registry.npmjs.org/draft-js-export-html/-/draft-js-export-html-0.6.0.tgz", "integrity": "sha1-zIDwVExD0Kf+28U8DLCRToCQ92k=", "requires": { - "draft-js-utils": "1.2.0" + "draft-js-utils": ">=0.2.0" } }, "draft-js-export-markdown": { @@ -1802,7 +1797,7 @@ "resolved": "https://registry.npmjs.org/draft-js-export-markdown/-/draft-js-export-markdown-0.3.0.tgz", "integrity": "sha1-hjkOA86vHTR/xhaGerf1Net2v0I=", "requires": { - "draft-js-utils": "1.2.0" + "draft-js-utils": ">=0.2.0" } }, "draft-js-utils": { @@ -1816,7 +1811,7 @@ "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "~0.1.0" } }, "ee-first": { @@ -1847,7 +1842,7 @@ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", "requires": { - "iconv-lite": "0.4.19" + "iconv-lite": "~0.4.13" } }, "engine.io": { @@ -1944,9 +1939,9 @@ "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "memory-fs": "0.2.0", - "tapable": "0.1.10" + "graceful-fs": "^4.1.2", + "memory-fs": "^0.2.0", + "tapable": "^0.1.8" }, "dependencies": { "memory-fs": { @@ -1974,7 +1969,7 @@ "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=", "dev": true, "requires": { - "prr": "0.0.0" + "prr": "~0.0.0" } }, "es-abstract": { @@ -1983,11 +1978,11 @@ "integrity": "sha512-kk3IJoKo7A3pWJc0OV8yZ/VEX2oSUytfekrJiqoxBlKJMFAJVJVpGdHClCCTdv+Fn2zHfpDHHIelMFhZVfef3Q==", "dev": true, "requires": { - "es-to-primitive": "1.1.1", - "function-bind": "1.1.1", - "has": "1.0.1", - "is-callable": "1.1.3", - "is-regex": "1.0.4" + "es-to-primitive": "^1.1.1", + "function-bind": "^1.1.1", + "has": "^1.0.1", + "is-callable": "^1.1.3", + "is-regex": "^1.0.4" } }, "es-to-primitive": { @@ -1996,9 +1991,9 @@ "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", "dev": true, "requires": { - "is-callable": "1.1.3", - "is-date-object": "1.0.1", - "is-symbol": "1.0.1" + "is-callable": "^1.1.1", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.1" } }, "es5-ext": { @@ -2007,8 +2002,8 @@ "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=", "dev": true, "requires": { - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1" + "es6-iterator": "~2.0.1", + "es6-symbol": "~3.1.1" } }, "es6-iterator": { @@ -2017,9 +2012,9 @@ "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.35", - "es6-symbol": "3.1.1" + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" } }, "es6-map": { @@ -2028,12 +2023,12 @@ "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.35", - "es6-iterator": "2.0.3", - "es6-set": "0.1.5", - "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" + "d": "1", + "es5-ext": "~0.10.14", + "es6-iterator": "~2.0.1", + "es6-set": "~0.1.5", + "es6-symbol": "~3.1.1", + "event-emitter": "~0.3.5" } }, "es6-set": { @@ -2042,11 +2037,11 @@ "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.35", - "es6-iterator": "2.0.3", + "d": "1", + "es5-ext": "~0.10.14", + "es6-iterator": "~2.0.1", "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" + "event-emitter": "~0.3.5" } }, "es6-symbol": { @@ -2055,8 +2050,8 @@ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.35" + "d": "1", + "es5-ext": "~0.10.14" } }, "es6-weak-map": { @@ -2065,10 +2060,10 @@ "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.35", - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1" + "d": "1", + "es5-ext": "^0.10.14", + "es6-iterator": "^2.0.1", + "es6-symbol": "^3.1.1" } }, "escape-html": { @@ -2089,10 +2084,10 @@ "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", "dev": true, "requires": { - "es6-map": "0.1.5", - "es6-weak-map": "2.0.2", - "esrecurse": "4.2.0", - "estraverse": "4.2.0" + "es6-map": "^0.1.3", + "es6-weak-map": "^2.0.1", + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" } }, "eslint": { @@ -2101,41 +2096,41 @@ "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "chalk": "1.1.3", - "concat-stream": "1.6.0", - "debug": "2.6.9", - "doctrine": "2.0.0", - "escope": "3.6.0", - "espree": "3.5.1", - "esquery": "1.0.0", - "estraverse": "4.2.0", - "esutils": "2.0.2", - "file-entry-cache": "2.0.0", - "glob": "7.1.2", - "globals": "9.18.0", - "ignore": "3.3.5", - "imurmurhash": "0.1.4", - "inquirer": "0.12.0", - "is-my-json-valid": "2.16.1", - "is-resolvable": "1.0.0", - "js-yaml": "3.10.0", - "json-stable-stringify": "1.0.1", - "levn": "0.3.0", - "lodash": "4.17.4", - "mkdirp": "0.5.1", - "natural-compare": "1.4.0", - "optionator": "0.8.2", - "path-is-inside": "1.0.2", - "pluralize": "1.2.1", - "progress": "1.1.8", - "require-uncached": "1.0.3", - "shelljs": "0.7.8", - "strip-bom": "3.0.0", - "strip-json-comments": "2.0.1", - "table": "3.8.3", - "text-table": "0.2.0", - "user-home": "2.0.0" + "babel-code-frame": "^6.16.0", + "chalk": "^1.1.3", + "concat-stream": "^1.5.2", + "debug": "^2.1.1", + "doctrine": "^2.0.0", + "escope": "^3.6.0", + "espree": "^3.4.0", + "esquery": "^1.0.0", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "file-entry-cache": "^2.0.0", + "glob": "^7.0.3", + "globals": "^9.14.0", + "ignore": "^3.2.0", + "imurmurhash": "^0.1.4", + "inquirer": "^0.12.0", + "is-my-json-valid": "^2.10.0", + "is-resolvable": "^1.0.0", + "js-yaml": "^3.5.1", + "json-stable-stringify": "^1.0.0", + "levn": "^0.3.0", + "lodash": "^4.0.0", + "mkdirp": "^0.5.0", + "natural-compare": "^1.4.0", + "optionator": "^0.8.2", + "path-is-inside": "^1.0.1", + "pluralize": "^1.2.1", + "progress": "^1.1.8", + "require-uncached": "^1.0.2", + "shelljs": "^0.7.5", + "strip-bom": "^3.0.0", + "strip-json-comments": "~2.0.1", + "table": "^3.7.8", + "text-table": "~0.2.0", + "user-home": "^2.0.0" }, "dependencies": { "glob": { @@ -2144,12 +2139,12 @@ "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "user-home": { @@ -2158,7 +2153,7 @@ "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=", "dev": true, "requires": { - "os-homedir": "1.0.2" + "os-homedir": "^1.0.0" } } } @@ -2181,7 +2176,7 @@ "integrity": "sha512-RiQv+7Z9QDJuzt+NO8sYgkLGT+h+WeCrxP7y8lI7wpU41x3x/2o3PGtHk9ck8QnA9/mlbNcy/hG0eKvmd7npaA==", "dev": true, "requires": { - "lodash": "4.17.4" + "lodash": "^4.15.0" } }, "eslint-plugin-react": { @@ -2190,10 +2185,10 @@ "integrity": "sha512-KC7Snr4YsWZD5flu6A5c0AcIZidzW3Exbqp7OT67OaD2AppJtlBr/GuPrW/vaQM/yfZotEvKAdrxrO+v8vwYJA==", "dev": true, "requires": { - "doctrine": "2.1.0", - "has": "1.0.1", - "jsx-ast-utils": "2.0.1", - "prop-types": "15.6.0" + "doctrine": "^2.0.2", + "has": "^1.0.1", + "jsx-ast-utils": "^2.0.1", + "prop-types": "^15.6.0" }, "dependencies": { "doctrine": { @@ -2202,7 +2197,7 @@ "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, "requires": { - "esutils": "2.0.2" + "esutils": "^2.0.2" } } } @@ -2213,8 +2208,8 @@ "integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=", "dev": true, "requires": { - "acorn": "5.1.2", - "acorn-jsx": "3.0.1" + "acorn": "^5.1.1", + "acorn-jsx": "^3.0.0" } }, "esprima": { @@ -2229,7 +2224,7 @@ "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=", "dev": true, "requires": { - "estraverse": "4.2.0" + "estraverse": "^4.0.0" } }, "esrecurse": { @@ -2238,8 +2233,8 @@ "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=", "dev": true, "requires": { - "estraverse": "4.2.0", - "object-assign": "4.1.1" + "estraverse": "^4.1.0", + "object-assign": "^4.0.1" } }, "estraverse": { @@ -2266,8 +2261,8 @@ "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.35" + "d": "1", + "es5-ext": "~0.10.14" } }, "eventemitter3": { @@ -2302,9 +2297,9 @@ "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=", "dev": true, "requires": { - "array-slice": "0.2.3", - "array-unique": "0.2.1", - "braces": "0.1.5" + "array-slice": "^0.2.3", + "array-unique": "^0.2.1", + "braces": "^0.1.2" }, "dependencies": { "braces": { @@ -2313,7 +2308,7 @@ "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=", "dev": true, "requires": { - "expand-range": "0.1.1" + "expand-range": "^0.1.0" } }, "expand-range": { @@ -2322,8 +2317,8 @@ "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=", "dev": true, "requires": { - "is-number": "0.1.1", - "repeat-string": "0.2.2" + "is-number": "^0.1.1", + "repeat-string": "^0.2.2" } }, "is-number": { @@ -2346,7 +2341,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "expand-range": { @@ -2355,7 +2350,7 @@ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { - "fill-range": "2.2.3" + "fill-range": "^2.1.0" } }, "expect": { @@ -2364,13 +2359,13 @@ "integrity": "sha1-1Fj+TFYAQDa64yMkFqP2Nh8E+WU=", "dev": true, "requires": { - "define-properties": "1.1.2", - "has": "1.0.1", - "is-equal": "1.5.5", - "is-regex": "1.0.4", - "object-inspect": "1.3.0", - "object-keys": "1.0.11", - "tmatch": "2.0.1" + "define-properties": "~1.1.2", + "has": "^1.0.1", + "is-equal": "^1.5.1", + "is-regex": "^1.0.3", + "object-inspect": "^1.1.0", + "object-keys": "^1.0.9", + "tmatch": "^2.0.1" } }, "extend": { @@ -2384,7 +2379,7 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "extsprintf": { @@ -2393,9 +2388,14 @@ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, "fast-deep-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", - "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" + }, + "fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" }, "fast-levenshtein": { "version": "2.0.6", @@ -2408,7 +2408,7 @@ "resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-2.1.1.tgz", "integrity": "sha1-Uj4U/a9SSIBbsC9i78M75wP1GGU=", "requires": { - "fbjs": "0.8.16" + "fbjs": "^0.8.4" } }, "fbjs": { @@ -2416,13 +2416,13 @@ "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz", "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=", "requires": { - "core-js": "1.2.7", - "isomorphic-fetch": "2.2.1", - "loose-envify": "1.3.1", - "object-assign": "4.1.1", - "promise": "7.3.1", - "setimmediate": "1.0.5", - "ua-parser-js": "0.7.17" + "core-js": "^1.0.0", + "isomorphic-fetch": "^2.1.1", + "loose-envify": "^1.0.0", + "object-assign": "^4.1.0", + "promise": "^7.1.1", + "setimmediate": "^1.0.5", + "ua-parser-js": "^0.7.9" }, "dependencies": { "core-js": { @@ -2438,8 +2438,8 @@ "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", "dev": true, "requires": { - "escape-string-regexp": "1.0.5", - "object-assign": "4.1.1" + "escape-string-regexp": "^1.0.5", + "object-assign": "^4.1.0" } }, "file-entry-cache": { @@ -2448,8 +2448,8 @@ "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", "dev": true, "requires": { - "flat-cache": "1.3.0", - "object-assign": "4.1.1" + "flat-cache": "^1.2.1", + "object-assign": "^4.0.1" } }, "file-saver": { @@ -2474,11 +2474,11 @@ "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", "dev": true, "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" + "is-number": "^2.1.0", + "isobject": "^2.0.0", + "randomatic": "^1.1.3", + "repeat-element": "^1.1.2", + "repeat-string": "^1.5.2" } }, "finalhandler": { @@ -2488,12 +2488,12 @@ "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "1.0.1", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.2", - "statuses": "1.3.1", - "unpipe": "1.0.0" + "encodeurl": "~1.0.1", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.2", + "statuses": "~1.3.1", + "unpipe": "~1.0.0" } }, "find-cache-dir": { @@ -2502,9 +2502,9 @@ "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=", "dev": true, "requires": { - "commondir": "1.0.1", - "mkdirp": "0.5.1", - "pkg-dir": "1.0.0" + "commondir": "^1.0.1", + "mkdirp": "^0.5.1", + "pkg-dir": "^1.0.0" } }, "find-up": { @@ -2513,8 +2513,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "flat-cache": { @@ -2523,10 +2523,10 @@ "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", "dev": true, "requires": { - "circular-json": "0.3.3", - "del": "2.2.2", - "graceful-fs": "4.1.11", - "write": "0.2.1" + "circular-json": "^0.3.1", + "del": "^2.0.2", + "graceful-fs": "^4.1.2", + "write": "^0.2.1" } }, "flow-parser": { @@ -2540,9 +2540,9 @@ "resolved": "https://registry.npmjs.org/flux/-/flux-2.1.1.tgz", "integrity": "sha1-LGrGUtQzdIiWhInGWG86/yajjqQ=", "requires": { - "fbemitter": "2.1.1", + "fbemitter": "^2.0.0", "fbjs": "0.1.0-alpha.7", - "immutable": "3.7.6" + "immutable": "^3.7.4" }, "dependencies": { "core-js": { @@ -2555,9 +2555,9 @@ "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.1.0-alpha.7.tgz", "integrity": "sha1-rUMIuPIy+zxzYDNJ6nJdHpw5Mjw=", "requires": { - "core-js": "1.2.7", - "promise": "7.3.1", - "whatwg-fetch": "0.9.0" + "core-js": "^1.0.0", + "promise": "^7.0.3", + "whatwg-fetch": "^0.9.0" } }, "whatwg-fetch": { @@ -2572,7 +2572,7 @@ "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-2.4.3.tgz", "integrity": "sha512-sT5Ip9nyAIxWq8Apt1Fdv6yTci5GotaOtO5Ro1/+F3PizttNBcCYz8j/Qze54PPFK73KUbOqh++HUCiyNPqvhA==", "requires": { - "tabbable": "1.1.2" + "tabbable": "^1.0.3" } }, "focus-trap-react": { @@ -2580,7 +2580,7 @@ "resolved": "https://registry.npmjs.org/focus-trap-react/-/focus-trap-react-3.1.2.tgz", "integrity": "sha512-MoQmONoy9gRPyrC5DGezkcOMGgx7MtIOAQDHe098UtL2sA2vmucJwEmQisb+8LRXNYFHxuw5zJ1oLFeKu4Mteg==", "requires": { - "focus-trap": "2.4.3" + "focus-trap": "^2.0.1" } }, "for-in": { @@ -2595,7 +2595,7 @@ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { - "for-in": "1.0.2" + "for-in": "^1.0.1" } }, "foreach": { @@ -2616,22 +2616,13 @@ "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, "form-data": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz", - "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", + "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.17" - } - }, - "formatio": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz", - "integrity": "sha1-XtPM1jZVEJc4NGXZlhmRAOhhYek=", - "dev": true, - "requires": { - "samsam": "1.1.2" + "asynckit": "^0.4.0", + "combined-stream": "1.0.6", + "mime-types": "^2.1.12" } }, "fs-access": { @@ -2640,7 +2631,7 @@ "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", "dev": true, "requires": { - "null-check": "1.0.0" + "null-check": "^1.0.0" } }, "fs-readdir-recursive": { @@ -2662,8 +2653,8 @@ "dev": true, "optional": true, "requires": { - "nan": "2.7.0", - "node-pre-gyp": "0.6.36" + "nan": "^2.3.0", + "node-pre-gyp": "^0.6.36" }, "dependencies": { "abbrev": { @@ -2699,8 +2690,8 @@ "dev": true, "optional": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.2.9" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "asn1": { @@ -2744,7 +2735,7 @@ "dev": true, "optional": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "block-stream": { @@ -2752,15 +2743,16 @@ "bundled": true, "dev": true, "requires": { - "inherits": "2.0.3" + "inherits": "~2.0.0" } }, "boom": { "version": "2.10.1", "bundled": true, "dev": true, + "optional": true, "requires": { - "hoek": "2.16.3" + "hoek": "2.x.x" } }, "brace-expansion": { @@ -2768,7 +2760,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "0.4.2", + "balanced-match": "^0.4.1", "concat-map": "0.0.1" } }, @@ -2799,7 +2791,7 @@ "bundled": true, "dev": true, "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "concat-map": { @@ -2823,7 +2815,7 @@ "dev": true, "optional": true, "requires": { - "boom": "2.10.1" + "boom": "2.x.x" } }, "dashdash": { @@ -2832,7 +2824,7 @@ "dev": true, "optional": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" }, "dependencies": { "assert-plus": { @@ -2875,7 +2867,7 @@ "dev": true, "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "~0.1.0" } }, "extend": { @@ -2916,10 +2908,10 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.1" + "graceful-fs": "^4.1.2", + "inherits": "~2.0.0", + "mkdirp": ">=0.5 0", + "rimraf": "2" } }, "fstream-ignore": { @@ -2928,9 +2920,9 @@ "dev": true, "optional": true, "requires": { - "fstream": "1.0.11", - "inherits": "2.0.3", - "minimatch": "3.0.4" + "fstream": "^1.0.0", + "inherits": "2", + "minimatch": "^3.0.0" } }, "gauge": { @@ -2939,14 +2931,14 @@ "dev": true, "optional": true, "requires": { - "aproba": "1.1.1", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "getpass": { @@ -2955,7 +2947,7 @@ "dev": true, "optional": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" }, "dependencies": { "assert-plus": { @@ -2971,12 +2963,12 @@ "bundled": true, "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "graceful-fs": { @@ -3021,7 +3013,8 @@ "hoek": { "version": "2.16.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "http-signature": { "version": "1.1.1", @@ -3029,9 +3022,9 @@ "dev": true, "optional": true, "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.0", - "sshpk": "1.13.0" + "assert-plus": "^0.2.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "inflight": { @@ -3039,8 +3032,8 @@ "bundled": true, "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -3085,7 +3078,7 @@ "dev": true, "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "~0.1.0" } }, "jsbn": { @@ -3106,7 +3099,7 @@ "dev": true, "optional": true, "requires": { - "jsonify": "0.0.0" + "jsonify": "~0.0.0" } }, "json-stringify-safe": { @@ -3187,15 +3180,15 @@ "dev": true, "optional": true, "requires": { - "mkdirp": "0.5.1", - "nopt": "4.0.1", - "npmlog": "4.1.0", - "rc": "1.2.1", - "request": "2.81.0", - "rimraf": "2.6.1", - "semver": "5.3.0", - "tar": "2.2.1", - "tar-pack": "3.4.0" + "mkdirp": "^0.5.1", + "nopt": "^4.0.1", + "npmlog": "^4.0.2", + "rc": "^1.1.7", + "request": "^2.81.0", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^2.2.1", + "tar-pack": "^3.4.0" } }, "nopt": { @@ -3214,10 +3207,10 @@ "dev": true, "optional": true, "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "number-is-nan": { @@ -3242,7 +3235,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-homedir": { @@ -3320,13 +3313,13 @@ "bundled": true, "dev": true, "requires": { - "buffer-shims": "1.0.0", - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "1.0.1", - "util-deprecate": "1.0.2" + "buffer-shims": "~1.0.0", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "~1.0.0", + "process-nextick-args": "~1.0.6", + "string_decoder": "~1.0.0", + "util-deprecate": "~1.0.1" } }, "request": { @@ -3335,28 +3328,28 @@ "dev": true, "optional": true, "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "4.2.1", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.15", - "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.0.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.2", - "tunnel-agent": "0.6.0", - "uuid": "3.0.1" + "aws-sign2": "~0.6.0", + "aws4": "^1.2.1", + "caseless": "~0.12.0", + "combined-stream": "~1.0.5", + "extend": "~3.0.0", + "forever-agent": "~0.6.1", + "form-data": "~2.1.1", + "har-validator": "~4.2.1", + "hawk": "~3.1.3", + "http-signature": "~1.1.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.7", + "oauth-sign": "~0.8.1", + "performance-now": "^0.2.0", + "qs": "~6.4.0", + "safe-buffer": "^5.0.1", + "stringstream": "~0.0.4", + "tough-cookie": "~2.3.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.0.0" } }, "rimraf": { @@ -3364,7 +3357,7 @@ "bundled": true, "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-buffer": { @@ -3405,15 +3398,15 @@ "dev": true, "optional": true, "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jodid25519": "1.0.2", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jodid25519": "^1.0.0", + "jsbn": "~0.1.0", + "tweetnacl": "~0.14.0" }, "dependencies": { "assert-plus": { @@ -3467,9 +3460,9 @@ "bundled": true, "dev": true, "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" + "block-stream": "*", + "fstream": "^1.0.2", + "inherits": "2" } }, "tar-pack": { @@ -3478,14 +3471,14 @@ "dev": true, "optional": true, "requires": { - "debug": "2.6.8", - "fstream": "1.0.11", - "fstream-ignore": "1.0.5", - "once": "1.4.0", - "readable-stream": "2.2.9", - "rimraf": "2.6.1", - "tar": "2.2.1", - "uid-number": "0.0.6" + "debug": "^2.2.0", + "fstream": "^1.0.10", + "fstream-ignore": "^1.0.5", + "once": "^1.3.3", + "readable-stream": "^2.1.4", + "rimraf": "^2.5.1", + "tar": "^2.2.1", + "uid-number": "^0.0.6" } }, "tough-cookie": { @@ -3544,7 +3537,7 @@ "dev": true, "optional": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2" } }, "wrappy": { @@ -3566,7 +3559,8 @@ "integrity": "sha1-luQg/efvARrEnCWKYhMU/ldlNvk=" }, "gemini-scrollbar": { - "version": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b" + "version": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b", + "from": "gemini-scrollbar@github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b" }, "generate-function": { "version": "2.0.0", @@ -3580,7 +3574,7 @@ "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", "dev": true, "requires": { - "is-property": "1.0.2" + "is-property": "^1.0.0" } }, "getpass": { @@ -3588,7 +3582,7 @@ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "gfm.css": { @@ -3601,11 +3595,11 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-base": { @@ -3614,8 +3608,8 @@ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" + "glob-parent": "^2.0.0", + "is-glob": "^2.0.0" } }, "glob-parent": { @@ -3624,7 +3618,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "globals": { @@ -3639,12 +3633,12 @@ "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "dev": true, "requires": { - "array-union": "1.0.2", - "arrify": "1.0.1", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "arrify": "^1.0.0", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" }, "dependencies": { "glob": { @@ -3653,12 +3647,12 @@ "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } } } @@ -3679,8 +3673,8 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "requires": { - "ajv": "5.2.3", - "har-schema": "2.0.0" + "ajv": "^5.1.0", + "har-schema": "^2.0.0" } }, "has": { @@ -3689,7 +3683,7 @@ "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=", "dev": true, "requires": { - "function-bind": "1.1.1" + "function-bind": "^1.0.2" } }, "has-ansi": { @@ -3698,7 +3692,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-binary": { @@ -3730,16 +3724,6 @@ "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", "dev": true }, - "hawk": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", - "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", - "requires": { - "boom": "4.3.1", - "cryptiles": "3.1.2", - "sntp": "2.0.2" - } - }, "he": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", @@ -3762,8 +3746,8 @@ "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", "dev": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.1" } }, "htmlparser2": { @@ -3771,12 +3755,12 @@ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", "requires": { - "domelementtype": "1.3.0", - "domhandler": "2.4.1", - "domutils": "1.6.2", - "entities": "1.1.1", - "inherits": "2.0.3", - "readable-stream": "2.3.3" + "domelementtype": "^1.3.0", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^2.0.2" } }, "http-errors": { @@ -3788,7 +3772,7 @@ "depd": "1.1.1", "inherits": "2.0.3", "setprototypeof": "1.0.3", - "statuses": "1.3.1" + "statuses": ">= 1.3.1 < 2" } }, "http-proxy": { @@ -3797,8 +3781,8 @@ "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=", "dev": true, "requires": { - "eventemitter3": "1.2.0", - "requires-port": "1.0.0" + "eventemitter3": "1.x.x", + "requires-port": "1.x.x" } }, "http-signature": { @@ -3806,9 +3790,9 @@ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.13.1" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "https-browserify": { @@ -3855,8 +3839,8 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -3870,19 +3854,19 @@ "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=", "dev": true, "requires": { - "ansi-escapes": "1.4.0", - "ansi-regex": "2.1.1", - "chalk": "1.1.3", - "cli-cursor": "1.0.2", - "cli-width": "2.2.0", - "figures": "1.7.0", - "lodash": "4.17.4", - "readline2": "1.0.1", - "run-async": "0.1.0", - "rx-lite": "3.1.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "through": "2.3.8" + "ansi-escapes": "^1.1.0", + "ansi-regex": "^2.0.0", + "chalk": "^1.0.0", + "cli-cursor": "^1.0.1", + "cli-width": "^2.0.0", + "figures": "^1.3.5", + "lodash": "^4.3.0", + "readline2": "^1.0.1", + "run-async": "^0.1.0", + "rx-lite": "^3.1.2", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.0", + "through": "^2.3.6" } }, "interpret": { @@ -3896,7 +3880,7 @@ "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", "requires": { - "loose-envify": "1.3.1" + "loose-envify": "^1.0.0" } }, "is-arrow-function": { @@ -3905,7 +3889,7 @@ "integrity": "sha1-Kb4sLY2UUIUri7r7Y1unuNjofsI=", "dev": true, "requires": { - "is-callable": "1.1.3" + "is-callable": "^1.0.4" } }, "is-binary-path": { @@ -3914,7 +3898,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "1.10.0" + "binary-extensions": "^1.0.0" } }, "is-boolean-object": { @@ -3953,17 +3937,17 @@ "integrity": "sha1-XoXxlX4FKIMkf+s4aWWju6Ffuz0=", "dev": true, "requires": { - "has": "1.0.1", - "is-arrow-function": "2.0.3", - "is-boolean-object": "1.0.0", - "is-callable": "1.1.3", - "is-date-object": "1.0.1", - "is-generator-function": "1.0.6", - "is-number-object": "1.0.3", - "is-regex": "1.0.4", - "is-string": "1.0.4", - "is-symbol": "1.0.1", - "object.entries": "1.0.4" + "has": "^1.0.1", + "is-arrow-function": "^2.0.3", + "is-boolean-object": "^1.0.0", + "is-callable": "^1.1.3", + "is-date-object": "^1.0.1", + "is-generator-function": "^1.0.6", + "is-number-object": "^1.0.3", + "is-regex": "^1.0.3", + "is-string": "^1.0.4", + "is-symbol": "^1.0.1", + "object.entries": "^1.0.4" } }, "is-equal-shallow": { @@ -3972,7 +3956,7 @@ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { - "is-primitive": "2.0.0" + "is-primitive": "^2.0.0" } }, "is-extendable": { @@ -3993,7 +3977,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-fullwidth-code-point": { @@ -4002,7 +3986,7 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-generator-function": { @@ -4017,7 +4001,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "is-my-json-valid": { @@ -4026,10 +4010,10 @@ "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==", "dev": true, "requires": { - "generate-function": "2.0.0", - "generate-object-property": "1.2.0", - "jsonpointer": "4.0.1", - "xtend": "4.0.1" + "generate-function": "^2.0.0", + "generate-object-property": "^1.1.0", + "jsonpointer": "^4.0.0", + "xtend": "^4.0.0" } }, "is-number": { @@ -4038,7 +4022,7 @@ "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-number-object": { @@ -4059,7 +4043,7 @@ "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", "dev": true, "requires": { - "is-path-inside": "1.0.0" + "is-path-inside": "^1.0.0" } }, "is-path-inside": { @@ -4068,7 +4052,7 @@ "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=", "dev": true, "requires": { - "path-is-inside": "1.0.2" + "path-is-inside": "^1.0.1" } }, "is-posix-bracket": { @@ -4095,7 +4079,7 @@ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", "dev": true, "requires": { - "has": "1.0.1" + "has": "^1.0.1" } }, "is-resolvable": { @@ -4104,7 +4088,7 @@ "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=", "dev": true, "requires": { - "tryit": "1.0.3" + "tryit": "^1.0.1" } }, "is-stream": { @@ -4160,8 +4144,8 @@ "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", "requires": { - "node-fetch": "1.7.3", - "whatwg-fetch": "1.1.1" + "node-fetch": "^1.0.1", + "whatwg-fetch": ">=0.10.0" } }, "isstream": { @@ -4185,8 +4169,8 @@ "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", "dev": true, "requires": { - "argparse": "1.0.9", - "esprima": "4.0.0" + "argparse": "^1.0.7", + "esprima": "^4.0.0" } }, "jsbn": { @@ -4221,8 +4205,9 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "dev": true, "requires": { - "jsonify": "0.0.0" + "jsonify": "~0.0.0" } }, "json-stringify-safe": { @@ -4245,7 +4230,8 @@ "jsonify": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", + "dev": true }, "jsonpointer": { "version": "4.0.1", @@ -4270,42 +4256,48 @@ "integrity": "sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=", "dev": true, "requires": { - "array-includes": "3.0.3" + "array-includes": "^3.0.3" } }, + "just-extend": { + "version": "1.1.27", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz", + "integrity": "sha512-mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g==", + "dev": true + }, "karma": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz", "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==", "dev": true, "requires": { - "bluebird": "3.5.1", - "body-parser": "1.18.2", - "chokidar": "1.7.0", - "colors": "1.1.2", - "combine-lists": "1.0.1", - "connect": "3.6.5", - "core-js": "2.5.1", - "di": "0.0.1", - "dom-serialize": "2.2.1", - "expand-braces": "0.1.2", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "http-proxy": "1.16.2", - "isbinaryfile": "3.0.2", - "lodash": "3.10.1", - "log4js": "0.6.38", - "mime": "1.4.1", - "minimatch": "3.0.4", - "optimist": "0.6.1", - "qjobs": "1.1.5", - "range-parser": "1.2.0", - "rimraf": "2.6.2", - "safe-buffer": "5.1.1", + "bluebird": "^3.3.0", + "body-parser": "^1.16.1", + "chokidar": "^1.4.1", + "colors": "^1.1.0", + "combine-lists": "^1.0.0", + "connect": "^3.6.0", + "core-js": "^2.2.0", + "di": "^0.0.1", + "dom-serialize": "^2.2.0", + "expand-braces": "^0.1.1", + "glob": "^7.1.1", + "graceful-fs": "^4.1.2", + "http-proxy": "^1.13.0", + "isbinaryfile": "^3.0.0", + "lodash": "^3.8.0", + "log4js": "^0.6.31", + "mime": "^1.3.4", + "minimatch": "^3.0.2", + "optimist": "^0.6.1", + "qjobs": "^1.1.4", + "range-parser": "^1.2.0", + "rimraf": "^2.6.0", + "safe-buffer": "^5.0.1", "socket.io": "1.7.3", - "source-map": "0.5.7", + "source-map": "^0.5.3", "tmp": "0.0.31", - "useragent": "2.2.1" + "useragent": "^2.1.12" }, "dependencies": { "glob": { @@ -4314,12 +4306,12 @@ "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "lodash": { @@ -4336,8 +4328,8 @@ "integrity": "sha1-TG1wDRY6nTTGGO/YeRi+SeekqMk=", "dev": true, "requires": { - "fs-access": "1.0.1", - "which": "1.3.0" + "fs-access": "^1.0.0", + "which": "^1.2.1" } }, "karma-cli": { @@ -4346,7 +4338,7 @@ "integrity": "sha1-ys6oQ3Hs4Zh2JlyPoQLru5/uSow=", "dev": true, "requires": { - "resolve": "1.4.0" + "resolve": "^1.1.6" } }, "karma-junit-reporter": { @@ -4355,7 +4347,7 @@ "integrity": "sha1-SSojZyj+TJKqz0GfzQEQpDJ+nX8=", "dev": true, "requires": { - "path-is-absolute": "1.0.1", + "path-is-absolute": "^1.0.0", "xmlbuilder": "3.1.0" } }, @@ -4377,7 +4369,7 @@ "integrity": "sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=", "dev": true, "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.2" } }, "karma-spec-reporter": { @@ -4386,7 +4378,7 @@ "integrity": "sha1-SDDccUihVcfXoYbmMjOaDYD63sM=", "dev": true, "requires": { - "colors": "1.1.2" + "colors": "^1.1.2" } }, "karma-summary-reporter": { @@ -4395,7 +4387,7 @@ "integrity": "sha1-nHQKJLYL+RNes59acylsTM0Q2Zs=", "dev": true, "requires": { - "chalk": "1.1.3" + "chalk": "^1.1.3" } }, "karma-webpack": { @@ -4404,11 +4396,11 @@ "integrity": "sha1-OdX9Lt7qPMPvW0BZibN9Ww5qO04=", "dev": true, "requires": { - "async": "0.9.2", - "loader-utils": "0.2.17", - "lodash": "3.10.1", - "source-map": "0.1.43", - "webpack-dev-middleware": "1.12.0" + "async": "~0.9.0", + "loader-utils": "^0.2.5", + "lodash": "^3.8.0", + "source-map": "^0.1.41", + "webpack-dev-middleware": "^1.0.11" }, "dependencies": { "lodash": { @@ -4423,7 +4415,7 @@ "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -4434,7 +4426,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.5" + "is-buffer": "^1.1.5" } }, "lazy-cache": { @@ -4449,8 +4441,8 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" } }, "linkifyjs": { @@ -4458,9 +4450,9 @@ "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.5.tgz", "integrity": "sha512-8FqxPXQDLjI2nNHlM7eGewxE6DHvMbtiW0AiXzm0s4RkTwVZYRDTeVXkiRxLHTd4CuRBQY/JPtvtqJWdS7gHyA==", "requires": { - "jquery": "3.2.1", - "react": "15.6.2", - "react-dom": "15.6.2" + "jquery": ">=1.9.0", + "react": ">=0.14.0", + "react-dom": ">=0.14.0" } }, "loader-utils": { @@ -4469,10 +4461,10 @@ "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", "dev": true, "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" + "big.js": "^3.1.3", + "emojis-list": "^2.0.0", + "json5": "^0.5.0", + "object-assign": "^4.0.1" } }, "lodash": { @@ -4491,6 +4483,12 @@ "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", "dev": true }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true + }, "lodash.pickby": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz", @@ -4503,8 +4501,8 @@ "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=", "dev": true, "requires": { - "readable-stream": "1.0.34", - "semver": "4.3.6" + "readable-stream": "~1.0.2", + "semver": "~4.3.3" }, "dependencies": { "isarray": { @@ -4519,10 +4517,10 @@ "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", "isarray": "0.0.1", - "string_decoder": "0.10.31" + "string_decoder": "~0.10.x" } }, "string_decoder": { @@ -4534,10 +4532,9 @@ } }, "lolex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz", - "integrity": "sha1-fD2mL/yzDw9agKJWbKJORdigHzE=", - "dev": true + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz", + "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng==" }, "longest": { "version": "1.0.1", @@ -4550,7 +4547,7 @@ "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", "requires": { - "js-tokens": "3.0.2" + "js-tokens": "^3.0.0" } }, "lru-cache": { @@ -4560,16 +4557,16 @@ "dev": true }, "matrix-js-sdk": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.10.1.tgz", - "integrity": "sha512-BLo+Okn2o///TyWBKtjFXvhlD32vGfr10eTE51hHx/jwaXO82VyGMzMi+IDPS4SDYUbvXI7PpamECeh9TXnV2w==", + "version": "0.10.2", + "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.10.2.tgz", + "integrity": "sha512-7o9a+4wWmxoW4cfdGVLGjZgTFLpWf/I0UqyicIzdV73qotYIO/q6k1bLf1+G0hgwZ/umwke4CB7GemxvvvxMcA==", "requires": { - "another-json": "0.2.0", - "babel-runtime": "6.26.0", - "bluebird": "3.5.1", - "browser-request": "0.3.3", - "content-type": "1.0.4", - "request": "2.83.0" + "another-json": "^0.2.0", + "babel-runtime": "^6.26.0", + "bluebird": "^3.5.0", + "browser-request": "^0.3.3", + "content-type": "^1.0.2", + "request": "^2.53.0" } }, "matrix-mock-request": { @@ -4578,8 +4575,8 @@ "integrity": "sha1-2aWrqNPYJG6I/3YyWYuZwUE/QjI=", "dev": true, "requires": { - "bluebird": "3.5.1", - "expect": "1.20.2" + "bluebird": "^3.5.0", + "expect": "^1.20.2" } }, "matrix-react-test-utils": { @@ -4588,8 +4585,8 @@ "integrity": "sha1-tUiETQ6+M46hucjxZHTDDRfDvfQ=", "dev": true, "requires": { - "react": "15.6.2", - "react-dom": "15.6.2" + "react": "^15.6.1", + "react-dom": "^15.6.1" } }, "mdurl": { @@ -4614,8 +4611,8 @@ "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { - "errno": "0.1.4", - "readable-stream": "2.3.3" + "errno": "^0.1.3", + "readable-stream": "^2.0.1" } }, "micromatch": { @@ -4624,19 +4621,19 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" } }, "mime": { @@ -4655,7 +4652,7 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", "requires": { - "mime-db": "1.30.0" + "mime-db": "~1.30.0" } }, "minimatch": { @@ -4663,7 +4660,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -4728,12 +4725,12 @@ "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "growl": { @@ -4754,7 +4751,7 @@ "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", "dev": true, "requires": { - "has-flag": "2.0.0" + "has-flag": "^2.0.0" } } } @@ -4790,13 +4787,34 @@ "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", "dev": true }, + "nise": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.3.3.tgz", + "integrity": "sha512-v1J/FLUB9PfGqZLGDBhQqODkbLotP0WtLo9R4EJY2PPu5f5Xg4o0rA8FDlmrjFSv9vBBKcfnOSpfYYuu5RTHqg==", + "dev": true, + "requires": { + "@sinonjs/formatio": "^2.0.0", + "just-extend": "^1.1.27", + "lolex": "^2.3.2", + "path-to-regexp": "^1.7.0", + "text-encoding": "^0.6.4" + }, + "dependencies": { + "lolex": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.6.0.tgz", + "integrity": "sha512-e1UtIo1pbrIqEXib/yMjHciyqkng5lc0rrIbytgjmRgDR9+2ceNIAcwOWSgylRjoEP9VdVguCSRwnNmlbnOUwA==", + "dev": true + } + } + }, "node-fetch": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", "requires": { - "encoding": "0.1.12", - "is-stream": "1.1.0" + "encoding": "^0.1.11", + "is-stream": "^1.0.1" } }, "node-libs-browser": { @@ -4805,28 +4823,28 @@ "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=", "dev": true, "requires": { - "assert": "1.4.1", - "browserify-zlib": "0.1.4", - "buffer": "4.9.1", - "console-browserify": "1.1.0", - "constants-browserify": "1.0.0", + "assert": "^1.1.1", + "browserify-zlib": "^0.1.4", + "buffer": "^4.9.0", + "console-browserify": "^1.1.0", + "constants-browserify": "^1.0.0", "crypto-browserify": "3.3.0", - "domain-browser": "1.1.7", - "events": "1.1.1", + "domain-browser": "^1.1.1", + "events": "^1.0.0", "https-browserify": "0.0.1", - "os-browserify": "0.2.1", + "os-browserify": "^0.2.0", "path-browserify": "0.0.0", - "process": "0.11.10", - "punycode": "1.4.1", - "querystring-es3": "0.2.1", - "readable-stream": "2.3.3", - "stream-browserify": "2.0.1", - "stream-http": "2.7.2", - "string_decoder": "0.10.31", - "timers-browserify": "2.0.4", + "process": "^0.11.0", + "punycode": "^1.2.4", + "querystring-es3": "^0.2.0", + "readable-stream": "^2.0.5", + "stream-browserify": "^2.0.1", + "stream-http": "^2.3.1", + "string_decoder": "^0.10.25", + "timers-browserify": "^2.0.2", "tty-browserify": "0.0.0", - "url": "0.11.0", - "util": "0.10.3", + "url": "^0.11.0", + "util": "^0.10.3", "vm-browserify": "0.0.4" }, "dependencies": { @@ -4844,7 +4862,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } }, "null-check": { @@ -4893,10 +4911,10 @@ "integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=", "dev": true, "requires": { - "define-properties": "1.1.2", - "es-abstract": "1.9.0", - "function-bind": "1.1.1", - "has": "1.0.1" + "define-properties": "^1.1.2", + "es-abstract": "^1.6.1", + "function-bind": "^1.1.0", + "has": "^1.0.1" } }, "object.omit": { @@ -4905,8 +4923,8 @@ "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" + "for-own": "^0.1.4", + "is-extendable": "^0.1.1" } }, "on-finished": { @@ -4923,7 +4941,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "onetime": { @@ -4937,8 +4955,8 @@ "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "requires": { - "minimist": "0.0.10", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" }, "dependencies": { "minimist": { @@ -4954,12 +4972,12 @@ "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "dev": true, "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "1.0.0" + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.4", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "wordwrap": "~1.0.0" }, "dependencies": { "wordwrap": { @@ -5000,9 +5018,9 @@ "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "mkdirp": "0.5.1", - "object-assign": "4.1.1" + "graceful-fs": "^4.1.4", + "mkdirp": "^0.5.1", + "object-assign": "^4.1.0" } }, "pako": { @@ -5022,10 +5040,10 @@ "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "glob-base": "^0.3.0", + "is-dotfile": "^1.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.0" } }, "parsejson": { @@ -5034,7 +5052,7 @@ "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=", "dev": true, "requires": { - "better-assert": "1.0.2" + "better-assert": "~1.0.0" } }, "parseqs": { @@ -5043,7 +5061,7 @@ "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", "dev": true, "requires": { - "better-assert": "1.0.2" + "better-assert": "~1.0.0" } }, "parseuri": { @@ -5052,7 +5070,7 @@ "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", "dev": true, "requires": { - "better-assert": "1.0.2" + "better-assert": "~1.0.0" } }, "parseurl": { @@ -5073,7 +5091,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "path-is-absolute": { @@ -5093,6 +5111,23 @@ "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", "dev": true }, + "path-to-regexp": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", + "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", + "dev": true, + "requires": { + "isarray": "0.0.1" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + } + } + }, "pbkdf2-compat": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz", @@ -5122,7 +5157,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "pkg-dir": { @@ -5131,7 +5166,7 @@ "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", "dev": true, "requires": { - "find-up": "1.1.2" + "find-up": "^1.0.0" } }, "pluralize": { @@ -5185,7 +5220,7 @@ "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", "requires": { - "asap": "2.0.6" + "asap": "~2.0.3" } }, "prop-types": { @@ -5193,9 +5228,9 @@ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", "requires": { - "fbjs": "0.8.16", - "loose-envify": "1.3.1", - "object-assign": "4.1.1" + "fbjs": "^0.8.16", + "loose-envify": "^1.3.1", + "object-assign": "^4.1.1" } }, "prr": { @@ -5236,7 +5271,7 @@ "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz", "integrity": "sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==", "requires": { - "performance-now": "2.1.0" + "performance-now": "^2.1.0" } }, "raf-schd": { @@ -5250,8 +5285,8 @@ "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=", "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "is-number": { @@ -5260,7 +5295,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -5269,7 +5304,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.5" + "is-buffer": "^1.1.5" } } } @@ -5280,7 +5315,7 @@ "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { - "is-buffer": "1.1.5" + "is-buffer": "^1.1.5" } } } @@ -5308,11 +5343,11 @@ "resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz", "integrity": "sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=", "requires": { - "create-react-class": "15.6.2", - "fbjs": "0.8.16", - "loose-envify": "1.3.1", - "object-assign": "4.1.1", - "prop-types": "15.6.0" + "create-react-class": "^15.6.0", + "fbjs": "^0.8.9", + "loose-envify": "^1.1.0", + "object-assign": "^4.1.0", + "prop-types": "^15.5.10" } }, "react-addons-css-transition-group": { @@ -5331,16 +5366,16 @@ "resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-4.0.1.tgz", "integrity": "sha512-d73RMu4QOFCyjUELLWFyY/EuclnfqulI9pECx+2gIuJvV0ycf1uR88o+1x0RSB9ILD70inHMzCBKNkWVbbt+vA==", "requires": { - "babel-runtime": "6.26.0", - "invariant": "2.2.2", - "memoize-one": "3.1.1", - "prop-types": "15.6.0", - "raf-schd": "2.1.1", - "react-motion": "0.5.2", - "react-redux": "5.0.7", - "redux": "3.7.2", - "redux-thunk": "2.2.0", - "reselect": "3.0.1" + "babel-runtime": "^6.26.0", + "invariant": "^2.2.2", + "memoize-one": "^3.0.1", + "prop-types": "^15.6.0", + "raf-schd": "^2.1.0", + "react-motion": "^0.5.2", + "react-redux": "^5.0.6", + "redux": "^3.7.2", + "redux-thunk": "^2.2.0", + "reselect": "^3.0.1" } }, "react-dom": { @@ -5348,14 +5383,15 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz", "integrity": "sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=", "requires": { - "fbjs": "0.8.16", - "loose-envify": "1.3.1", - "object-assign": "4.1.1", - "prop-types": "15.6.0" + "fbjs": "^0.8.9", + "loose-envify": "^1.1.0", + "object-assign": "^4.1.0", + "prop-types": "^15.5.10" } }, "react-gemini-scrollbar": { "version": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9", + "from": "react-gemini-scrollbar@github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9", "requires": { "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b" } @@ -5365,9 +5401,9 @@ "resolved": "https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz", "integrity": "sha512-9q3YAvHoUiWlP3cK0v+w1N5Z23HXMj4IF4YuvjvWegWqNPfLXsOBE/V7UvQGpXxHFKRQQcNcVQE31g9SB/6qgQ==", "requires": { - "performance-now": "0.2.0", - "prop-types": "15.6.0", - "raf": "3.4.0" + "performance-now": "^0.2.0", + "prop-types": "^15.5.8", + "raf": "^3.1.0" }, "dependencies": { "performance-now": { @@ -5382,12 +5418,12 @@ "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz", "integrity": "sha512-5VI8EV5hdgNgyjfmWzBbdrqUkrVRKlyTKk1sGH3jzM2M2Mhj/seQgPXaz6gVAj2lz/nz688AdTqMO18Lr24Zhg==", "requires": { - "hoist-non-react-statics": "2.5.0", - "invariant": "2.2.2", - "lodash": "4.17.10", - "lodash-es": "4.17.10", - "loose-envify": "1.3.1", - "prop-types": "15.6.0" + "hoist-non-react-statics": "^2.5.0", + "invariant": "^2.0.0", + "lodash": "^4.17.5", + "lodash-es": "^4.17.5", + "loose-envify": "^1.1.0", + "prop-types": "^15.6.0" }, "dependencies": { "lodash": { @@ -5402,13 +5438,13 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~1.0.6", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.0.3", + "util-deprecate": "~1.0.1" } }, "readdirp": { @@ -5417,10 +5453,10 @@ "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "readable-stream": "2.3.3", - "set-immediate-shim": "1.0.1" + "graceful-fs": "^4.1.2", + "minimatch": "^3.0.2", + "readable-stream": "^2.0.2", + "set-immediate-shim": "^1.0.1" } }, "readline2": { @@ -5429,8 +5465,8 @@ "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=", "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", "mute-stream": "0.0.5" } }, @@ -5440,7 +5476,7 @@ "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "dev": true, "requires": { - "resolve": "1.4.0" + "resolve": "^1.1.6" } }, "redux": { @@ -5448,10 +5484,10 @@ "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz", "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==", "requires": { - "lodash": "4.17.4", - "lodash-es": "4.17.10", - "loose-envify": "1.3.1", - "symbol-observable": "1.2.0" + "lodash": "^4.2.1", + "lodash-es": "^4.2.1", + "loose-envify": "^1.1.0", + "symbol-observable": "^1.0.3" } }, "redux-thunk": { @@ -5476,9 +5512,9 @@ "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "private": "0.1.8" + "babel-runtime": "^6.18.0", + "babel-types": "^6.19.0", + "private": "^0.1.6" } }, "regex-cache": { @@ -5487,7 +5523,7 @@ "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "dev": true, "requires": { - "is-equal-shallow": "0.1.3" + "is-equal-shallow": "^0.1.3" } }, "regexp-quote": { @@ -5501,9 +5537,9 @@ "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", "dev": true, "requires": { - "regenerate": "1.3.3", - "regjsgen": "0.2.0", - "regjsparser": "0.1.5" + "regenerate": "^1.2.1", + "regjsgen": "^0.2.0", + "regjsparser": "^0.1.4" } }, "regjsgen": { @@ -5518,7 +5554,7 @@ "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { - "jsesc": "0.5.0" + "jsesc": "~0.5.0" }, "dependencies": { "jsesc": { @@ -5553,36 +5589,34 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "request": { - "version": "2.83.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz", - "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==", + "version": "2.87.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", + "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.3.1", - "har-validator": "5.0.3", - "hawk": "6.0.2", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.17", - "oauth-sign": "0.8.2", - "performance-now": "2.1.0", - "qs": "6.5.1", - "safe-buffer": "5.1.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.3", - "tunnel-agent": "0.6.0", - "uuid": "3.1.0" + "aws-sign2": "~0.7.0", + "aws4": "^1.6.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.5", + "extend": "~3.0.1", + "forever-agent": "~0.6.1", + "form-data": "~2.3.1", + "har-validator": "~5.0.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.17", + "oauth-sign": "~0.8.2", + "performance-now": "^2.1.0", + "qs": "~6.5.1", + "safe-buffer": "^5.1.1", + "tough-cookie": "~2.3.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.1.0" } }, "require-json": { @@ -5597,8 +5631,8 @@ "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", "dev": true, "requires": { - "caller-path": "0.1.0", - "resolve-from": "1.0.1" + "caller-path": "^0.1.0", + "resolve-from": "^1.0.0" } }, "requires-port": { @@ -5618,7 +5652,7 @@ "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", "dev": true, "requires": { - "path-parse": "1.0.5" + "path-parse": "^1.0.5" } }, "resolve-from": { @@ -5633,8 +5667,8 @@ "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", "dev": true, "requires": { - "exit-hook": "1.1.1", - "onetime": "1.1.0" + "exit-hook": "^1.0.0", + "onetime": "^1.0.0" } }, "right-align": { @@ -5643,7 +5677,7 @@ "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", "dev": true, "requires": { - "align-text": "0.1.4" + "align-text": "^0.1.1" } }, "rimraf": { @@ -5652,7 +5686,7 @@ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" }, "dependencies": { "glob": { @@ -5661,12 +5695,12 @@ "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } } } @@ -5683,7 +5717,7 @@ "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=", "dev": true, "requires": { - "once": "1.4.0" + "once": "^1.3.0" } }, "rx-lite": { @@ -5698,9 +5732,9 @@ "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" }, "samsam": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz", - "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz", + "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==", "dev": true }, "sanitize-html": { @@ -5708,9 +5742,9 @@ "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz", "integrity": "sha1-cw/6Ikm98YMz7/5FsoYXPJxa0Lg=", "requires": { - "htmlparser2": "3.9.2", + "htmlparser2": "^3.9.0", "regexp-quote": "0.0.0", - "xtend": "4.0.1" + "xtend": "^4.0.0" } }, "semver": { @@ -5748,9 +5782,9 @@ "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=", "dev": true, "requires": { - "glob": "7.1.2", - "interpret": "1.0.4", - "rechoir": "0.6.2" + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" }, "dependencies": { "glob": { @@ -5759,26 +5793,52 @@ "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } } } }, "sinon": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz", - "integrity": "sha1-RUKk9JugxFwF6y6d2dID4rjv4L8=", + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-5.0.7.tgz", + "integrity": "sha512-GvNLrwpvLZ8jIMZBUhHGUZDq5wlUdceJWyHvZDmqBxnjazpxY1L0FNbGBX6VpcOEoQ8Q4XMWFzm2myJMvx+VjA==", "dev": true, "requires": { - "formatio": "1.1.1", - "lolex": "1.3.2", - "samsam": "1.1.2", - "util": "0.10.3" + "@sinonjs/formatio": "^2.0.0", + "diff": "^3.1.0", + "lodash.get": "^4.4.2", + "lolex": "^2.2.0", + "nise": "^1.2.0", + "supports-color": "^5.1.0", + "type-detect": "^4.0.5" + }, + "dependencies": { + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "lolex": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.6.0.tgz", + "integrity": "sha512-e1UtIo1pbrIqEXib/yMjHciyqkng5lc0rrIbytgjmRgDR9+2ceNIAcwOWSgylRjoEP9VdVguCSRwnNmlbnOUwA==", + "dev": true + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } } }, "slash": { @@ -5793,11 +5853,6 @@ "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=", "dev": true }, - "sntp": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz", - "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=" - }, "socket.io": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz", @@ -5958,9 +6013,9 @@ "integrity": "sha512-MYbFX9DYxmTQFfy2v8FC1XZwpwHKYxg3SK8Wb7VPBKuhDjz8gi9re2819MsG4p49HDyiOSUKlmZ+nQBArW5CGw==", "dev": true, "requires": { - "async": "2.6.0", - "loader-utils": "0.2.17", - "source-map": "0.6.1" + "async": "^2.5.0", + "loader-utils": "~0.2.2", + "source-map": "~0.6.1" }, "dependencies": { "async": { @@ -5969,7 +6024,7 @@ "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", "dev": true, "requires": { - "lodash": "4.17.4" + "lodash": "^4.14.0" } }, "source-map": { @@ -5986,7 +6041,7 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "^0.5.6" } }, "sprintf-js": { @@ -5995,18 +6050,18 @@ "integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw=" }, "sshpk": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", - "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", + "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "tweetnacl": "~0.14.0" } }, "statuses": { @@ -6021,8 +6076,8 @@ "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", "dev": true, "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.3" + "inherits": "~2.0.1", + "readable-stream": "^2.0.2" } }, "stream-http": { @@ -6031,11 +6086,11 @@ "integrity": "sha1-QKBQ7I3DtTsz2ZCUFcAsC/Gr+60=", "dev": true, "requires": { - "builtin-status-codes": "3.0.0", - "inherits": "2.0.3", - "readable-stream": "2.3.3", - "to-arraybuffer": "1.0.1", - "xtend": "4.0.1" + "builtin-status-codes": "^3.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.2.6", + "to-arraybuffer": "^1.0.0", + "xtend": "^4.0.0" } }, "string-width": { @@ -6044,9 +6099,9 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string.prototype.repeat": { @@ -6059,21 +6114,16 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, - "stringstream": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", - "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=" - }, "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { @@ -6110,12 +6160,12 @@ "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=", "dev": true, "requires": { - "ajv": "4.11.8", - "ajv-keywords": "1.5.1", - "chalk": "1.1.3", - "lodash": "4.17.4", + "ajv": "^4.7.0", + "ajv-keywords": "^1.0.0", + "chalk": "^1.1.1", + "lodash": "^4.0.0", "slice-ansi": "0.0.4", - "string-width": "2.1.1" + "string-width": "^2.0.0" }, "dependencies": { "ajv": { @@ -6124,8 +6174,8 @@ "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", "dev": true, "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" + "co": "^4.6.0", + "json-stable-stringify": "^1.0.1" } }, "ansi-regex": { @@ -6146,8 +6196,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -6156,7 +6206,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -6167,6 +6217,12 @@ "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=", "dev": true }, + "text-encoding": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", + "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=", + "dev": true + }, "text-encoding-utf-8": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/text-encoding-utf-8/-/text-encoding-utf-8-1.0.1.tgz", @@ -6196,7 +6252,7 @@ "integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==", "dev": true, "requires": { - "setimmediate": "1.0.5" + "setimmediate": "^1.0.4" } }, "tmatch": { @@ -6211,7 +6267,7 @@ "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", "dev": true, "requires": { - "os-tmpdir": "1.0.2" + "os-tmpdir": "~1.0.1" } }, "to-array": { @@ -6233,11 +6289,11 @@ "dev": true }, "tough-cookie": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", - "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", + "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "requires": { - "punycode": "1.4.1" + "punycode": "^1.4.1" } }, "trim-right": { @@ -6263,7 +6319,7 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "^5.0.1" } }, "tweetnacl": { @@ -6278,9 +6334,15 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "1.1.2" + "prelude-ls": "~1.1.2" } }, + "type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true + }, "type-is": { "version": "1.6.15", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz", @@ -6288,7 +6350,7 @@ "dev": true, "requires": { "media-typer": "0.3.0", - "mime-types": "2.1.17" + "mime-types": "~2.1.15" } }, "typedarray": { @@ -6308,10 +6370,10 @@ "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=", "dev": true, "requires": { - "async": "0.2.10", - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "async": "~0.2.6", + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" }, "dependencies": { "async": { @@ -6368,8 +6430,8 @@ "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=", "dev": true, "requires": { - "lru-cache": "2.2.4", - "tmp": "0.0.31" + "lru-cache": "2.2.x", + "tmp": "0.0.x" } }, "util": { @@ -6401,9 +6463,9 @@ "dev": true }, "uuid": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" }, "v8flags": { "version": "2.1.1", @@ -6411,13 +6473,14 @@ "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", "dev": true, "requires": { - "user-home": "1.1.1" + "user-home": "^1.1.1" } }, "velocity-vector": { "version": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f", + "from": "velocity-vector@github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f", "requires": { - "jquery": "3.2.1" + "jquery": ">= 1.4.3" } }, "verror": { @@ -6425,9 +6488,9 @@ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "requires": { - "assert-plus": "1.0.0", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" } }, "vm-browserify": { @@ -6451,7 +6514,7 @@ "integrity": "sha1-MbTbZnjyrgHDnqn7hyWpAx5Vins=", "dev": true, "requires": { - "foreachasync": "3.0.0" + "foreachasync": "^3.0.0" } }, "watchpack": { @@ -6460,9 +6523,9 @@ "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=", "dev": true, "requires": { - "async": "0.9.2", - "chokidar": "1.7.0", - "graceful-fs": "4.1.11" + "async": "^0.9.0", + "chokidar": "^1.0.0", + "graceful-fs": "^4.1.2" } }, "webpack": { @@ -6471,21 +6534,21 @@ "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=", "dev": true, "requires": { - "acorn": "3.3.0", - "async": "1.5.2", - "clone": "1.0.2", - "enhanced-resolve": "0.9.1", - "interpret": "0.6.6", - "loader-utils": "0.2.17", - "memory-fs": "0.3.0", - "mkdirp": "0.5.1", - "node-libs-browser": "0.7.0", - "optimist": "0.6.1", - "supports-color": "3.2.3", - "tapable": "0.1.10", - "uglify-js": "2.7.5", - "watchpack": "0.2.9", - "webpack-core": "0.6.9" + "acorn": "^3.0.0", + "async": "^1.3.0", + "clone": "^1.0.2", + "enhanced-resolve": "~0.9.0", + "interpret": "^0.6.4", + "loader-utils": "^0.2.11", + "memory-fs": "~0.3.0", + "mkdirp": "~0.5.0", + "node-libs-browser": "^0.7.0", + "optimist": "~0.6.0", + "supports-color": "^3.1.0", + "tapable": "~0.1.8", + "uglify-js": "~2.7.3", + "watchpack": "^0.2.1", + "webpack-core": "~0.6.9" }, "dependencies": { "acorn": { @@ -6512,8 +6575,8 @@ "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=", "dev": true, "requires": { - "errno": "0.1.4", - "readable-stream": "2.3.3" + "errno": "^0.1.3", + "readable-stream": "^2.0.1" } }, "supports-color": { @@ -6522,7 +6585,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" } } } @@ -6533,8 +6596,8 @@ "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", "dev": true, "requires": { - "source-list-map": "0.1.8", - "source-map": "0.4.4" + "source-list-map": "~0.1.7", + "source-map": "~0.4.1" }, "dependencies": { "source-map": { @@ -6543,7 +6606,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -6554,11 +6617,11 @@ "integrity": "sha1-007++y7dp+HTtdvgcolRMhllFwk=", "dev": true, "requires": { - "memory-fs": "0.4.1", - "mime": "1.4.1", - "path-is-absolute": "1.0.1", - "range-parser": "1.2.0", - "time-stamp": "2.0.0" + "memory-fs": "~0.4.1", + "mime": "^1.3.4", + "path-is-absolute": "^1.0.0", + "range-parser": "^1.0.3", + "time-stamp": "^2.0.0" } }, "whatwg-fetch": { @@ -6572,7 +6635,7 @@ "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "window-size": { @@ -6597,7 +6660,7 @@ "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", "dev": true, "requires": { - "mkdirp": "0.5.1" + "mkdirp": "^0.5.1" } }, "ws": { @@ -6606,8 +6669,8 @@ "integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=", "dev": true, "requires": { - "options": "0.0.6", - "ultron": "1.0.2" + "options": ">=0.0.5", + "ultron": "1.0.x" } }, "wtf-8": { @@ -6622,7 +6685,7 @@ "integrity": "sha1-LIaIjy1OrehQ+jjKf3Ij9yCVFuE=", "dev": true, "requires": { - "lodash": "3.10.1" + "lodash": "^3.5.0" }, "dependencies": { "lodash": { @@ -6650,9 +6713,9 @@ "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "dev": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", "window-size": "0.1.0" } }, diff --git a/package.json b/package.json index 60f65f4c39..5864b35fc4 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "react-addons-test-utils": "^15.4.0", "require-json": "0.0.1", "rimraf": "^2.4.3", - "sinon": "^1.17.3", + "sinon": "^5.0.7", "source-map-loader": "^0.2.3", "walk": "^2.3.9", "webpack": "^1.12.14" diff --git a/test/components/structures/TimelinePanel-test.js b/test/components/structures/TimelinePanel-test.js index 74037d2926..ea62d427bc 100644 --- a/test/components/structures/TimelinePanel-test.js +++ b/test/components/structures/TimelinePanel-test.js @@ -235,7 +235,7 @@ describe('TimelinePanel', function() { // now, if we update the events, there shouldn't be any // more requests. - client.paginateEventTimeline.reset(); + client.paginateEventTimeline.resetHistory(); panel.forceUpdate(); expect(messagePanel.props.backPaginating).toBe(false); setTimeout(() => { From 836dc8b0ef2b3d086747c85fbcdd885d7102304c Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Mon, 21 May 2018 16:59:13 +0100 Subject: [PATCH 009/283] Factor out all shared logic between MStickerBody and MImageBody The benefits of this: - One code path for determining spinner/placeholder and it's position for loading images/stickers. This includes spinner used in e2e decryption of images. - Very small definition for MStickerBody, only overriding the minimal differences is has from MImageBody. The disadvantages: - Slightly more complicated MImageBody, but hopefully not less readable. --- res/css/views/messages/_MImageBody.scss | 11 +- res/css/views/messages/_MStickerBody.scss | 32 +--- src/components/views/messages/MImageBody.js | 89 ++++++++-- src/components/views/messages/MStickerBody.js | 162 ++++-------------- 4 files changed, 111 insertions(+), 183 deletions(-) diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss index 64821434dd..4c763c5991 100644 --- a/res/css/views/messages/_MImageBody.scss +++ b/res/css/views/messages/_MImageBody.scss @@ -37,11 +37,12 @@ limitations under the License. } .mx_MImageBody_thumbnail_spinner { - display: flex; - align-items: center; - width: 100%; + position: absolute; + left: 50%; + top: 50%; } -.mx_MImageBody_thumbnail_spinner img { - margin: auto; +// Inner img and TintableSvg should be centered around 0, 0 +.mx_MImageBody_thumbnail_spinner > * { + transform: translate(-50%, -50%); } diff --git a/res/css/views/messages/_MStickerBody.scss b/res/css/views/messages/_MStickerBody.scss index 3e6bbe5aa4..e4977bcc34 100644 --- a/res/css/views/messages/_MStickerBody.scss +++ b/res/css/views/messages/_MStickerBody.scss @@ -14,33 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. */ -.mx_MStickerBody { - display: block; - margin-right: 34px; - min-height: 110px; - padding: 20px 0; +.mx_MStickerBody_wrapper { + padding: 20px 0px; } -.mx_MStickerBody_image_container { - display: inline-block; - position: relative; -} - -.mx_MStickerBody_image { - max-width: 100%; - opacity: 0; -} - -.mx_MStickerBody_image_visible { - opacity: 1; -} - -.mx_MStickerBody_placeholder { - position: absolute; - opacity: 1; -} - -.mx_MStickerBody_placeholder_invisible { - transition: 500ms; - opacity: 0; +.mx_MStickerBody_tooltip { + position: absolute; + top: 50%; } diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index d9108a2fe1..03dad5e439 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -62,6 +62,8 @@ export default class extends React.Component { decryptedBlob: null, error: null, imgError: false, + imgLoaded: false, + hover: false, }; } @@ -116,6 +118,8 @@ export default class extends React.Component { } onImageEnter(e) { + this.setState({ hover: true }); + if (!this._isGif() || SettingsStore.getValue("autoplayGifsAndVideos")) { return; } @@ -124,6 +128,8 @@ export default class extends React.Component { } onImageLeave(e) { + this.setState({ hover: false }); + if (!this._isGif() || SettingsStore.getValue("autoplayGifsAndVideos")) { return; } @@ -139,6 +145,7 @@ export default class extends React.Component { onImageLoad() { this.props.onWidgetLoad(); + this.setState({ imgLoaded: true }); } _getContentUrl() { @@ -237,14 +244,22 @@ export default class extends React.Component { const maxWidth = content.info.w * maxHeight / content.info.h; let img = null; + let placeholder = null; + // e2e image hasn't been decrypted yet if (content.file !== undefined && this.state.decryptedUrl === null) { - img =
- {content.body} -
; - } else if (thumbUrl && !this.state.imgError) { + placeholder = {content.body}; + } else if (!this.state.imgLoaded) { + // Deliberately, getSpinner is left unimplemented here, MStickerBody overides + placeholder = this.getPlaceholder(); + } + + const showPlaceholder = Boolean(placeholder); + + if (thumbUrl && !this.state.imgError) { // Restrict the width of the thumbnail here, otherwise it will fill the container // which has the same width as the timeline + // mx_MImageBody_thumbnail resizes img to exactly container size img = {content.body}; } - const thumbnail = img ? - -
- { /* Calculate aspect ratio, using %padding will size _container correctly */ } -
- { /* mx_MImageBody_thumbnail resizes img to exactly container size */ } + const thumbnail = ( +
+ { /* Calculate aspect ratio, using %padding will size _container correctly */ } +
+ +
+
+ { placeholder } +
+
+ +
{ img }
- : null; - return ( - - { thumbnail } - - - ); + { this.state.hover && this.getTooltip() } +
+ ); + + return this.wrapImage(contentUrl, thumbnail); + } + + // Overidden by MStickerBody + wrapImage(contentUrl, children) { + return + {children} + ; + } + + // Overidden by MStickerBody + getPlaceholder() { + // MImageBody doesn't show a placeholder whilst the image loads, (but it could do) + return null; + } + + // Overidden by MStickerBody + getTooltip() { + return null; + } + + // Overidden by MStickerBody + getFileBody() { + return ; } render() { @@ -284,7 +330,6 @@ export default class extends React.Component { ); } - const contentUrl = this._getContentUrl(); let thumbUrl; if (this._isGif() && SettingsStore.getValue("autoplayGifsAndVideos")) { @@ -293,6 +338,12 @@ export default class extends React.Component { thumbUrl = this._getThumbUrl(); } - return this._messageContent(contentUrl, thumbUrl, content); + const thumbnail = this._messageContent(contentUrl, thumbUrl, content); + const fileBody = this.getFileBody(); + + return + { thumbnail } + { fileBody } + ; } } diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js index cdb60f0074..d9ed668e42 100644 --- a/src/components/views/messages/MStickerBody.js +++ b/src/components/views/messages/MStickerBody.js @@ -18,141 +18,39 @@ limitations under the License. import MImageBody from './MImageBody'; import sdk from '../../../index'; -import TintableSVG from '../elements/TintableSvg'; export default class MStickerBody extends MImageBody { - displayName: 'MStickerBody' - - constructor(props) { - super(props); - - this._onMouseEnter = this._onMouseEnter.bind(this); - this._onMouseLeave = this._onMouseLeave.bind(this); - this._onImageLoad = this._onImageLoad.bind(this); - } - - _onMouseEnter() { - this.setState({showTooltip: true}); - } - - _onMouseLeave() { - this.setState({showTooltip: false}); - } - - _onImageLoad() { - this.setState({ - placeholderClasses: 'mx_MStickerBody_placeholder_invisible', - }); - const hidePlaceholderTimer = setTimeout(() => { - this.setState({ - placeholderVisible: false, - imageClasses: 'mx_MStickerBody_image_visible', - }); - }, 500); - this.setState({hidePlaceholderTimer}); - if (this.props.onWidgetLoad) { - this.props.onWidgetLoad(); - } - } - - _afterComponentDidMount() { - if (this.refs.image.complete) { - // Image already loaded - this.setState({ - placeholderVisible: false, - placeholderClasses: '.mx_MStickerBody_placeholder_invisible', - imageClasses: 'mx_MStickerBody_image_visible', - }); - } else { - // Image not already loaded - this.setState({ - placeholderVisible: true, - placeholderClasses: '', - imageClasses: '', - }); - } - } - - _afterComponentWillUnmount() { - if (this.state.hidePlaceholderTimer) { - clearTimeout(this.state.hidePlaceholderTimer); - this.setState({hidePlaceholderTimer: null}); - } - } - - _messageContent(contentUrl, thumbUrl, content) { - let tooltip; - const tooltipBody = ( - this.props.mxEvent && - this.props.mxEvent.getContent() && - this.props.mxEvent.getContent().body) ? - this.props.mxEvent.getContent().body : null; - if (this.state.showTooltip && tooltipBody) { - const RoomTooltip = sdk.getComponent('rooms.RoomTooltip'); - tooltip = ; - } - - const gutterSize = 0; - let placeholderSize = 75; - let placeholderFixupHeight = '100px'; - let placeholderTop = 0; - let placeholderLeft = 0; - - if (content.info) { - placeholderTop = Math.floor((content.info.h/2) - (placeholderSize/2)) + 'px'; - placeholderLeft = Math.floor((content.info.w/2) - (placeholderSize/2) + gutterSize) + 'px'; - placeholderFixupHeight = content.info.h + 'px'; - } - - // The pixel size of sticker images is generally larger than their intended display - // size so they render at native reolution on HiDPI displays. We therefore need to - // explicity set the size so they render at the intended size. - const imageStyle = { - height: content.info.h, - // leave the browser the calculate the width automatically - }; - - placeholderSize = placeholderSize + 'px'; - - // Body 'ref' required by MImageBody - return ( - -
- { this.state.placeholderVisible && -
- -
} - {content.body} - { tooltip } -
- - ); - } - // Empty to prevent default behaviour of MImageBody onClick() { } + + // MStickerBody doesn't need a wrapping ``, but it does need extra padding + // which is added by mx_MStickerBody_wrapper + wrapImage(contentUrl, children) { + return
{ children }
; + } + + // Placeholder to show in place of the sticker image if + // img onLoad hasn't fired yet. + getPlaceholder() { + const TintableSVG = sdk.getComponent('elements.TintableSvg'); + return ; + } + + // Tooltip to show on mouse over + getTooltip() { + const content = this.props.mxEvent && this.props.mxEvent.getContent(); + + if (!content || !content.body || !content.info || !content.info.w) return null; + + const RoomTooltip = sdk.getComponent('rooms.RoomTooltip'); + return
+ +
; + } + + // Don't show "Download this_file.png ..." + getFileBody() { + return null; + } } From e4f8c09c32d9a03567de9a1e9a1954928915e29b Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Tue, 22 May 2018 10:43:16 +0100 Subject: [PATCH 010/283] Only include placeholder in DOM when necessary --- src/components/views/messages/MImageBody.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index f27124238e..e2316b2fcc 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -276,15 +276,16 @@ export default class extends React.Component { { /* Calculate aspect ratio, using %padding will size _container correctly */ }
-
-
- { placeholder } + { showPlaceholder && +
+
+ { placeholder } +
-
+ }
{ img } From fb5dd4a410e25e8ea145d9f6cd7ebae74e67f3d9 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Tue, 22 May 2018 10:46:10 +0100 Subject: [PATCH 011/283] Remove spurious fixupHeight --- src/components/views/messages/MImageBody.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index e2316b2fcc..083dc342db 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -211,7 +211,6 @@ export default class extends React.Component { }); }).done(); } - this.fixupHeight(); this._afterComponentDidMount(); } From c249bee9b53f4718319f7bcc9128059709e55260 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Tue, 22 May 2018 16:09:54 +0100 Subject: [PATCH 012/283] Grammar --- src/components/views/messages/MImageBody.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index 083dc342db..c210c64318 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -240,7 +240,7 @@ export default class extends React.Component { _messageContent(contentUrl, thumbUrl, content) { // The maximum height of the thumbnail as it is rendered as an const maxHeight = Math.min(THUMBNAIL_MAX_HEIGHT, content.info.h); - // The maximum width of the thumbnail, as dictated by it's natural + // The maximum width of the thumbnail, as dictated by its natural // maximum height. const maxWidth = content.info.w * maxHeight / content.info.h; From 538979a4ee7b6f9e4d92e57749e35a2bcc5d8689 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Tue, 22 May 2018 17:13:45 +0100 Subject: [PATCH 013/283] Fix MVideoBody spinner --- src/components/views/messages/MVideoBody.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/components/views/messages/MVideoBody.js b/src/components/views/messages/MVideoBody.js index 5365daee03..37fc94d1ed 100644 --- a/src/components/views/messages/MVideoBody.js +++ b/src/components/views/messages/MVideoBody.js @@ -147,12 +147,7 @@ module.exports = React.createClass({ // For now add an img tag with a spinner. return ( -
+
{content.body}
From 5147246c175a0b55d5b978e040248b82a3b71f7b Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 26 May 2018 15:41:25 +0100 Subject: [PATCH 014/283] kill stream when using gUM for permission to device labels to kill camera Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/UserSettings.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js index c8ce79905d..4ee4f1a427 100644 --- a/src/components/structures/UserSettings.js +++ b/src/components/structures/UserSettings.js @@ -284,7 +284,12 @@ module.exports = React.createClass({ this.setState({ electron_settings: settings }); }, - _refreshMediaDevices: function() { + _refreshMediaDevices: function(stream) { + if (stream) { + // kill stream so that we don't leave it lingering around with webcam enabled etc + stream.getTracks().forEach((track) => track.stop()); + } + Promise.resolve().then(() => { return CallMediaHandler.getDevices(); }).then((mediaDevices) => { From 6636fa32f67a592eb18208e89b2ae2ce226c00ac Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 26 May 2018 17:22:23 +0100 Subject: [PATCH 015/283] Allow selecting audio output for WebRTC Audio/Video calls Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/CallMediaHandler.js | 22 +++++++++++----- src/components/structures/UserSettings.js | 32 +++++++++++++++++++++-- src/settings/Settings.js | 4 +++ 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/src/CallMediaHandler.js b/src/CallMediaHandler.js index cdc5c61921..2330f86b99 100644 --- a/src/CallMediaHandler.js +++ b/src/CallMediaHandler.js @@ -22,34 +22,44 @@ export default { // Only needed for Electron atm, though should work in modern browsers // once permission has been granted to the webapp return navigator.mediaDevices.enumerateDevices().then(function(devices) { - const audioIn = []; - const videoIn = []; + const audiooutput = []; + const audioinput = []; + const videoinput = []; if (devices.some((device) => !device.label)) return false; devices.forEach((device) => { switch (device.kind) { - case 'audioinput': audioIn.push(device); break; - case 'videoinput': videoIn.push(device); break; + case 'audiooutput': audiooutput.push(device); break; + case 'audioinput': audioinput.push(device); break; + case 'videoinput': videoinput.push(device); break; } }); // console.log("Loaded WebRTC Devices", mediaDevices); return { - audioinput: audioIn, - videoinput: videoIn, + audiooutput, + audioinput, + videoinput, }; }, (error) => { console.log('Unable to refresh WebRTC Devices: ', error); }); }, loadDevices: function() { + const audioOutDeviceId = SettingsStore.getValue("webrtc_audiooutput"); const audioDeviceId = SettingsStore.getValue("webrtc_audioinput"); const videoDeviceId = SettingsStore.getValue("webrtc_videoinput"); + Matrix.setMatrixCallAudioOutput(audioOutDeviceId); Matrix.setMatrixCallAudioInput(audioDeviceId); Matrix.setMatrixCallVideoInput(videoDeviceId); }, + setAudioOutput: function(deviceId) { + SettingsStore.setValue("webrtc_audiooutput", null, SettingLevel.DEVICE, deviceId); + Matrix.setMatrixCallAudioOutput(deviceId); + }, + setAudioInput: function(deviceId) { SettingsStore.setValue("webrtc_audioinput", null, SettingLevel.DEVICE, deviceId); Matrix.setMatrixCallAudioInput(deviceId); diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js index c8ce79905d..0561071fce 100644 --- a/src/components/structures/UserSettings.js +++ b/src/components/structures/UserSettings.js @@ -292,6 +292,7 @@ module.exports = React.createClass({ if (this._unmounted) return; this.setState({ mediaDevices, + activeAudioOutput: SettingsStore.getValueAt(SettingLevel.DEVICE, 'webrtc_audiooutput'), activeAudioInput: SettingsStore.getValueAt(SettingLevel.DEVICE, 'webrtc_audioinput'), activeVideoInput: SettingsStore.getValueAt(SettingLevel.DEVICE, 'webrtc_videoinput'), }); @@ -970,6 +971,11 @@ module.exports = React.createClass({ return devices.map((device) => { device.label }); }, + _setAudioOutput: function(deviceId) { + this.setState({activeAudioOutput: deviceId}); + CallMediaHandler.setAudioOutput(deviceId); + }, + _setAudioInput: function(deviceId) { this.setState({activeAudioInput: deviceId}); CallMediaHandler.setAudioInput(deviceId); @@ -1010,6 +1016,7 @@ module.exports = React.createClass({ const Dropdown = sdk.getComponent('elements.Dropdown'); + let speakerDropdown =

{ _t('No Audio Outputs detected') }

; let microphoneDropdown =

{ _t('No Microphones detected') }

; let webcamDropdown =

{ _t('No Webcams detected') }

; @@ -1018,6 +1025,26 @@ module.exports = React.createClass({ label: _t('Default Device'), }; + const audioOutputs = this.state.mediaDevices.audiooutput.slice(0); + if (audioOutputs.length > 0) { + let defaultOutput = ''; + if (!audioOutputs.some((input) => input.deviceId === 'default')) { + audioOutputs.unshift(defaultOption); + } else { + defaultOutput = 'default'; + } + + speakerDropdown =
+

{ _t('Audio Output') }

+ + { this._mapWebRtcDevicesToSpans(audioOutputs) } + +
; + } + const audioInputs = this.state.mediaDevices.audioinput.slice(0); if (audioInputs.length > 0) { let defaultInput = ''; @@ -1059,8 +1086,9 @@ module.exports = React.createClass({ } return
- { microphoneDropdown } - { webcamDropdown } + { speakerDropdown } + { microphoneDropdown } + { webcamDropdown }
; }, diff --git a/src/settings/Settings.js b/src/settings/Settings.js index b1bc4161fd..a222c29dda 100644 --- a/src/settings/Settings.js +++ b/src/settings/Settings.js @@ -201,6 +201,10 @@ export const SETTINGS = { displayName: _td('Disable Peer-to-Peer for 1:1 calls'), default: false, }, + "webrtc_audiooutput": { + supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS, + default: null, + }, "webrtc_audioinput": { supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS, default: null, From 689b00c6188802fd31de2cff4314a3a3d2df8372 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 26 May 2018 17:24:07 +0100 Subject: [PATCH 016/283] run gen-i18n and prune-i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/i18n/strings/de_DE.json | 5 +-- src/i18n/strings/en_EN.json | 64 ++++++++++++++++++----------------- src/i18n/strings/eu.json | 9 +---- src/i18n/strings/fr.json | 8 ----- src/i18n/strings/hu.json | 10 +----- src/i18n/strings/it.json | 3 -- src/i18n/strings/ru.json | 4 --- src/i18n/strings/sv.json | 2 -- src/i18n/strings/zh_Hant.json | 5 +-- 9 files changed, 37 insertions(+), 73 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 4892b91b48..c2b1e56cc6 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -1168,8 +1168,5 @@ "Collapse Reply Thread": "Antwort-Thread zusammenklappen", "At this time it is not possible to reply with an emote.": "An dieser Stelle ist es nicht möglich mit einer Umschreibung zu antworten.", "Enable widget screenshots on supported widgets": "Widget-Screenshots bei unterstützten Widgets aktivieren", - "Send analytics data": "Analysedaten senden", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden. (Siehe unsere Datenschutzerklärung).", - "Help improve Riot by sending usage data? This will use a cookie.": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden.", - "Yes please": "Ja, bitte" + "Send analytics data": "Analysedaten senden" } diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index bf9e395bee..bfe1b562bc 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -42,6 +42,10 @@ "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload", "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads", "Upload Failed": "Upload Failed", + "Failure to create room": "Failure to create room", + "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.", + "Send anyway": "Send anyway", + "Send": "Send", "Sun": "Sun", "Mon": "Mon", "Tue": "Tue", @@ -81,6 +85,7 @@ "Failed to invite users to community": "Failed to invite users to community", "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s", "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:", + "Unnamed Room": "Unnamed Room", "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings", "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again", "Unable to enable Notifications": "Unable to enable Notifications", @@ -104,7 +109,6 @@ "You need to be logged in.": "You need to be logged in.", "You need to be able to invite users to do that.": "You need to be able to invite users to do that.", "Unable to create widget.": "Unable to create widget.", - "Reload widget": "Reload widget", "Missing roomId.": "Missing roomId.", "Failed to send request.": "Failed to send request.", "This room is not recognised.": "This room is not recognised.", @@ -180,11 +184,6 @@ "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing", "%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing", "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing", - "Failure to create room": "Failure to create room", - "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.", - "Send anyway": "Send anyway", - "Send": "Send", - "Unnamed Room": "Unnamed Room", "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions", "Not a valid Riot keyfile": "Not a valid Riot keyfile", "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?", @@ -298,6 +297,29 @@ "Off": "Off", "On": "On", "Noisy": "Noisy", + "Invalid alias format": "Invalid alias format", + "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias", + "Invalid address format": "Invalid address format", + "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address", + "not specified": "not specified", + "not set": "not set", + "Remote addresses for this room:": "Remote addresses for this room:", + "Addresses": "Addresses", + "The main address for this room is": "The main address for this room is", + "Local addresses for this room:": "Local addresses for this room:", + "This room has no local addresses": "This room has no local addresses", + "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)", + "Invalid community ID": "Invalid community ID", + "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID", + "Flair": "Flair", + "Showing flair for these communities:": "Showing flair for these communities:", + "This room is not showing flair for any communities": "This room is not showing flair for any communities", + "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)", + "You have enabled URL previews by default.": "You have enabled URL previews by default.", + "You have disabled URL previews by default.": "You have disabled URL previews by default.", + "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.", + "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.", + "URL Previews": "URL Previews", "Cannot add any more widgets": "Cannot add any more widgets", "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.", "Add a widget": "Add a widget", @@ -394,11 +416,11 @@ "numbullet": "numbullet", "Markdown is disabled": "Markdown is disabled", "Markdown is enabled": "Markdown is enabled", - "Unpin Message": "Unpin Message", - "Jump to message": "Jump to message", "No pinned messages.": "No pinned messages.", "Loading...": "Loading...", "Pinned Messages": "Pinned Messages", + "Unpin Message": "Unpin Message", + "Jump to message": "Jump to message", "%(duration)ss": "%(duration)ss", "%(duration)sm": "%(duration)sm", "%(duration)sh": "%(duration)sh", @@ -530,29 +552,6 @@ "Scroll to unread messages": "Scroll to unread messages", "Jump to first unread message.": "Jump to first unread message.", "Close": "Close", - "Invalid alias format": "Invalid alias format", - "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias", - "Invalid address format": "Invalid address format", - "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address", - "not specified": "not specified", - "not set": "not set", - "Remote addresses for this room:": "Remote addresses for this room:", - "Addresses": "Addresses", - "The main address for this room is": "The main address for this room is", - "Local addresses for this room:": "Local addresses for this room:", - "This room has no local addresses": "This room has no local addresses", - "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)", - "Invalid community ID": "Invalid community ID", - "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID", - "Flair": "Flair", - "Showing flair for these communities:": "Showing flair for these communities:", - "This room is not showing flair for any communities": "This room is not showing flair for any communities", - "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)", - "You have enabled URL previews by default.": "You have enabled URL previews by default.", - "You have disabled URL previews by default.": "You have disabled URL previews by default.", - "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.", - "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.", - "URL Previews": "URL Previews", "Sunday": "Sunday", "Monday": "Monday", "Tuesday": "Tuesday", @@ -663,6 +662,7 @@ "Delete widget": "Delete widget", "Revoke widget access": "Revoke widget access", "Minimize apps": "Minimize apps", + "Reload widget": "Reload widget", "Popout widget": "Popout widget", "Picture": "Picture", "Edit": "Edit", @@ -1076,9 +1076,11 @@ "No media permissions": "No media permissions", "You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam", "Missing Media Permissions, click here to request.": "Missing Media Permissions, click here to request.", + "No Audio Outputs detected": "No Audio Outputs detected", "No Microphones detected": "No Microphones detected", "No Webcams detected": "No Webcams detected", "Default Device": "Default Device", + "Audio Output": "Audio Output", "Microphone": "Microphone", "Camera": "Camera", "VoIP": "VoIP", diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index 04d2e86664..be67127955 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -1170,18 +1170,11 @@ "Enable widget screenshots on supported widgets": "Gaitu trepeten pantaila-argazkiak onartzen duten trepetetan", "Send analytics data": "Bidali datu analitikoak", "Muted Users": "Mutututako erabiltzaileak", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du. (Ikusi gure Cookie eta pribatutasun politikak).", - "Help improve Riot by sending usage data? This will use a cookie.": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du.", - "Yes please": "Bai mesedez", "Warning: This widget might use cookies.": "Abisua: Trepeta honek cookie-ak erabili litzake.", "Terms and Conditions": "Termino eta baldintzak", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)s hasiera-zerbitzaria erabiltzen jarraitzeko gure termino eta baldintzak irakurri eta onartu behar dituzu.", "Review terms and conditions": "Irakurri termino eta baldintzak", "Failed to indicate account erasure": "Ezin izan da kontuaren ezabaketa jakinarazi", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Honek zure kontua betiko erabilgaitz bihurtuko du. Ezin izango duzu saioa hasi, eta beste inork ezin izango du erabiltzaile ID bera erabili. Ez dago ekintza hau desegiterik.", - "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "Zure kontua desaktibatzean ez dira lehenetsita zuk bidalitako mezuak ezabatuko. Zuk bidalitako mezuak ezabatu nahi badituzu, markatu beheko kutxa.", - "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna, e-mail mezuen antzekoa da. Zure mezuak ezabatzeak esan nahi du bidali dituzun mezuak ez direla erabiltzaile berriekin partekatuko, baina aurretik zure mezuak jaso dituzten erabiltzaile erregistratuek bere kopia izango dute.", "To continue, please enter your password:": "Jarraitzeko, sartu zure pasahitza:", - "password": "pasahitza", - "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Ezabatu bidali ditudan mezu guztiak nire kontua desaktibatzean. (Abisua: Etorkizuneko erabiltzaileek elkarrizketa partzialak ikusiko dituzte, esperientzia kaskarra sortuz)." + "password": "pasahitza" } diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index dc36520506..5c14373d7e 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -1169,25 +1169,17 @@ "Collapse Reply Thread": "Dévoiler le fil de réponse", "Enable widget screenshots on supported widgets": "Activer les captures d'écran des widgets pris en charge", "Send analytics data": "Envoyer les données analytiques", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie. (Voir nos politiques de cookie et de confidentialité).", - "Help improve Riot by sending usage data? This will use a cookie.": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie.", - "Yes please": "Oui, s'il vous plaît", "Muted Users": "Utilisateurs ignorés", "Warning: This widget might use cookies.": "Avertissement : ce widget utilise peut-être des cookies.", "Terms and Conditions": "Conditions générales", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Pour continuer à utiliser le serveur d'accueil %(homeserverDomain)s, vous devez lire et accepter nos conditions générales.", "Review terms and conditions": "Voir les conditions générales", "Failed to indicate account erasure": "Échec de notification de la suppression du compte", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Cela rendra votre compte inutilisable de façon permanente. Vous ne pourrez plus vous connecter et ne pourrez plus vous enregistrer avec le même identifiant d'utilisateur. Cette action est irréversible.", - "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "Désactiver votre compte ne supprime pas les messages que vous avez envoyés par défaut. Si vous souhaitez supprimer vos messages, cochez la case ci-dessous.", - "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Supprimer vos messages signifie que les messages que vous avez envoyés ne seront pas partagés avec de nouveaux utilisateurs ou les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à vos messages continueront d'en avoir une copie.", "To continue, please enter your password:": "Pour continuer, veuillez renseigner votre mot de passe :", "password": "mot de passe", - "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Veuillez supprimer tous les messages que j'ai envoyé quand mon compte est désactivé. (Attention : les futurs utilisateurs verront alors des conversations incomplètes, ce qui est une mauvaise expérience).", "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous reconnecter et personne ne pourra se réenregistrer avec le même identifiant d'utilisateur. Votre compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d'identité. Cette action est irréversible.", "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "La désactivation du compte ne nous fait pas oublier les messages que vous avez envoyés par défaut. Si vous souhaitez que nous les oubliions, cochez la case ci-dessous.", "e.g. %(exampleValue)s": "par ex. %(exampleValue)s", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Cela utilisera un cookie. (Voir nos politiques de cookie et de confidentialité).", "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.", "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (Avertissement : les futurs utilisateurs verront des conversations incomplètes)" } diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index f2aaac9a81..b45cdd3311 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1169,25 +1169,17 @@ "Collapse Reply Thread": "Beszélgetés szál becsukása", "Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott ott képernyőkép készítés engedélyezése", "Send analytics data": "Analitikai adatok küldése", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ. (Nézd meg a sütikről és titoktartási irányelvekről szóló leírást).", - "Help improve Riot by sending usage data? This will use a cookie.": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ.", - "Yes please": "Igen, kérlek", "Muted Users": "Elnémított felhasználók", "Warning: This widget might use cookies.": "Figyelmeztetés: Ez a kisalkalmazás sütiket (cookies) használhat.", "Terms and Conditions": "Általános Szerződési Feltételek", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "A %(homeserverDomain)s szerver használatának folytatásához el kell olvasnod és el kell fogadnod az általános szerződési feltételeket.", "Review terms and conditions": "Általános Szerződési Feltételek elolvasása", "Failed to indicate account erasure": "A fiók törlésének jelzése sikertelen", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Ezzel a felhasználói fiókod végleg használhatatlanná válik. Nem tudsz bejelentkezni, és senki más sem fog tudni újra regisztrálni ugyanezzel az azonosítóval. Ez a művelet visszafordíthatatlan.", - "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "A felhasználói fiók felfüggesztése alapértelmezetten nem töröli semelyik általad küldött üzenetet. Ha az elküldött üzeneteidet törölni szeretnéd pipáld be a jelölőnégyzetet alul.", - "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban olyan mint az e-mail. Az üzeneted törlése azt jelenti, hogy amit elküldtél már nem lesz megosztva új- vagy vendég felhasználóval, de azok a regisztrált felhasználók akik már látták az üzenetet továbbra is hozzáférnek a saját példányukhoz.", "To continue, please enter your password:": "Folytatáshoz add meg a jelszavad:", "password": "jelszó", - "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Töröld az összes üzenetet amit küldtem amikor felfüggeszted a felhasználói fiókomat. (Figyelem: ezzel a jövőbeni felhasználók csak részleges beszélgetést láthatnak majd, ami rosszul eshet).", "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Ez végleg használhatatlanná teszi a fiókodat. Ezután nem fogsz tudni bejelentkezni, és más sem tud majd ezzel az azonosítóval fiókot létrehozni. Minden szobából amibe beléptél ki fogsz lépni, és törölni fogja minden fiók adatod az \"identity\" szerverről. Ez a művelet visszafordíthatatlan.", "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "A fiókod felfüggesztése nem jelenti alapértelmezetten azt, hogy az általad küldött üzenetek elfelejtődnek. Ha törölni szeretnéd az általad küldött üzeneteket, pipáld be a jelölőnégyzetet alul.", "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban hasonlít az emailhez. Az általad küldött üzenet törlése azt jelenti, hogy nem osztjuk meg új-, vagy vendég felhasználóval de a már regisztrált felhasználók akik már hozzáfértek az üzenethez továbbra is elérik a saját másolatukat.", "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (Figyelem: ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)", - "e.g. %(exampleValue)s": "pl. %(exampleValue)s", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Segítesz jobbá tenni a Riotot használati adat küldésével? Ez sütit (cookie) fog használni. (Nézd meg az Általános Szerződési Feltételeket)." + "e.g. %(exampleValue)s": "pl. %(exampleValue)s" } diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index 068ad01ff1..ab251bdf6f 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -1159,9 +1159,6 @@ "Refresh": "Aggiorna", "We encountered an error trying to restore your previous session.": "Abbiamo riscontrato un errore tentando di ripristinare la tua sessione precedente.", "Send analytics data": "Invia dati statistici", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie. (Vedi la nostra politica sui cookie e sulla privacy).", - "Help improve Riot by sending usage data? This will use a cookie.": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie.", - "Yes please": "Sì grazie", "Clear Storage and Sign Out": "Elimina lo storage e disconnetti", "Send Logs": "Invia i log", "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Eliminare lo storage del browser potrebbe risolvere il problema, ma verrai disconnesso e la cronologia delle chat criptate sarà illeggibile.", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index e2529ed1bc..956f4fc41b 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -1167,16 +1167,12 @@ "Enable widget screenshots on supported widgets": "Включить скриншоты виджета в поддерживаемых виджетах", "Collapse Reply Thread": "Ответить с цитированием", "Send analytics data": "Отправить данные аналитики", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie. (См. наши политики cookie и конфиденциальности).", - "Help improve Riot by sending usage data? This will use a cookie.": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie.", - "Yes please": "Да, пожалуйста", "Muted Users": "Приглушенные пользователи", "Warning: This widget might use cookies.": "Внимание: этот виджет может использовать cookie.", "Terms and Conditions": "Условия и положения", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Для продолжения использования сервера %(homeserverDomain)s вы должны ознакомиться и принять условия и положения.", "Review terms and conditions": "Просмотр условий и положений", "e.g. %(exampleValue)s": "напр. %(exampleValue)s", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Помогите улучшить Riot, отправляя данные использования? Будут использоваться файлы cookie. (Смотрите наши политики cookie и конфиденциальности).", "Failed to indicate account erasure": "Не удается удалить учетную запись", "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Это навсегда сделает вашу учетную запись невозможной для использования. Вы не сможете войти в систему, и никто не сможет перерегистрировать тот же идентификатор пользователя. Это приведет к тому, что ваша учетная запись выйдет из всех комнат, в которые она входит, и будут удалены данные вашей учетной записи с сервера идентификации. Это действие необратимо.", "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "По умолчанию деактивация вашей учетной записи не приведет к удалению всех ваших сообщений. Если вы хотите, чтобы мы удалили ваши сообщения, поставьте отметку в поле ниже.", diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index 0f898a3374..791c6e3165 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -901,8 +901,6 @@ "This setting cannot be changed later!": "Den här inställningen kan inte ändras senare!", "Unknown error": "Okänt fel", "Incorrect password": "Felaktigt lösenord", - "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Detta kommer att göra ditt konto permanent oanvändbart. Du kommer inte att kunna registrera samma användar-ID igen.", - "This action is irreversible.": "Denna åtgärd går inte att ångra.", "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "För att verifiera att denna enhet kan litas på, vänligen kontakta ägaren på annat sätt (t ex personligen eller med ett telefonsamtal) och fråga om nyckeln ägaren har i sina användarinställningar för enheten matchar nyckeln nedan:", "Device name": "Enhetsnamn", "Device key": "Enhetsnyckel", diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 6ceda34507..fd72511f8c 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -1169,8 +1169,5 @@ "Collapse Reply Thread": "摺疊回覆討論串", "Enable widget screenshots on supported widgets": "在支援的小工具上啟用小工具螢幕快照", "Send analytics data": "傳送分析資料", - "Muted Users": "已靜音的使用者", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。（參見我們的 cookie 與隱私政策）。", - "Help improve Riot by sending usage data? This will use a cookie.": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。", - "Yes please": "好的，請" + "Muted Users": "已靜音的使用者" } From ed9e4d82c9d476ba7146379428357db35813b9d4 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Sat, 26 May 2018 18:16:05 -0600 Subject: [PATCH 017/283] Reduce the text size on the 'Jump to pinned message' button Fixes https://github.com/vector-im/riot-web/issues/6329 Signed-off-by: Travis Ralston --- res/css/views/rooms/_PinnedEventTile.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/views/rooms/_PinnedEventTile.scss b/res/css/views/rooms/_PinnedEventTile.scss index ca790ef8f0..8354df0537 100644 --- a/res/css/views/rooms/_PinnedEventTile.scss +++ b/res/css/views/rooms/_PinnedEventTile.scss @@ -63,5 +63,5 @@ limitations under the License. .mx_PinnedEventTile_gotoButton { display: inline-block; - font-size: 0.8em; + font-size: 0.7em; // Smaller text to avoid conflicting with the layout } From 62f4cfe734cc7a0f63bceb601a5c9f7d68677ba2 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Sat, 26 May 2018 18:21:24 -0600 Subject: [PATCH 018/283] Don't affect avatars in pinned message contents This uses more direct classes to avoid affecting pills. Fixes https://github.com/vector-im/riot-web/issues/5438 Signed-off-by: Travis Ralston --- res/css/views/rooms/_PinnedEventTile.scss | 2 +- src/components/views/rooms/PinnedEventTile.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/res/css/views/rooms/_PinnedEventTile.scss b/res/css/views/rooms/_PinnedEventTile.scss index 8354df0537..be6acdf524 100644 --- a/res/css/views/rooms/_PinnedEventTile.scss +++ b/res/css/views/rooms/_PinnedEventTile.scss @@ -40,7 +40,7 @@ limitations under the License. left: 0; } -.mx_PinnedEventTile .mx_BaseAvatar { +.mx_PinnedEventTile .mx_PinnedEventTile_senderAvatar .mx_BaseAvatar { float: left; margin-right: 10px; } diff --git a/src/components/views/rooms/PinnedEventTile.js b/src/components/views/rooms/PinnedEventTile.js index b63fdde0a8..91d656d60b 100644 --- a/src/components/views/rooms/PinnedEventTile.js +++ b/src/components/views/rooms/PinnedEventTile.js @@ -80,7 +80,9 @@ module.exports = React.createClass({ { unpinButton }
- + + + { sender.name } From 033c41a2a81cf4436309024898abd6e796aaec12 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Sat, 26 May 2018 18:40:48 -0600 Subject: [PATCH 019/283] Align pinned message contents and reduce image size Fixes https://github.com/vector-im/riot-web/issues/5421 Signed-off-by: Travis Ralston --- res/css/views/rooms/_PinnedEventTile.scss | 14 +++++++------- src/components/views/messages/MImageBody.js | 8 ++++++-- src/components/views/messages/MessageEvent.js | 6 +++++- src/components/views/rooms/PinnedEventTile.js | 6 +++++- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/res/css/views/rooms/_PinnedEventTile.scss b/res/css/views/rooms/_PinnedEventTile.scss index be6acdf524..fa76f4c679 100644 --- a/res/css/views/rooms/_PinnedEventTile.scss +++ b/res/css/views/rooms/_PinnedEventTile.scss @@ -33,13 +33,6 @@ limitations under the License. padding-bottom: 3px; } -.mx_PinnedEventTile .mx_EventTile_content { - margin-left: 50px; - position: relative; - top: 0; - left: 0; -} - .mx_PinnedEventTile .mx_PinnedEventTile_senderAvatar .mx_BaseAvatar { float: left; margin-right: 10px; @@ -65,3 +58,10 @@ limitations under the License. display: inline-block; font-size: 0.7em; // Smaller text to avoid conflicting with the layout } + +.mx_PinnedEventTile_message { + margin-left: 50px; + position: relative; + top: 0; + left: 0; +} \ No newline at end of file diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index 8045d43104..4dfd89ec0a 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -40,6 +40,9 @@ export default class extends React.Component { /* called when the image has loaded */ onWidgetLoad: PropTypes.func.isRequired, + + /* the maximum image height to use */ + maxImageHeight: PropTypes.number, } static contextTypes = { @@ -249,8 +252,9 @@ export default class extends React.Component { const content = this.props.mxEvent.getContent(); const timelineWidth = this.refs.body.offsetWidth; - const maxHeight = 600; // let images take up as much width as they can so long as the height doesn't exceed 600px. - // the alternative here would be 600*timelineWidth/800; to scale them down to fit inside a 4:3 bounding box + const maxHeight = this.props.maxImageHeight || 600; // let images take up as much width as they can so long + // as the height doesn't exceed 600px. The alternative here would be 600*timelineWidth/800; to scale them down + // to fit inside a 4:3 bounding box // FIXME: this will break on clientside generated thumbnails (as per e2e rooms) // which may well be much smaller than the 800x600 bounding box. diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js index 7358e297c7..38f55c9d70 100644 --- a/src/components/views/messages/MessageEvent.js +++ b/src/components/views/messages/MessageEvent.js @@ -39,8 +39,11 @@ module.exports = React.createClass({ /* callback called when dynamic content in events are loaded */ onWidgetLoad: PropTypes.func, - /* the shsape of the tile, used */ + /* the shape of the tile, used */ tileShape: PropTypes.string, + + /* the maximum image height to use, if the event is an image */ + maxImageHeight: PropTypes.number, }, getEventTileOps: function() { @@ -78,6 +81,7 @@ module.exports = React.createClass({ highlightLink={this.props.highlightLink} showUrlPreview={this.props.showUrlPreview} tileShape={this.props.tileShape} + maxImageHeight={this.props.maxImageHeight} onWidgetLoad={this.props.onWidgetLoad} />; }, }); diff --git a/src/components/views/rooms/PinnedEventTile.js b/src/components/views/rooms/PinnedEventTile.js index 91d656d60b..478454a3d8 100644 --- a/src/components/views/rooms/PinnedEventTile.js +++ b/src/components/views/rooms/PinnedEventTile.js @@ -86,7 +86,11 @@ module.exports = React.createClass({ { sender.name } - +
+ {}} // we need to give this, apparently + /> +
); }, From 53396ff38dcac527605d327f5b4123c4a8884727 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Sat, 26 May 2018 19:42:09 -0600 Subject: [PATCH 020/283] Show timestamp of pinned messages on hover Addresses part of https://github.com/vector-im/riot-web/issues/5405 Signed-off-by: Travis Ralston --- res/css/views/rooms/_PinnedEventTile.scss | 14 ++++++++++++-- src/components/views/rooms/PinnedEventTile.js | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/res/css/views/rooms/_PinnedEventTile.scss b/res/css/views/rooms/_PinnedEventTile.scss index fa76f4c679..f7417272b6 100644 --- a/res/css/views/rooms/_PinnedEventTile.scss +++ b/res/css/views/rooms/_PinnedEventTile.scss @@ -25,19 +25,29 @@ limitations under the License. background-color: $event-selected-color; } -.mx_PinnedEventTile .mx_PinnedEventTile_sender { +.mx_PinnedEventTile .mx_PinnedEventTile_sender, +.mx_PinnedEventTile .mx_PinnedEventTile_timestamp { color: #868686; font-size: 0.8em; vertical-align: top; - display: block; + display: inline-block; padding-bottom: 3px; } +.mx_PinnedEventTile .mx_PinnedEventTile_timestamp { + padding-left: 15px; + display: none; +} + .mx_PinnedEventTile .mx_PinnedEventTile_senderAvatar .mx_BaseAvatar { float: left; margin-right: 10px; } +.mx_PinnedEventTile:hover .mx_PinnedEventTile_timestamp { + display: inline-block; +} + .mx_PinnedEventTile:hover .mx_PinnedEventTile_actions { display: block; } diff --git a/src/components/views/rooms/PinnedEventTile.js b/src/components/views/rooms/PinnedEventTile.js index 478454a3d8..d0572e489a 100644 --- a/src/components/views/rooms/PinnedEventTile.js +++ b/src/components/views/rooms/PinnedEventTile.js @@ -22,6 +22,7 @@ import AccessibleButton from "../elements/AccessibleButton"; import MessageEvent from "../messages/MessageEvent"; import MemberAvatar from "../avatars/MemberAvatar"; import { _t } from '../../../languageHandler'; +import {formatFullDate} from '../../../DateUtils'; module.exports = React.createClass({ displayName: 'PinnedEventTile', @@ -86,6 +87,9 @@ module.exports = React.createClass({ { sender.name } + + { formatFullDate(new Date(this.props.mxEvent.getTs())) } +
{}} // we need to give this, apparently From 752605429cd8072aa59ec145d31e3d33a2f4c596 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Sat, 26 May 2018 19:32:23 -0600 Subject: [PATCH 021/283] Persist pinned message open-ness between room switches Addresses part of https://github.com/vector-im/riot-web/issues/5405 Signed-off-by: Travis Ralston --- src/components/structures/RoomView.js | 9 +++++++-- src/settings/Settings.js | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index c5f6a75cc5..eae621b722 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -44,7 +44,7 @@ import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard'; import RoomViewStore from '../../stores/RoomViewStore'; import RoomScrollStateStore from '../../stores/RoomScrollStateStore'; -import SettingsStore from "../../settings/SettingsStore"; +import SettingsStore, {SettingLevel} from "../../settings/SettingsStore"; const DEBUG = false; let debuglog = function() {}; @@ -115,6 +115,7 @@ module.exports = React.createClass({ showApps: false, isAlone: false, isPeeking: false, + showingPinned: false, // error object, as from the matrix client/server API // If we failed to load information about the room, @@ -182,6 +183,7 @@ module.exports = React.createClass({ isInitialEventHighlighted: RoomViewStore.isInitialEventHighlighted(), forwardingEvent: RoomViewStore.getForwardingEvent(), shouldPeek: RoomViewStore.shouldPeek(), + showingPinned: SettingsStore.getValue("PinnedEvents.isOpen", RoomViewStore.getRoomId()), }; // Temporary logging to diagnose https://github.com/vector-im/riot-web/issues/4307 @@ -1135,7 +1137,10 @@ module.exports = React.createClass({ }, onPinnedClick: function() { - this.setState({showingPinned: !this.state.showingPinned, searching: false}); + const nowShowingPinned = !this.state.showingPinned; + const roomId = this.state.room.roomId; + this.setState({showingPinned: nowShowingPinned, searching: false}); + SettingsStore.setValue("PinnedEvents.isOpen", roomId, SettingLevel.ROOM_DEVICE, nowShowingPinned); }, onSettingsClick: function() { diff --git a/src/settings/Settings.js b/src/settings/Settings.js index b1bc4161fd..456665aeb8 100644 --- a/src/settings/Settings.js +++ b/src/settings/Settings.js @@ -274,4 +274,8 @@ export const SETTINGS = { displayName: _td('Enable widget screenshots on supported widgets'), default: false, }, + "PinnedEvents.isOpen": { + supportedLevels: ['room-device'], + default: false, + }, }; From e690bcb6efd58ecb85f2373949d840794bc1ab48 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Sat, 26 May 2018 20:54:19 -0600 Subject: [PATCH 022/283] Replace "Login as guest" with "Try the app first" on login page Fixes vector-im/riot-web#5875 Signed-off-by: Travis Ralston --- src/components/structures/login/Login.js | 2 +- src/i18n/strings/bg.json | 1 - src/i18n/strings/ca.json | 1 - src/i18n/strings/cs.json | 1 - src/i18n/strings/da.json | 1 - src/i18n/strings/de_DE.json | 1 - src/i18n/strings/el.json | 1 - src/i18n/strings/en_EN.json | 2 +- src/i18n/strings/en_US.json | 1 - src/i18n/strings/eo.json | 1 - src/i18n/strings/es.json | 1 - src/i18n/strings/eu.json | 1 - src/i18n/strings/fi.json | 1 - src/i18n/strings/fr.json | 1 - src/i18n/strings/gl.json | 1 - src/i18n/strings/hu.json | 1 - src/i18n/strings/id.json | 1 - src/i18n/strings/it.json | 1 - src/i18n/strings/ko.json | 1 - src/i18n/strings/lv.json | 1 - src/i18n/strings/nl.json | 1 - src/i18n/strings/pl.json | 1 - src/i18n/strings/pt.json | 1 - src/i18n/strings/pt_BR.json | 1 - src/i18n/strings/ru.json | 1 - src/i18n/strings/sk.json | 1 - src/i18n/strings/sr.json | 1 - src/i18n/strings/sv.json | 1 - src/i18n/strings/th.json | 1 - src/i18n/strings/tr.json | 1 - src/i18n/strings/zh_Hans.json | 1 - src/i18n/strings/zh_Hant.json | 1 - 32 files changed, 2 insertions(+), 32 deletions(-) diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js index 7f4aa0325a..1332f52f97 100644 --- a/src/components/structures/login/Login.js +++ b/src/components/structures/login/Login.js @@ -399,7 +399,7 @@ module.exports = React.createClass({ if (this.props.enableGuest) { loginAsGuestJsx = - { _t('Login as guest') } + { _t('Try the app first') } ; } diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json index 4911ad970e..2a7696f872 100644 --- a/src/i18n/strings/bg.json +++ b/src/i18n/strings/bg.json @@ -888,7 +888,6 @@ "This homeserver doesn't offer any login flows which are supported by this client.": "Този Home сървър не предлага методи за влизане, които се поддържат от този клиент.", "Error: Problem communicating with the given homeserver.": "Грешка: Проблем при комуникацията с дадения Home сървър.", "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Не е възможно свързване към Home сървъра чрез HTTP, когато има HTTPS адрес в лентата на браузъра Ви. Или използвайте HTTPS или включете функция небезопасни скриптове.", - "Login as guest": "Влез като гост", "Sign in to get started": "Влезте в профила си, за да започнете", "Set a display name:": "Задаване на име:", "Upload an avatar:": "Качване на профилна снимка:", diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json index 407b9f61d4..ab4e803342 100644 --- a/src/i18n/strings/ca.json +++ b/src/i18n/strings/ca.json @@ -579,7 +579,6 @@ "%(nameList)s %(transitionList)s": "%(transitionList)s%(nameList)s", "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s han entrat", "Guest access is disabled on this Home Server.": "L'accés a usuaris d'altres xarxes no està permès en aquest servidor.", - "Login as guest": "Inicia sessió com a convidat", "Unblacklist": "Treure de la llista negre", "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s s'ha unit", "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s han sortit", diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json index 33c7a3d5f1..441e16e2c3 100644 --- a/src/i18n/strings/cs.json +++ b/src/i18n/strings/cs.json @@ -239,7 +239,6 @@ "Level:": "Úroveň:", "Local addresses for this room:": "Místní adresy této místnosti:", "Logged in as:": "Přihlášen/a jako:", - "Login as guest": "Přihlášen/a jako host", "matrix-react-sdk version:": "Verze matrix-react-sdk:", "Mobile phone number": "Číslo mobilního telefonu", "Mobile phone number (optional)": "Číslo mobilního telefonu (nepovinné)", diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json index 2a59530d5a..e10534d7f1 100644 --- a/src/i18n/strings/da.json +++ b/src/i18n/strings/da.json @@ -39,7 +39,6 @@ "Searches DuckDuckGo for results": "Søger DuckDuckGo for resultater", "Commands": "kommandoer", "Emoji": "Emoji", - "Login as guest": "Log ind som gæst", "Sign in": "Log ind", "Warning!": "Advarsel!", "Account": "Konto", diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 4892b91b48..16ca9462b3 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -40,7 +40,6 @@ "Searches DuckDuckGo for results": "Verwendet DuckDuckGo für Suchergebnisse", "Commands": "Kommandos", "Emoji": "Emoji", - "Login as guest": "Als Gast anmelden", "Sign in": "Anmelden", "Warning!": "Warnung!", "Error": "Fehler", diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index fabd88c74a..929ca5e7df 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -142,7 +142,6 @@ "%(targetName)s left the room.": "Ο χρήστης %(targetName)s έφυγε από το δωμάτιο.", "Local addresses for this room:": "Τοπική διεύθυνση για το δωμάτιο:", "Logged in as:": "Συνδεθήκατε ως:", - "Login as guest": "Σύνδεση ως επισκέπτης", "Logout": "Αποσύνδεση", "Low priority": "Χαμηλής προτεραιότητας", "matrix-react-sdk version:": "Έκδοση matrix-react-sdk:", diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index bf9e395bee..8e068d5651 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1120,7 +1120,7 @@ "Error: Problem communicating with the given homeserver.": "Error: Problem communicating with the given homeserver.", "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.", "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.", - "Login as guest": "Login as guest", + "Try the app first": "Try the app first", "Sign in to get started": "Sign in to get started", "Failed to fetch avatar URL": "Failed to fetch avatar URL", "Set a display name:": "Set a display name:", diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json index 43e2041020..2a1b97b536 100644 --- a/src/i18n/strings/en_US.json +++ b/src/i18n/strings/en_US.json @@ -209,7 +209,6 @@ "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?", "Local addresses for this room:": "Local addresses for this room:", "Logged in as:": "Logged in as:", - "Login as guest": "Login as guest", "Logout": "Logout", "Low priority": "Low priority", "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s made future room history visible to all room members, from the point they are invited.", diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json index 68645ffd9c..f48d10fa9f 100644 --- a/src/i18n/strings/eo.json +++ b/src/i18n/strings/eo.json @@ -862,7 +862,6 @@ "Error: Problem communicating with the given homeserver.": "Eraro: Estas problemo en komunikado kun la hejmservilo.", "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Hejmservilo ne alkonekteblas per HTTP kun HTTPS URL en via adresbreto. Aŭ uzu HTTPS aŭ ŝaltu malsekurajn skriptojn.", "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Ne eblas konekti al hejmservilo – bonvolu kontroli vian konekton, certigi ke la SSL-atestilo de via hejmservilo estas fidata, kaj ke neniu foliumila kromprogramo baras petojn.", - "Login as guest": "Saluti kiel gasto", "Sign in to get started": "Komencu per saluto", "Failed to fetch avatar URL": "Malsukcesis venigi adreson de profilbildo", "Set a display name:": "Agordi vidigan nomon:", diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index 8e7925ba36..5180461828 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -166,7 +166,6 @@ "%(targetName)s left the room.": "%(targetName)s ha dejado la sala.", "Local addresses for this room:": "Direcciones locales para esta sala:", "Logged in as:": "Sesión iniciada como:", - "Login as guest": "Iniciar sesión como invitado", "Logout": "Cerrar Sesión", "Low priority": "Baja prioridad", "Accept": "Aceptar", diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index 04d2e86664..9c9e5a7589 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -298,7 +298,6 @@ "Level:": "Maila:", "Local addresses for this room:": "Gela honen tokiko helbideak:", "Logged in as:": "Saioa hasteko erabiltzailea:", - "Login as guest": "Hasi saioa bisitari gisa", "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, gonbidapena egiten zaienetik.", "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, elkartzen direnetik.", "%(senderName)s made future room history visible to all room members.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat.", diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json index e5787ab561..b96dbafa14 100644 --- a/src/i18n/strings/fi.json +++ b/src/i18n/strings/fi.json @@ -198,7 +198,6 @@ "Level:": "Taso:", "Local addresses for this room:": "Tämän huoneen paikalliset osoitteet:", "Logged in as:": "Kirjautunut käyttäjänä:", - "Login as guest": "Kirjaudu vieraana", "Logout": "Kirjaudu ulos", "Low priority": "Alhainen prioriteetti", "Manage Integrations": "Hallinoi integraatioita", diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index dc36520506..5194dc21e7 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -166,7 +166,6 @@ "%(targetName)s left the room.": "%(targetName)s a quitté le salon.", "Local addresses for this room:": "Adresses locales pour ce salon :", "Logged in as:": "Identifié en tant que :", - "Login as guest": "Se connecter en tant que visiteur", "Logout": "Se déconnecter", "Low priority": "Priorité basse", "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s a rendu l'historique visible à tous les membres du salon, depuis le moment où ils ont été invités.", diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index fdab066031..fc1adfc478 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -879,7 +879,6 @@ "Error: Problem communicating with the given homeserver.": "Fallo: problema ao comunicarse con servidor proporcionado.", "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Non se pode conectar ao servidor vía HTTP cando na barra de enderezos do navegador está HTTPS. Utilice HTTPS ou active scripts non seguros.", "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Non se conectou ao servidor - por favor comprobe a conexión, asegúrese de o certificado SSL do servidor é de confianza, e que ningún engadido do navegador está bloqueando as peticións.", - "Login as guest": "Conexión como convidado", "Sign in to get started": "Conéctese para iniciar", "Failed to fetch avatar URL": "Fallo ao obter o URL do avatar", "Set a display name:": "Establecer nome público:", diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index f2aaac9a81..6012e857f5 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -238,7 +238,6 @@ "Level:": "Szint:", "Local addresses for this room:": "A szoba helyi címe:", "Logged in as:": "Bejelentkezve mint:", - "Login as guest": "Belépés vendégként", "Logout": "Kilép", "Low priority": "Alacsony prioritás", "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik minden résztvevő a szobában, amióta meg van hívva.", diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json index 9db1a4a99c..00d56e6074 100644 --- a/src/i18n/strings/id.json +++ b/src/i18n/strings/id.json @@ -62,7 +62,6 @@ "Sign in with": "Masuk dengan", "Leave room": "Meninggalkan ruang", "Level:": "Tingkat:", - "Login as guest": "Masuk sebagai tamu", "Logout": "Keluar", "Low priority": "Prioritas rendah", "Markdown is disabled": "Markdown dinonaktifkan", diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index 068ad01ff1..5ba19d1622 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -909,7 +909,6 @@ "Error: Problem communicating with the given homeserver.": "Errore: problema di comunicazione con l'homeserver dato.", "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Impossibile connettersi all'homeserver via HTTP quando c'è un URL HTTPS nella barra del tuo browser. Usa HTTPS o attiva gli script non sicuri.", "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Impossibile connettersi all'homeserver - controlla la tua connessione, assicurati che il certificato SSL dell'homeserver sia fidato e che un'estensione del browser non stia bloccando le richieste.", - "Login as guest": "Accedi come ospite", "Sign in to get started": "Accedi per iniziare", "Failed to fetch avatar URL": "Ricezione URL dell'avatar fallita", "Set a display name:": "Imposta un nome visualizzato:", diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json index 4e0a988223..58333f23ad 100644 --- a/src/i18n/strings/ko.json +++ b/src/i18n/strings/ko.json @@ -240,7 +240,6 @@ "Level:": "등급:", "Local addresses for this room:": "이 방의 로컬 주소:", "Logged in as:": "로그인:", - "Login as guest": "손님으로 로그인", "Logout": "로그아웃", "Low priority": "낮은 우선순위", "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s님이 이후 방의 기록을 볼 수 있게 하셨어요 방 구성원 모두, 초대받은 시점부터.", diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json index 01e3ae5c6d..37cb6ec324 100644 --- a/src/i18n/strings/lv.json +++ b/src/i18n/strings/lv.json @@ -224,7 +224,6 @@ "Level:": "Līmenis:", "Local addresses for this room:": "Šīs istabas lokālās adreses:", "Logged in as:": "Pierakstījās kā:", - "Login as guest": "Pierakstīties kā viesim", "Logout": "Izrakstīties", "Low priority": "Zemas prioritātes", "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem no brīža, kad tie tika uzaicināti.", diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index 0df2cf1bd7..3e48fb9c3a 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -305,7 +305,6 @@ "Level:": "Niveau:", "Local addresses for this room:": "Lokale adressen voor deze ruimte:", "Logged in as:": "Ingelogd als:", - "Login as guest": "Als gast inloggen", "Logout": "Uitloggen", "Low priority": "Lage prioriteit", "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s heeft de toekomstige ruimtegeschiedenis zichtbaar gemaakt voor alle kamerleden, vanaf het moment dat ze uitgenodigt zijn.", diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json index d3dcb72f49..2ef30f7732 100644 --- a/src/i18n/strings/pl.json +++ b/src/i18n/strings/pl.json @@ -303,7 +303,6 @@ "Publish this room to the public in %(domain)s's room directory?": "Czy opublikować ten pokój dla ogółu w spisie pokojów domeny %(domain)s?", "Local addresses for this room:": "Lokalne adresy dla tego pokoju:", "Logged in as:": "Zalogowany jako:", - "Login as guest": "Zaloguj jako gość", "Logout": "Wyloguj", "Low priority": "Niski priorytet", "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich zaproszenia.", diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json index d165c6c057..9b1c599501 100644 --- a/src/i18n/strings/pt.json +++ b/src/i18n/strings/pt.json @@ -83,7 +83,6 @@ "Kicks user with given id": "Remove usuário com o identificador informado", "Labs": "Laboratório", "Leave room": "Sair da sala", - "Login as guest": "Entrar como visitante", "Logout": "Sair", "Low priority": "Baixa prioridade", "Manage Integrations": "Gerenciar integrações", diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index 0a4d847805..55a503dbe7 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -83,7 +83,6 @@ "Kicks user with given id": "Remove usuário com o identificador informado", "Labs": "Laboratório", "Leave room": "Sair da sala", - "Login as guest": "Entrar como visitante", "Logout": "Sair", "Low priority": "Baixa prioridade", "Manage Integrations": "Gerenciar integrações", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index e2529ed1bc..c93b9a2e3b 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -75,7 +75,6 @@ "Kicks user with given id": "Выкидывает пользователя с заданным ID", "Labs": "Лаборатория", "Leave room": "Покинуть комнату", - "Login as guest": "Войти как гость", "Logout": "Выйти", "Low priority": "Неважные", "Manage Integrations": "Управление интеграциями", diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json index c7f38cff35..b40ba8f750 100644 --- a/src/i18n/strings/sk.json +++ b/src/i18n/strings/sk.json @@ -822,7 +822,6 @@ "Error: Problem communicating with the given homeserver.": "Chyba: Nie je možné komunikovať so zadaným domovským serverom.", "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "K domovskému serveru nie je možné pripojiť sa použitím protokolu HTTP keďže v adresnom riadku prehliadača máte HTTPS adresu. Použite protokol HTTPS alebo povolte nezabezpečené skripty.", "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Nie je možné pripojiť sa k domovskému serveru - skontrolujte prosím funkčnosť vašeho pripojenia na internet, uistite sa že certifikát domovského servera je dôverihodný, a že žiaden doplnok nainštalovaný v prehliadači nemôže blokovať požiadavky.", - "Login as guest": "Prihlásiť sa ako hosť", "Failed to fetch avatar URL": "Nepodarilo sa získať URL adresu obrázka", "Set a display name:": "Nastaviť zobrazované meno:", "Upload an avatar:": "Nahrať obrázok:", diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json index ebacd28a5c..e73107376b 100644 --- a/src/i18n/strings/sr.json +++ b/src/i18n/strings/sr.json @@ -903,7 +903,6 @@ "Error: Problem communicating with the given homeserver.": "Грешка: проблем у комуницирању са датим кућним сервером.", "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Не могу да се повежем на кућни сервер преко HTTP-а када се користи HTTPS адреса у траци вашег прегледача. Или користите HTTPS или омогућите небезбедне скрипте.", "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Не могу да се повежем на кућни сервер. Проверите вашу интернет везу, постарајте се да верујете SSL сертификату кућног сервера и да проширење прегледача не блокира захтеве.", - "Login as guest": "Пријави се као гост", "Sign in to get started": "Пријави се да почнеш", "Failed to fetch avatar URL": "Нисам успео да добавим адресу аватара", "Set a display name:": "Постави приказно име:", diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index 0f898a3374..36c858247e 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -224,7 +224,6 @@ "Level:": "Nivå:", "Local addresses for this room:": "Lokala adresser för rummet:", "Logged in as:": "Inloggad som:", - "Login as guest": "Logga in som gäst", "Logout": "Logga ut", "Low priority": "Lågprioritet", "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar från att de bjöds in.", diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json index 6fa7febabd..f59ae4b53b 100644 --- a/src/i18n/strings/th.json +++ b/src/i18n/strings/th.json @@ -178,7 +178,6 @@ "Leave room": "ออกจากห้อง", "%(targetName)s left the room.": "%(targetName)s ออกจากห้องแล้ว", "Logged in as:": "เข้าสู่ระบบในชื่อ:", - "Login as guest": "เข้าสู่ระบบในฐานะแขก", "Logout": "ออกจากระบบ", "Markdown is disabled": "ปิดใช้งาน Markdown แล้ว", "Markdown is enabled": "เปิดใช้งาน Markdown แล้ว", diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index 797fed79ce..3fb790c0d6 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -224,7 +224,6 @@ "Level:": "Seviye :", "Local addresses for this room:": "Bu oda için yerel adresler :", "Logged in as:": "Olarak giriş yaptı :", - "Login as guest": "Misafir olarak giriş yaptı", "Logout": "Çıkış Yap", "Low priority": "Düşük öncelikli", "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri , davet edildiği noktadan.", diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json index 8e2dc6e0f8..cb39c1751b 100644 --- a/src/i18n/strings/zh_Hans.json +++ b/src/i18n/strings/zh_Hans.json @@ -153,7 +153,6 @@ "Jump to first unread message.": "跳到第一条未读消息。", "%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。.", "Leave room": "退出聊天室", - "Login as guest": "以游客的身份登录", "New password": "新密码", "Add a topic": "添加一个主题", "Admin": "管理员", diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 6ceda34507..bc5464d315 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -123,7 +123,6 @@ "Jump to first unread message.": "跳到第一則未讀訊息。", "%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。.", "Leave room": "離開聊天室", - "Login as guest": "以游客的身份登錄", "New password": "新密碼", "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "重設密碼目前會把所有裝置上的端到端加密金鑰重設，讓已加密的聊天歷史不可讀，除非您先匯出您的聊天室金鑰並在稍後重新匯入。這會在未來改進。", "Return to login screen": "返回到登入畫面", From 05357b9f8cef27502ff7ad09f6f9461c7b7685f1 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@googlemail.com> Date: Tue, 29 May 2018 12:07:56 +0100 Subject: [PATCH 023/283] improve comment --- src/components/structures/UserSettings.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js index 4ee4f1a427..d88a477932 100644 --- a/src/components/structures/UserSettings.js +++ b/src/components/structures/UserSettings.js @@ -287,6 +287,7 @@ module.exports = React.createClass({ _refreshMediaDevices: function(stream) { if (stream) { // kill stream so that we don't leave it lingering around with webcam enabled etc + // as here we called gUM to ask user for permission to their device names only stream.getTracks().forEach((track) => track.stop()); } From 881e9a8070ea368482a59895619cb0bc23f7b8d4 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Jun 2018 16:00:16 +0100 Subject: [PATCH 024/283] js-sdk rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 96c37a61c8..6722cfc3c3 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "linkifyjs": "^2.1.3", "lodash": "^4.13.1", "lolex": "2.3.2", - "matrix-js-sdk": "0.10.3", + "matrix-js-sdk": "0.10.4-rc.1", "optimist": "^0.6.1", "pako": "^1.0.5", "prop-types": "^15.5.8", From c8bf74350677f1b21e94dc1310437baa960b4eec Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Jun 2018 16:06:44 +0100 Subject: [PATCH 025/283] Prepare changelog for v0.12.7-rc.1 --- CHANGELOG.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1951875ee..ae8f535cb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +Changes in [0.12.7-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.7-rc.1) (2018-06-06) +=============================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.6...v0.12.7-rc.1) + + * Update from Weblate. + [\#1944](https://github.com/matrix-org/matrix-react-sdk/pull/1944) + * Import react as React in src/components/views/elements/DNDTagTile.js + [\#1943](https://github.com/matrix-org/matrix-react-sdk/pull/1943) + * Fix click on faded left/right/middle panel -> close settings + [\#1940](https://github.com/matrix-org/matrix-react-sdk/pull/1940) + * Add null-guard to support browsers that don't support performance + [\#1942](https://github.com/matrix-org/matrix-react-sdk/pull/1942) + * Support third party integration managers in AppPermission + [\#1455](https://github.com/matrix-org/matrix-react-sdk/pull/1455) + * Update pinned messages in real time + [\#1934](https://github.com/matrix-org/matrix-react-sdk/pull/1934) + * Expose at-room power level setting + [\#1938](https://github.com/matrix-org/matrix-react-sdk/pull/1938) + Changes in [0.12.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.6) (2018-05-25) ===================================================================================================== [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.6-rc.1...v0.12.6) From 4834816a0625e0215e5f6a2bf8ba660e5f261cf1 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Jun 2018 16:06:45 +0100 Subject: [PATCH 026/283] v0.12.7-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6722cfc3c3..6add75f972 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.12.6", + "version": "0.12.7-rc.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From 89b927e2784e592dcc022e0454a3a7cf22021143 Mon Sep 17 00:00:00 2001 From: Silvano Date: Thu, 7 Jun 2018 15:27:19 +0000 Subject: [PATCH 027/283] Translated using Weblate (Italian) Currently translated at 100.0% (1190 of 1190 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/ --- src/i18n/strings/it.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index fa22725f78..bb931e17ea 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -1184,5 +1184,12 @@ "Terms and Conditions": "Termini e condizioni", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Per continuare a usare l'homeserver %(homeserverDomain)s devi leggere e accettare i nostri termini e condizioni.", "Review terms and conditions": "Leggi i termini e condizioni", - "Muted Users": "Utenti silenziati" + "Muted Users": "Utenti silenziati", + "Message Replies": "Risposte", + "Message Pinning": "Messaggi appuntati", + "Mirror local video feed": "Feed video dai ripetitori locali", + "Replying": "Rispondere", + "Popout widget": "Oggetto a comparsa", + "Failed to indicate account erasure": "Impossibile indicare la cancellazione dell'account", + "Bulk Options": "Opzioni applicate in massa" } From 0b9b03c9ee4a357b4756dfe55d9343e131641e4a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 7 Jun 2018 22:01:27 +0100 Subject: [PATCH 028/283] re-run checkIfAlone if a member change occurred in the active room Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/RoomView.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index c5f6a75cc5..0c62f5a874 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -672,6 +672,7 @@ module.exports = React.createClass({ } this._updateRoomMembers(); + this._checkIfAlone(this.state.room); }, onRoomMemberMembership: function(ev, member, oldMembership) { From 92c146bcacb578b2ee73c9e633d5d819c4208d25 Mon Sep 17 00:00:00 2001 From: Yao Wei Date: Thu, 7 Jun 2018 08:29:20 +0000 Subject: [PATCH 029/283] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (1190 of 1190 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 80dce1cc2d..3677b78ec9 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -152,7 +152,7 @@ "Server unavailable, overloaded, or something else went wrong.": "伺服器可能不可用、超載，或者其他東西出錯了.", "Session ID": "會話 ID", "%(senderName)s set a profile picture.": "%(senderName)s 設置了頭像。.", - "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s 將暱稱改為了 %(displayName)s。.", + "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s 將他的暱稱改成 %(displayName)s。.", "Settings": "設定", "Show panel": "顯示側邊欄", "Show timestamps in 12 hour format (e.g. 2:30pm)": "用12小時制顯示時間戳 （如：下午 2:30）", @@ -193,11 +193,11 @@ "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s 更改了聊天室 %(roomName)s　圖像", "Cancel": "取消", "Custom Server Options": "自訂伺服器選項", - "Dismiss": "無視", + "Dismiss": "關閉", "Mute": "靜音", "Notifications": "通知", "Operation failed": "操作失敗", - "powered by Matrix": "由 Matrix 架設", + "powered by Matrix": "由 Matrix 提供", "Remove": "移除", "unknown error code": "未知的錯誤代碼", "OK": "確定", @@ -250,7 +250,7 @@ "Are you sure you want to leave the room '%(roomName)s'?": "您確定您要想要離開房間 '%(roomName)s' 嗎？", "Bans user with given id": "禁止有指定 ID 的使用者", "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "無法連線到家伺服器 - 請檢查您的連線，確保您的家伺服器的 SSL 憑證可被信任，而瀏覽器擴充套件也沒有阻擋請求。", - "%(senderName)s changed their profile picture.": "%(senderName)s 已經變更了他們的基本資料圖片。", + "%(senderName)s changed their profile picture.": "%(senderName)s 已經變更了他的基本資料圖片。", "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s 變更了 %(powerLevelDiffText)s 權限等級。", "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s 將房間名稱變更為 %(roomName)s。", "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s 已經移除了房間名稱。", @@ -381,8 +381,8 @@ "Rejoin": "重新加入", "Remote addresses for this room:": "此房間的遠端地址：", "Remove Contact Information?": "移除聯絡人資訊？", - "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s 移除了他們的顯示名稱 (%(oldDisplayName)s)。", - "%(senderName)s removed their profile picture.": "%(senderName)s 移除了他們的基本資寮圖片。", + "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s 移除了他的顯示名稱 (%(oldDisplayName)s)。", + "%(senderName)s removed their profile picture.": "%(senderName)s 移除了他的基本資料圖片。", "Remove %(threePid)s?": "移除 %(threePid)s？", "%(senderName)s requested a VoIP conference.": "%(senderName)s 請求了一次 VoIP 會議。", "Results from DuckDuckGo": "DuckDuckGo 的結果", @@ -962,7 +962,7 @@ "Community IDs cannot not be empty.": "社群 ID 不能為空。", "Show devices, send anyway or cancel.": "顯示裝置、無論如何都要傳送或取消。", "In reply to ": "回覆給 ", - "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 變更了他們的顯示名稱為 %(displayName)s 。", + "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 變更了他的顯示名稱為 %(displayName)s 。", "Failed to set direct chat tag": "設定直接聊天標籤失敗", "Failed to remove tag %(tagName)s from room": "從聊天室移除標籤 %(tagName)s 失敗", "Failed to add tag %(tagName)s to room": "新增標籤 %(tagName)s 到聊天室失敗", From b8cc438cb363c74e646efbeb1df2037de66e03ce Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 6 Jun 2018 15:35:30 +0000 Subject: [PATCH 030/283] Translated using Weblate (Russian) Currently translated at 99.8% (1188 of 1190 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/ --- src/i18n/strings/ru.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index 9d7f8901ab..dcde72d23a 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -1189,6 +1189,6 @@ "Yes, I want to help!": "Да, я хочу помочь!", "Reload widget": "Перезагрузить виджет", "To notify everyone in the room, you must be a": "Для уведомления всех в комнате, вы должны быть", - "Can't leave Server Notices room": "Невозможно покинуть комнату для сервера по заметкам", - "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната для важных сообщений от сервера, потому ее не возможно покинуть." + "Can't leave Server Notices room": "Невозможно покинуть комнату сервера уведомлений", + "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната используется для важных сообщений от сервера, поэтому вы не можете ее покинуть." } From 62978b7a2b49747999927d52e5123d8dee5a432a Mon Sep 17 00:00:00 2001 From: Kenneth Larsson Date: Thu, 7 Jun 2018 13:57:55 +0000 Subject: [PATCH 031/283] Translated using Weblate (Swedish) Currently translated at 100.0% (1190 of 1190 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/ --- src/i18n/strings/sv.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index 8e5d8e2f21..14940ed1c3 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -149,7 +149,7 @@ "Add": "Lägg till", "Admin Tools": "Admin-verktyg", "Alias (optional)": "Alias (valfri)", - "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Det gick inte att ansluta till servern - kontrollera anslutningen, försäkra att din hemservers TLS-certifikat är betrott, och att inget webbläsartillägg blockerar förfrågningar.", + "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Det gick inte att ansluta till hemservern - kontrollera anslutningen, se till att hemserverns SSL-certifikat är betrott, och att inget webbläsartillägg blockerar förfrågningar.", "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ändrade behörighetsnivå för %(powerLevelDiffText)s.", "Click here to join the discussion!": "Klicka här för att gå med i diskussionen!", "Close": "Stäng", @@ -290,7 +290,7 @@ "Register": "Registrera", "%(targetName)s rejected the invitation.": "%(targetName)s avvisade inbjudan.", "Reject invitation": "Avböj inbjudan", - "Rejoin": "Gå med tillbaka", + "Rejoin": "Gå med igen", "Remote addresses for this room:": "Fjärradresser för det här rummet:", "Remove Contact Information?": "Ta bort kontaktuppgifter?", "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s tog bort sitt visningsnamn (%(oldDisplayName)s).", @@ -326,7 +326,7 @@ "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s bjöd in %(targetDisplayName)s med i rummet.", "Server error": "Serverfel", "Server may be unavailable or overloaded": "Servern kan vara otillgänglig eller överbelastad", - "Server may be unavailable, overloaded, or search timed out :(": "Servern kan vara otillgänglig, överbelastad, eller så timade sökningen ut :(", + "Server may be unavailable, overloaded, or search timed out :(": "Servern kan vara otillgänglig, överbelastad, eller så tog sökningen för lång tid :(", "Server may be unavailable, overloaded, or the file too big": "Servern kan vara otillgänglig, överbelastad, eller så är filen för stor", "Server may be unavailable, overloaded, or you hit a bug.": "Servern kan vara otillgänglig, överbelastad, eller så stötte du på en bugg.", "Server unavailable, overloaded, or something else went wrong.": "Servern är otillgänglig, överbelastad, eller så gick något annat fel.", @@ -347,7 +347,7 @@ "Start Chat": "Starta en chatt", "Cancel": "Avbryt", "Create new room": "Skapa nytt rum", - "Custom Server Options": "Egna serverinställningar", + "Custom Server Options": "Anpassade serverinställningar", "Dismiss": "Avvisa", "powered by Matrix": "drivs av Matrix", "Room directory": "Rumskatalog", @@ -380,7 +380,7 @@ "The email address linked to your account must be entered.": "Epostadressen som är kopplad till ditt konto måste anges.", "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Filen '%(fileName)s' överskrider serverns största tillåtna filstorlek", "The file '%(fileName)s' failed to upload": "Filen '%(fileName)s' kunde inte laddas upp", - "Online": "Aktiv", + "Online": "Online", "Unnamed room": "Namnlöst rum", "World readable": "Alla kan läsa", "Guests can join": "Gäster kan bli medlem i rummet", @@ -467,7 +467,7 @@ "Room not found": "Rummet hittades inte", "Messages containing my display name": "Meddelanden som innehåller mitt namn", "Messages in one-to-one chats": "Meddelanden i privata chattar", - "Unavailable": "Inte tillgänglig", + "Unavailable": "Otillgänglig", "View Decrypted Source": "Visa dekrypterad källa", "Failed to update keywords": "Det gick inte att uppdatera nyckelorden", "remove %(name)s from the directory.": "ta bort %(name)s från katalogen.", @@ -503,7 +503,7 @@ "Saturday": "lördag", "I understand the risks and wish to continue": "Jag förstår riskerna och vill fortsätta", "Direct Chat": "Direkt-chatt", - "The server may be unavailable or overloaded": "Servern kan vara överbelastad eller inte tillgänglig", + "The server may be unavailable or overloaded": "Servern kan vara otillgänglig eller överbelastad", "Reject": "Avböj", "Failed to set Direct Message status of room": "Det gick inte att ställa in direktmeddelandestatus för rummet", "Monday": "måndag", @@ -561,7 +561,7 @@ "View Source": "Visa källa", "Thank you!": "Tack!", "Quote": "Citera", - "Collapse panel": "Kollapsa panel", + "Collapse panel": "Dölj panel", "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!": "Med din nuvarande webbläsare kan appens utseende vara helt fel, och vissa eller alla egenskaper kommer nödvändigtvis inte att fungera. Om du ändå vill försöka så kan du fortsätta, men gör det på egen risk!", "Checking for an update...": "Letar efter uppdateringar...", "There are advanced notifications which are not shown here": "Det finns avancerade aviseringar som inte visas här", @@ -638,7 +638,7 @@ "%(duration)sm": "%(duration)sm", "%(duration)sh": "%(duration)sh", "%(duration)sd": "%(duration)sd", - "Online for %(duration)s": "Aktiv i %(duration)s", + "Online for %(duration)s": "Online i %(duration)s", "Idle for %(duration)s": "Inaktiv i %(duration)s", "Offline for %(duration)s": "Offline i %(duration)s", "Idle": "Inaktiv", @@ -854,7 +854,7 @@ "Drop here to demote": "Släpp här för att göra till låg prioritet", "You're not in any rooms yet! Press to make a room or to browse the directory": "Du är inte i något rum ännu! Tryck för att skapa ett rum eller för att bläddra i katalogen", "Would you like to accept or decline this invitation?": "Vill du acceptera eller avböja denna inbjudan?", - "You have been invited to join this room by %(inviterName)s": "Du har blivit inbjuden att gå med i rummet av %(inviterName)s", + "You have been invited to join this room by %(inviterName)s": "Du har blivit inbjuden till rummet av %(inviterName)s", "Kick this user?": "Kicka användaren?", "To send messages, you must be a": "För att skicka meddelanden, måste du vara", "To invite users into the room, you must be a": "För att bjuda in användare i rummet, måste du vara", @@ -1056,7 +1056,7 @@ "Leave Community": "Lämna community", "Unable to leave community": "Det gick inte att lämna community", "Community Settings": "Community-inställningar", - "Changes made to your community name and avatar might not be seen by other users for up to 30 minutes.": "Ändringar på namn och avatar som gjorts i din community kommer eventuellt inte synas för andra användare i upp till 30 minuter.", + "Changes made to your community name and avatar might not be seen by other users for up to 30 minutes.": "Det kan dröja upp till 30 minuter innan ändringar på communityns namn och avatar blir synliga för andra användare.", "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Dessa rum visas för community-medlemmar på community-sidan. Community-medlemmar kan gå med i rummen genom att klicka på dem.", "Add rooms to this community": "Lägg till rum i denna community", "%(inviter)s has invited you to join this community": "%(inviter)s har bjudit in dig till denna community", From 074051297aece72b773f6945f45dafb62997b430 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 11:11:43 +0100 Subject: [PATCH 032/283] add a ShareDialog for sharing users,groups and rooms Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 1 + res/img/icons-share.svg | 6 + res/img/matrix-m.svg | 15 ++ res/img/social/email-1.png | Bin 0 -> 2510 bytes res/img/social/facebook.png | Bin 0 -> 1201 bytes res/img/social/linkedin.png | Bin 0 -> 1366 bytes res/img/social/reddit.png | Bin 0 -> 2279 bytes res/img/social/twitter-2.png | Bin 0 -> 1519 bytes src/components/views/dialogs/ShareDialog.js | 211 ++++++++++++++++++++ 9 files changed, 233 insertions(+) create mode 100644 res/img/icons-share.svg create mode 100644 res/img/matrix-m.svg create mode 100644 res/img/social/email-1.png create mode 100644 res/img/social/facebook.png create mode 100644 res/img/social/linkedin.png create mode 100644 res/img/social/reddit.png create mode 100644 res/img/social/twitter-2.png create mode 100644 src/components/views/dialogs/ShareDialog.js diff --git a/package.json b/package.json index 96c37a61c8..15080456fe 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "optimist": "^0.6.1", "pako": "^1.0.5", "prop-types": "^15.5.8", + "qrcode-react": "^0.1.16", "querystring": "^0.2.0", "react": "^15.6.0", "react-addons-css-transition-group": "15.3.2", diff --git a/res/img/icons-share.svg b/res/img/icons-share.svg new file mode 100644 index 0000000000..b27616d5d5 --- /dev/null +++ b/res/img/icons-share.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/res/img/matrix-m.svg b/res/img/matrix-m.svg new file mode 100644 index 0000000000..ccb1df0fc5 --- /dev/null +++ b/res/img/matrix-m.svg @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/res/img/social/email-1.png b/res/img/social/email-1.png new file mode 100644 index 0000000000000000000000000000000000000000..193cb659da5d4adff51376f3fc75cc8609c803fd GIT binary patch literal 2510 zcmV;<2{HDGP)HtMRhk?0buDKu#&buo5IY}eF4AYO)9Jd1n2=li0!+-J|d^Tv3N zbTszZ@4j=+J733CzuoBXMFZC_b?x4zEDZw zLKRx~X6DZ_-)m8LI*N#E$nr@RgZ!HLXUr%47PQ7k4~R2wXWq)Zrb348X6|G@#GLeF z!GI5I)HCm5?q}XxLFGxTy;t08m$>&8HNb<+z0BWYZlKwt264|`A;YX2U^(-v%tu6$ zyHeCBWO!91*jX_ElG~fi8))tjWO-f4R#5{W{(dSF-dv-&knNdD7yxDJN6b&s+^3yF z)`(v?Ajtf4QPZo19uO5`6LXDKx%wM2u)&yA4)EecQV!F#z$IyX_ET#>PFGEaXW&C%=Qc}f)~%f0PE(O3LM1qxrw ze8P_!-!d;q8yjosp2o=g%9ct+*8Oj6h{Ho^O0Y4?AT(6BFb|Y!fIkZl(53~U8hWHT zMw=JcQlO@M@A=1Ao(>G8=wC@~L%;*>D8&GXnZvqw3A3`FYl_mgW%DQ=lxu!ATcq<7 zMLLtVC+OwuEzQw@r>DRpzQ;y5`oD~>c-urXf2eT)@;dUf20b0?j?T%bQ* znxI#h`_qLPbHxT;F|Hkbck8Q3tG&1f>q+}I?5y2J<}GqDW7GH zJ5DF*$WZypn_jf#tua>uM4q{6K}g37w#$IfRvqEKu`+J#kX89d|2?kc@}&^)z>_`W zbP+(oLLJNNbgIl&XAZboXOe>wcl%ZLgtx2ra!EBCLSG*b8JR!KzpUWgG0fFrgcTgj z6zT1B-T+5d!teXuNztBFaU0IKYf*%L|E`k3*9e_Yng+OE$Mqk(HfH%3~eRk0cQd(f$lOx07+q; z%9Riv@YYJt4`n=YJ9ZoRAQn^)Rw#TXWycNhvfN~y0lG~35PQ~eR>=#Xa|6tFr>amJ zIrgo}Twql9;yF1wLwxRIe4wK|Xee870iLn^B;y2oo>>>yI^wt!SG6kp&LaD;<(KEP zQdG8%cjfC`CBilG(sqQsrfVc;gwI0$r+uySX{|$%Gajh%G<${hf31~Bfm)RffLL=1 z`HH0ELFsRLD31q&34Yl=J}o>7u;7n<%=HvIeaQsg^&)nzJF#e?8g+dSSAXh1m!;@% z8E1N#4*eOq0YWuC^w`|O1W56C$%)5hF1ntxzO0M;2{$)Zx3{h95yM_Nz*$B|@)_<9E8XGZu|m+Cuq6`VSYq%hWQ70kF1LX?IY0e!kzyLieS2+7|DCVT$Y(d&R-g9-W%awny z#v3MwC8cg>OUzbbfI!hLYEmDHdbjFy#@dRuNs<>5k_?*e{$QOk@I-Tia(W*(R3?H$ zE^&qvTIXL~$i6>6c)Vq5%f4(a@<3C@`jSPGoLyG)X{lTM}b*jCaa_L(COxMDixI~iz3xQxz%^0&Zfjh71~>~e zDs*)j0KU6l2}W@&fBCfglomMQ==Jpm(9wN10Qp5@)Ljbgw>E&j9FGH}VE!kY%OQCk zJC`xQ(M*X9Lynskgz0w16&So?cIb0XaUGA#9*}s1G@cE@ZauXs?i!dnOBveYAvT0{ zGK5(mps^F|AiO?#V#JSN)1A_~=!sL~^w*J`A4`?| zhzyBxc!D$^iA4hZG~;;Sew{eRh67FmM0NS2JmTmUS>H3=3llgneWBbtqbvM)L)eJz zMeHJVY#irtIzSZQHBN=Q8EPZ;lZ8n?W51pG$Fe`n^v1{m<}Xoo)AyNoOg9spjvi+| zTE)sA6*`cv0RZ(LV*XtfD*v*Oz3hjj(WGzkilI45ko7(xJC$ny(+KS%o~j|{+e=Yi z#Q-Ml5R1>nmMx6#zIx0kM<;+KRBw+WeO zwhUnHtI=HSA;l9WA6nWy;@+L*EEMo*7k1OshIA)A^ zhi@ZkJcA@r`X!ordHOZK1+AHd*XNr=XNkwsRtkee$o*(uLX@r^5zh(H!3|eZxc>_< Y02w!UWX_nGYybcN07*qoM6N<$f{u#A1poj5 literal 0 HcmV?d00001 diff --git a/res/img/social/facebook.png b/res/img/social/facebook.png new file mode 100644 index 0000000000000000000000000000000000000000..6a29e3820aa997e5bc06d42995891ce570defd25 GIT binary patch literal 1201 zcmV;i1Wx;jP){WFb!?3z7NA68<|~E&O{8>Ez#ZokqHl4&r9Wg z0N0RH$a_dDXa_6TImI?;F2Et=81fkhxp*OqZ5ZPKtBC*<+&&^tfPO%>d|=yz3PAmD zkOQ9HkjA!kiV%Q?sXk;g=pT)2t3|D0(1d)!V|t>XhDV5MSgM)o15E>MB&5ic5OeG{5w+(Z%-Cd{(H5AqNFk!8kff%pI7bhof;DhdlLDra^`dG%oNEQ0 zpk6+emkUrQGNsMjo2nN9tn6#hFlZN5qm+~c$!1g7d;Y9%z~EaKIH$jXd-=C$5y;mL zc?+M=ZYvcl)iMIf&YwKE9dD<@k z1%(nY9>`}a2~Y{fMJ0^_g(6DsY(534Ddwo|55&sqIy7~>5h*~SBuW4^@a3yV_-G)3 z*o_QDn3?|}x{A#fkS(I*WV7;3r@4h?;b}5inJ%JaTJ=$i&+|*71xS-XpKJW^eQ5=L z{#p|*fT->9ptZawE#c={6zwVMYYl1vUNA1aB!I{00xTFviI1Ru?F^3dht{_NxoPUzm{UjYUHqC(z?^D_)0 P00000NkvXXu0mjf5Z)l0 literal 0 HcmV?d00001 diff --git a/res/img/social/linkedin.png b/res/img/social/linkedin.png new file mode 100644 index 0000000000000000000000000000000000000000..2b868a585ba59ca2f716f0a21254ccbdb3c95438 GIT binary patch literal 1366 zcmV-c1*!UpP)b&2Be0RqO@45R0W~Mz9=g~i=y;FTI@p~6pB_* z2nv=^U$UiG`cT>;6hc$dSOQVWmXsx_t+iFtXzH3pV-nMzGdUyU?##OLx4EZ` za+Aj4e2}>eXnsK>$hXKZk$oZy5JK)j#*vK<)*EBKj~qa@BhMf+PE;;AP)8Vf2zeEG z++pXl(a86>%J&S$6kUhxHxRaYLMA?QO?qG`|0CjHt z$aNqN$d*fNo2vp)`#Z-So@fZMZ719ifQG3KuFby?6y~-+v&Q2vPRwr9vVgo-brnEUqkv6R$TzYfV%Uf=I`7 zZb`U8#7Jn>>klNI9Q$ZN3u*b}lwtx7J;kC;*{}ow)2>Y5NK-^3%iT*zzGclEOp3c!V z!4c0EpczcA{YaA$l%Asy2>x+XXp+2==jz?)WTq4EA$_kdUX0-7-O zsS)rR_z$nDO@KOum=6UYpCcr|2JkO7P#@4>rDVtU7O0qOyq>b{^B+zBzZ3{4>2z#i z71YfSK~M@nZPh$wWEswkWY*VP!q_A zAixj54_mrMpy5@XW9c<#hDxPH5McU0<7;;xOg^!EP_iz-O)qqI_a>*@sCI+|NclJw z9wGq-d@MlH?-7t90lIuFKo`|y%}41cu~By{>vfKD|LA|!k$Ktd}(ug^Ne6#M+x zdx3Tz3DB;c3#d3PN?PnP((G%F05mB&=>q{yYA1k_&c)FZc78PbAqRB67kCFsV{eci z-qnV`UIeIpL3ar{-<|EekpP6vDWG(UoaCc=X#rLS?d)kh^pu!` Y0BLR|kwK3)O8@`>07*qoM6N<$f)AK>P5=M^ literal 0 HcmV?d00001 diff --git a/res/img/social/reddit.png b/res/img/social/reddit.png new file mode 100644 index 0000000000000000000000000000000000000000..bd6131186f990ad2902c6d76165f5bf7e6457244 GIT binary patch literal 2279 zcmVAGR zp+O)Z${7Muj+U!jg-U75B}dC?p+c=td_Ued?6jTT&au1Q?Mq%}I-U8x_uluu-#cbD z>~7ktpBX+>N=9x{hOnI2E+gWx5Las zDR>C798j|P)d1Lk%N5`S8#Pg~edP}WAWSV`evg8mW++)Be3b`;Gp|%JJyhrw6(J@u z-*M^z^FvH|jm9h49c_UmD>>#ju6{bZFvIlsG=2kluU+oCO(0ByR6rot(2Z-WPqeP0Y1>FgP!jx+)GqmCfi}cy8?ba7|at> zdF46VEh!?p@|V?_ld5CDKtFeKJk)Q>;Vyeo0LpLpmgt!jqAml3HM({|wvN5d5_Hbd z4DeFm)04&$^6n}5kN0~4ev3aM>Nl3CRcE4#a-w2|6Spgz6ihi<7(|1kk6#oGa|v1l zsUiHsop|M2)VvSzy|hGD_2Nl6o;&8xB|x{iFAM-bykZN%u^-#T$=}Gx^0rBq25Q-X zhv)DXGgtttI^q8EGWS@K?F>+!#X7W!=uaN^)(yD^uj$-R#s{6}WT_~J=)ZD1Mra8G zB&tq|c|z=cl7X~E+p5>$j{DYd;@MG*qtT_)L?`$2%AR7^Epi*lXj`<37Eg)pD^UW3 z9HC%08|@-d{{*538diM{A(<1sJ70BA4IF&{*DrKWx+s|NJVSu58&^b&N|2twy> zCOVpF2c;EA@>c0Fl9e7;)r&AD3<_`PJz8X{xJi_eYPL4eC>0yX(<}G zEQdb;8ffP-xAKV32v7KX^Fj$*PL*u%Cgz$jo4n0jgcN zlA(_Oifx27m_?J3?kxc-=Kh!ySL%atQ{=xAkag ziMug@o?Ts#Ru7cg{*0&)2FSB#yEBrYfRL^Rnve$|?qmBE7up>q*S-f};{0qmfAlFS zWQ+)18>G+LYMCJ*`>-kA6Pw2-s;HFhq$iLM1K3a9kf*~7An4O?N@%Q6ImSo}8wC`U zY8K_)rE$;8T$>Gg)^lnLgCb7=_(2Byl%OrS`}GYGO`ZksqF-Rt06`ZB`F`GZX?9jed{led3lxlLUwKXE`)`I&%kFjrO6Ub( zWgsY&&tAcbWJ-nTsrdn8X}tq)Jp*_d>H`=J28EZw+nmv0q;&dMW5+D_2C5U<+%ST+ zx=2*e&O+X9t#>cD0*{FsE*&Cm+hALq&2y?efIm*}0iX|rU5MJms8x=38_DHzD~IF?KnMUV zIpHL}d!sac0T>*w#{)+-UXQyBZb+s2OR0M0jSK+7%eEc$Q28B7H>%A5pk(sV_xM3V zWlAS9Yk+)D4}>Tsdn)?8#in1F)9Zoq=}H%}Y5>qX%o!o9e1_72>>2<4yqQduVTY;sdbN&o`(!1Ht=6#9-wiHO#l`2U%nTHjsySn*+Q-j< zHh{i>>cl*Y?6%p>cXDQ_xl(=MePMq3^*DNr`1lIV`&b_+{Ts=Tr}y|;(69jfd>&t* z;9Grkox3T6L{QBxbgl|r`D#DsstT^ypThkwzyNr(v=B#;25kTU002ovPDHLkV1ko1 BJN^Iw literal 0 HcmV?d00001 diff --git a/res/img/social/twitter-2.png b/res/img/social/twitter-2.png new file mode 100644 index 0000000000000000000000000000000000000000..84f8033a30c5cef33bb14ee59b5b8d5398b9162f GIT binary patch literal 1519 zcmVeqY zO9dhH4@opc3o1&nPzZ!p18Iw=v9U2GwXM;_%UyaVX?jU~@A5XDm+fVDXLfJbe(-U} z-QMhb-@ci7Z)VQ7qiYasMk(?!WDT+!Sz*lx+cCL|#C?g$#mo2=YBIunmq2P>DQ+Jj#PywouA8oZnq0jU3V@_^?y1lYFs>=1yasW#-R;C?i*t*WePFb8>z=X9^&Ii4Z5 zA!kJ+;GoBx*RYvw7wQ5b4k@pqiG8rt1sae?jNYkwWiC8hQJj1w3|zei9}kVgP<$ra zA{^nmqT7rB<=pQL4J1$BQ3x+om4M>=_p|lE0=RcoJ{;tlY-$ID!iHZ*Em>2HQh)6iqk#t|Hq!xR6bRJMu$t< zY(_z&o&X`Zc@Rn$U<25@lH)eivd@c&&`vw=c5AL5Iv=eRZf7zv2j?fIp>sHz%rqqw zOubqJJmrPQMzaZJnEUTv16%GCUJiUh>jE?=)O#s@DY<&SG6;7U3T2q&bC3ksJE&OOO87aR-l~KLPMi&V{=kUT-TR1m91qQ~! zB(|3q!|t^uZi$4jHV6_v^x>u$3&<^DV|4WD0%!MTWV9nh|2f`lHC!LTnjEu%157Al5JU2#6_t1C-(C6U38 zeg4nBK&wcLZNH8~Vt(GS_@%DYu-bAR*P2=jX!t-REv9Aaj|L--cH$>*UuorMG4^$d z08|tm5;5rO%M-H7R70q;wkCKewE$Ffz7%?l@1GxaOoYUo=`I&Zf5?i?1ude*(YrtW z3CA5c7Bd((y(ZX_{($w$H0mGSB8Jg}X&v|r-s$@TYlZ8!3Gn45QzCb#_Weu(5MGk8 zP|`Ct39t2DP7aQ=DkKXeFwHt=B9n&ee)eezd>Q^SLmQ@_$b4e7k?~MT0o)Z(p;*m< z)p;u*VB+)$tqD>h)G-t_8~(eH9eQ76S`(xn(7_^Ur$%V1l(4I77Kd--e5Nj-;T0`q z^eEcd2e2vt9W>sJJnli~Pq6L6ho$MP>$Xf`L^EUlUaQDN!Pyf9B){oJ3!T)~al*_ZwiU;t$x VVe!_=*FFFM002ovPDHLkV1goAzuW)- literal 0 HcmV?d00001 diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js new file mode 100644 index 0000000000..8bfa0ad931 --- /dev/null +++ b/src/components/views/dialogs/ShareDialog.js @@ -0,0 +1,211 @@ +/* +Copyright 2018 Vector Creations 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 React from 'react'; +import PropTypes from 'prop-types'; +import {Room, User, Group, RoomMember} from 'matrix-js-sdk'; +import sdk from '../../../index'; +import { _t } from '../../../languageHandler'; +import QRCode from 'qrcode-react'; +import {makeEventPermalink, makeGroupPermalink, makeRoomPermalink, makeUserPermalink} from "../../../matrix-to"; +import * as ContextualMenu from "../../structures/ContextualMenu"; + +const socials = [ + { + name: 'Facebook', + img: 'img/social/facebook.png', + url: (url) => `https://www.facebook.com/sharer/sharer.php?u=${url}`, + }, { + name: 'Twitter', + img: 'img/social/twitter-2.png', + url: (url) => `https://twitter.com/home?status=${url}`, + }, /* // icon missing + name: 'Google Plus', + img: 'img/social/', + url: (url) => `https://plus.google.com/share?url=${url}`, + },*/ { + name: 'Linked In', + img: 'img/social/linkedin.png', + url: (url) => `https://www.linkedin.com/shareArticle?mini=true&url=${url}`, + }, { + name: 'Reddit', + img: 'img/social/reddit.png', + url: (url) => `http://www.reddit.com/submit?url=${url}`, + }, { + name: 'email', + img: 'img/social/email-1.png', + url: (url) => `mailto:?body=${url}`, + }, +]; + +export default class ShareDialog extends React.Component { + static propTypes = { + onFinished: PropTypes.func.isRequired, + target: PropTypes.oneOfType([ + PropTypes.instanceOf(Room), + PropTypes.instanceOf(User), + PropTypes.instanceOf(Group), + PropTypes.instanceOf(RoomMember), + // PropTypes.instanceOf(MatrixEvent), + ]).isRequired, + }; + + constructor(props) { + super(props); + + this.onCopyClick = this.onCopyClick.bind(this); + this.onCheckboxClick = this.onCheckboxClick.bind(this); + + this.state = { + ticked: false, + }; + } + + static _selectText(target) { + const range = document.createRange(); + range.selectNodeContents(target); + + const selection = window.getSelection(); + selection.removeAllRanges(); + selection.addRange(range); + } + + static onLinkClick(e) { + e.preventDefault(); + const {target} = e; + ShareDialog._selectText(target); + } + + onCopyClick(e) { + e.preventDefault(); + + ShareDialog._selectText(this.refs.link); + + let successful; + try { + successful = document.execCommand('copy'); + } catch (err) { + console.error('Failed to copy: ', err); + } + + const GenericTextContextMenu = sdk.getComponent('context_menus.GenericTextContextMenu'); + const buttonRect = e.target.getBoundingClientRect(); + + // The window X and Y offsets are to adjust position when zoomed in to page + const x = buttonRect.right + window.pageXOffset; + const y = (buttonRect.top + (buttonRect.height / 2) + window.pageYOffset) - 19; + const {close} = ContextualMenu.createMenu(GenericTextContextMenu, { + chevronOffset: 10, + left: x, + top: y, + message: successful ? _t('Copied!') : _t('Failed to copy'), + }, false); + e.target.onmouseleave = close; + } + + onCheckboxClick() { + this.setState({ + ticked: !this.state.ticked, + }); + } + + render() { + let title; + let matrixToUrl; + + let checkbox; + + if (this.props.target instanceof Room) { + title = _t('Share Room'); + + const events = this.props.target.getLiveTimeline().getEvents(); + if (events.length > 0) { + checkbox =
+ + +
; + } + + if (this.state.ticked) { + matrixToUrl = makeEventPermalink(this.props.target.roomId, events[events.length - 1].getId()); + } else { + matrixToUrl = makeRoomPermalink(this.props.target.roomId); + } + } else if (this.props.target instanceof User || this.props.target instanceof RoomMember) { + title = _t('Share User'); + matrixToUrl = makeUserPermalink(this.props.target.userId); + } else if (this.props.target instanceof Group) { + title = _t('Share Community'); + matrixToUrl = makeGroupPermalink(this.props.target.groupId); + } + + const encodedUrl = encodeURIComponent(matrixToUrl); + + const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); + return +
+ + { checkbox } +
+ +
+
+

QR Code

+
+ +
+
+
+

Social

+
+ { + socials.map((social) => + + ) + } +
+
+
+
+ ; + } +} From e7a4a0b2e0f78138f0bc91e98420a720783b3aef Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 11:12:12 +0100 Subject: [PATCH 033/283] allow context-menus/tooltips to work over modals Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/css/structures/_ContextualMenu.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/res/css/structures/_ContextualMenu.scss b/res/css/structures/_ContextualMenu.scss index a0191b92cf..7474c3d107 100644 --- a/res/css/structures/_ContextualMenu.scss +++ b/res/css/structures/_ContextualMenu.scss @@ -16,7 +16,7 @@ limitations under the License. .mx_ContextualMenu_wrapper { position: fixed; - z-index: 2000; + z-index: 5000; } .mx_ContextualMenu_background { @@ -26,7 +26,7 @@ limitations under the License. width: 100%; height: 100%; opacity: 1.0; - z-index: 2000; + z-index: 5000; } .mx_ContextualMenu { @@ -37,7 +37,7 @@ limitations under the License. position: absolute; padding: 6px; font-size: 14px; - z-index: 2001; + z-index: 5001; } .mx_ContextualMenu.mx_ContextualMenu_right { From e3c455e5997fe5874d98b833ad4317735e876d1f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 11:12:26 +0100 Subject: [PATCH 034/283] Style the ShareDialog Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/css/_components.scss | 1 + res/css/views/dialogs/_ShareDialog.scss | 89 +++++++++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 res/css/views/dialogs/_ShareDialog.scss diff --git a/res/css/_components.scss b/res/css/_components.scss index 2734939ae3..173939e143 100644 --- a/res/css/_components.scss +++ b/res/css/_components.scss @@ -42,6 +42,7 @@ @import "./views/dialogs/_SetEmailDialog.scss"; @import "./views/dialogs/_SetMxIdDialog.scss"; @import "./views/dialogs/_SetPasswordDialog.scss"; +@import "./views/dialogs/_ShareDialog.scss"; @import "./views/dialogs/_UnknownDeviceDialog.scss"; @import "./views/directory/_NetworkDropdown.scss"; @import "./views/elements/_AccessibleButton.scss"; diff --git a/res/css/views/dialogs/_ShareDialog.scss b/res/css/views/dialogs/_ShareDialog.scss new file mode 100644 index 0000000000..ab340ad758 --- /dev/null +++ b/res/css/views/dialogs/_ShareDialog.scss @@ -0,0 +1,89 @@ +/* +Copyright 2018 New Vector 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_ShareDialog { + // this is to center the content + padding-right: 58px; +} + +.mx_ShareDialog hr { + margin-top: 25px; + margin-bottom: 10px; + border-color: $light-fg-color; +} + +.mx_ShareDialog_content { + margin: 10px 0; +} + +.mx_ShareDialog_matrixto { + display: flex; + justify-content: space-between; + border-radius: 5px; + border: solid 1px $light-fg-color; + margin-bottom: 10px; + margin-top: 30px; + padding: 10px; +} + +.mx_ShareDialog_matrixto a { + text-decoration: none; +} + +.mx_ShareDialog_matrixto_link { + flex-shrink: 1; + overflow: hidden; + text-overflow: ellipsis; +} + +.mx_ShareDialog_matrixto_copy { + flex-shrink: 0; + cursor: pointer; + margin-left: 20px; + display: inherit; +} +.mx_ShareDialog_matrixto_copy > div { + background-image: url($copy-button-url); + margin-left: 5px; + width: 20px; + height: 20px; +} + +.mx_ShareDialog_split { + display: flex; + flex-wrap: wrap; +} + +.mx_ShareDialog_qrcode_container { + float: left; + background-color: #ffffff; + padding: 5px; // makes qr code more readable in dark theme + border-radius: 5px; + height: 256px; + width: 256px; + margin-right: 64px; +} + +.mx_ShareDialog_social_container { + display: flex; + flex-wrap: wrap; + width: 299px; +} + +.mx_ShareDialog_social_icon { + margin-right: 10px; + margin-bottom: 10px; +} From 64bcf6fd7e20f562a6553742a8e9c0489fabea91 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 11:13:04 +0100 Subject: [PATCH 035/283] allow ContextualMenu to run without background, for tooltips & fix copy Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/ContextualMenu.js | 24 ++++++++++++-------- src/components/views/messages/TextualBody.js | 4 ++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js index daac294d12..d6a11ca974 100644 --- a/src/components/structures/ContextualMenu.js +++ b/src/components/structures/ContextualMenu.js @@ -1,5 +1,6 @@ /* Copyright 2015, 2016 OpenMarket Ltd +Copyright 2018 Vector Creations Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,12 +16,10 @@ limitations under the License. */ -'use strict'; - -const classNames = require('classnames'); -const React = require('react'); -const ReactDOM = require('react-dom'); +import React from 'react'; +import ReactDOM from 'react-dom'; import PropTypes from 'prop-types'; +import classNames from 'classnames'; // Shamelessly ripped off Modal.js. There's probably a better way // of doing reusable widgets like dialog boxes & menus where we go and @@ -61,7 +60,12 @@ export default class ContextualMenu extends React.Component { // If true, insert an invisible screen-sized element behind the // menu that when clicked will close it. hasBackground: PropTypes.bool, - } + + // The component to render as the context menu + elementClass: PropTypes.element.isRequired, + // on resize callback + windowResize: PropTypes.func + }; render() { const position = {}; @@ -112,7 +116,7 @@ export default class ContextualMenu extends React.Component { `; } - const chevron =
; + const chevron =
; const className = 'mx_ContextualMenu_wrapper'; const menuClasses = classNames({ @@ -158,13 +162,13 @@ export default class ContextualMenu extends React.Component { { chevron }
- { props.hasBackground &&
} + { props.hasBackground &&
}
; } } -export function createMenu(ElementClass, props) { +export function createMenu(ElementClass, props, hasBackground=true) { const closeMenu = function(...args) { ReactDOM.unmountComponentAtNode(getOrCreateContainer()); @@ -175,8 +179,8 @@ export function createMenu(ElementClass, props) { // We only reference closeMenu once per call to createMenu const menu = Date: Tue, 12 Jun 2018 11:15:00 +0100 Subject: [PATCH 036/283] link to ShareDialog from GroupView, RoomView, UserSettings & MemberInfo Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/GroupView.js | 13 +++++++++++++ src/components/structures/UserSettings.js | 15 +++++++++++++-- src/components/views/rooms/MemberInfo.js | 14 +++++++++++++- src/components/views/rooms/RoomHeader.js | 16 ++++++++++++++++ 4 files changed, 55 insertions(+), 3 deletions(-) diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js index c7610219f7..a343d1c971 100644 --- a/src/components/structures/GroupView.js +++ b/src/components/structures/GroupView.js @@ -562,6 +562,13 @@ export default React.createClass({ }); }, + _onShareClick: function() { + const ShareDialog = sdk.getComponent("dialogs.ShareDialog"); + Modal.createTrackedDialog('share community dialog', '', ShareDialog, { + target: this._matrixClient.getGroup(this.props.groupId), + }); + }, + _onCancelClick: function() { this._closeSettings(); }, @@ -1207,6 +1214,7 @@ export default React.createClass({ shortDescNode = { summary.profile.short_description }; } } + if (this.state.editing) { rightButtons.push( , ); } + rightButtons.push( + + + , + ); if (this.props.collapsedRhs) { rightButtons.push( ; }, + onSelfShareClick: function() { + const cli = MatrixClientPeg.get(); + const ShareDialog = sdk.getComponent("dialogs.ShareDialog"); + Modal.createTrackedDialog('share self dialog', '', ShareDialog, { + target: cli.getUser(this._me), + }); + }, + _showSpoiler: function(event) { const target = event.target; target.innerHTML = target.getAttribute('data-spoiler'); @@ -1295,10 +1303,13 @@ module.exports = React.createClass({
- { _t("Logged in as:") } { this._me } + { _t("Logged in as:") + ' ' } + + { this._me } +
- { _t('Access Token:') } + { _t('Access Token:') + ' ' } diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js index 2789c0e4cd..20c0fb8414 100644 --- a/src/components/views/rooms/MemberInfo.js +++ b/src/components/views/rooms/MemberInfo.js @@ -632,6 +632,13 @@ module.exports = withMatrixClient(React.createClass({ ); }, + onShareUserClick: function() { + const ShareDialog = sdk.getComponent("dialogs.ShareDialog"); + Modal.createTrackedDialog('share room member dialog', '', ShareDialog, { + target: this.props.member, + }); + }, + _renderUserOptions: function() { const cli = this.props.matrixClient; const member = this.props.member; @@ -705,13 +712,18 @@ module.exports = withMatrixClient(React.createClass({ } } - if (!ignoreButton && !readReceiptButton && !insertPillButton && !inviteUserButton) return null; + const shareUserButton = ( + + { _t('Share Link to User') } + + ); return (

{ _t("User Options") }

{ readReceiptButton } + { shareUserButton } { insertPillButton } { ignoreButton } { inviteUserButton } diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js index 1851e03383..e40c715052 100644 --- a/src/components/views/rooms/RoomHeader.js +++ b/src/components/views/rooms/RoomHeader.js @@ -149,6 +149,13 @@ module.exports = React.createClass({ dis.dispatch({ action: 'show_right_panel' }); }, + onShareRoomClick: function(ev) { + const ShareDialog = sdk.getComponent("dialogs.ShareDialog"); + Modal.createTrackedDialog('share room dialog', '', ShareDialog, { + target: this.props.room, + }); + }, + _hasUnreadPins: function() { const currentPinEvent = this.props.room.currentState.getStateEvents("m.room.pinned_events", ''); if (!currentPinEvent) return false; @@ -379,6 +386,14 @@ module.exports = React.createClass({ ; } + let shareRoomButton; + if (this.props.inRoom) { + shareRoomButton = + + + ; + } + let rightPanelButtons; if (this.props.collapsedRhs) { rightPanelButtons = @@ -400,6 +415,7 @@ module.exports = React.createClass({
{ settingsButton } { pinnedEventsButton } + { shareRoomButton } { manageIntegsButton } { forgetButton } { searchButton } From d8a1feb501ad10102da8d4fee0e7a553de8dfde5 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 11:15:30 +0100 Subject: [PATCH 037/283] fix Modal typo and refactor BaseDialog to fix " undefined" className Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/BaseDialog.js | 23 ++++++++++++------- .../views/dialogs/ChatCreateOrReuseDialog.js | 2 +- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js index 71a5da224c..8ec417a59b 100644 --- a/src/components/views/dialogs/BaseDialog.js +++ b/src/components/views/dialogs/BaseDialog.js @@ -18,6 +18,7 @@ limitations under the License. import React from 'react'; import FocusTrap from 'focus-trap-react'; import PropTypes from 'prop-types'; +import classNames from 'classnames'; import { MatrixClient } from 'matrix-js-sdk'; @@ -64,7 +65,10 @@ export default React.createClass({ // Id of content element // If provided, this is used to add a aria-describedby attribute - contentId: React.PropTypes.string, + contentId: PropTypes.string, + + // optional additional class for the title element + titleClass: PropTypes.string, }, getDefaultProps: function() { @@ -105,25 +109,28 @@ export default React.createClass({ render: function() { const TintableSvg = sdk.getComponent("elements.TintableSvg"); + let cancelButton; + if (this.props.hasCancel) { + cancelButton = + + ; + } + return ( - { this.props.hasCancel ? - - : null } -
+ { cancelButton } +
{ this.props.title }
{ this.props.children } diff --git a/src/components/views/dialogs/ChatCreateOrReuseDialog.js b/src/components/views/dialogs/ChatCreateOrReuseDialog.js index e2387064cf..95fd8848ba 100644 --- a/src/components/views/dialogs/ChatCreateOrReuseDialog.js +++ b/src/components/views/dialogs/ChatCreateOrReuseDialog.js @@ -187,7 +187,7 @@ export default class ChatCreateOrReuseDialog extends React.Component { } } -ChatCreateOrReuseDialog.propTyps = { +ChatCreateOrReuseDialog.propTypes = { userId: PropTypes.string.isRequired, // Called when clicking outside of the dialog onFinished: PropTypes.func.isRequired, From f9b3f0f9d1ff039fc608181138c6a771e94a7709 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 11:15:52 +0100 Subject: [PATCH 038/283] run gen-i18n and prune-i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/i18n/strings/de_DE.json | 3 -- src/i18n/strings/en_EN.json | 69 +++++++++++++++++++---------------- src/i18n/strings/eu.json | 7 ---- src/i18n/strings/fr.json | 8 ---- src/i18n/strings/hu.json | 8 ---- src/i18n/strings/it.json | 3 -- src/i18n/strings/ru.json | 4 -- src/i18n/strings/sv.json | 2 - src/i18n/strings/zh_Hant.json | 3 -- 9 files changed, 38 insertions(+), 69 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index d3787a15a3..8f75b71689 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -1169,9 +1169,6 @@ "At this time it is not possible to reply with an emote.": "An dieser Stelle ist es nicht möglich mit einer Umschreibung zu antworten.", "Enable widget screenshots on supported widgets": "Widget-Screenshots bei unterstützten Widgets aktivieren", "Send analytics data": "Analysedaten senden", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden. (Siehe unsere Datenschutzerklärung).", - "Help improve Riot by sending usage data? This will use a cookie.": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden.", - "Yes please": "Ja, bitte", "e.g. %(exampleValue)s": "z.B. %(exampleValue)s", "Reload widget": "Widget neu laden", "To notify everyone in the room, you must be a": "Notwendiges Berechtigungslevel, um jeden im Raum zu benachrichten:", diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 8698e6108f..76d0cb6f33 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -42,6 +42,10 @@ "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload", "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads", "Upload Failed": "Upload Failed", + "Failure to create room": "Failure to create room", + "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.", + "Send anyway": "Send anyway", + "Send": "Send", "Sun": "Sun", "Mon": "Mon", "Tue": "Tue", @@ -81,6 +85,7 @@ "Failed to invite users to community": "Failed to invite users to community", "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s", "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:", + "Unnamed Room": "Unnamed Room", "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings", "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again", "Unable to enable Notifications": "Unable to enable Notifications", @@ -104,7 +109,6 @@ "You need to be logged in.": "You need to be logged in.", "You need to be able to invite users to do that.": "You need to be able to invite users to do that.", "Unable to create widget.": "Unable to create widget.", - "Reload widget": "Reload widget", "Missing roomId.": "Missing roomId.", "Failed to send request.": "Failed to send request.", "This room is not recognised.": "This room is not recognised.", @@ -180,11 +184,6 @@ "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing", "%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing", "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing", - "Failure to create room": "Failure to create room", - "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.", - "Send anyway": "Send anyway", - "Send": "Send", - "Unnamed Room": "Unnamed Room", "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions", "Not a valid Riot keyfile": "Not a valid Riot keyfile", "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?", @@ -298,6 +297,29 @@ "Off": "Off", "On": "On", "Noisy": "Noisy", + "Invalid alias format": "Invalid alias format", + "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias", + "Invalid address format": "Invalid address format", + "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address", + "not specified": "not specified", + "not set": "not set", + "Remote addresses for this room:": "Remote addresses for this room:", + "Addresses": "Addresses", + "The main address for this room is": "The main address for this room is", + "Local addresses for this room:": "Local addresses for this room:", + "This room has no local addresses": "This room has no local addresses", + "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)", + "Invalid community ID": "Invalid community ID", + "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID", + "Flair": "Flair", + "Showing flair for these communities:": "Showing flair for these communities:", + "This room is not showing flair for any communities": "This room is not showing flair for any communities", + "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)", + "You have enabled URL previews by default.": "You have enabled URL previews by default.", + "You have disabled URL previews by default.": "You have disabled URL previews by default.", + "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.", + "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.", + "URL Previews": "URL Previews", "Cannot add any more widgets": "Cannot add any more widgets", "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.", "Add a widget": "Add a widget", @@ -347,6 +369,7 @@ "Jump to read receipt": "Jump to read receipt", "Mention": "Mention", "Invite": "Invite", + "Share Link to User": "Share Link to User", "User Options": "User Options", "Direct chats": "Direct chats", "Unmute": "Unmute", @@ -394,11 +417,11 @@ "numbullet": "numbullet", "Markdown is disabled": "Markdown is disabled", "Markdown is enabled": "Markdown is enabled", - "Unpin Message": "Unpin Message", - "Jump to message": "Jump to message", "No pinned messages.": "No pinned messages.", "Loading...": "Loading...", "Pinned Messages": "Pinned Messages", + "Unpin Message": "Unpin Message", + "Jump to message": "Jump to message", "%(duration)ss": "%(duration)ss", "%(duration)sm": "%(duration)sm", "%(duration)sh": "%(duration)sh", @@ -428,6 +451,7 @@ "Settings": "Settings", "Forget room": "Forget room", "Search": "Search", + "Share room": "Share room", "Show panel": "Show panel", "Drop here to favourite": "Drop here to favourite", "Drop here to tag direct chat": "Drop here to tag direct chat", @@ -531,29 +555,6 @@ "Scroll to unread messages": "Scroll to unread messages", "Jump to first unread message.": "Jump to first unread message.", "Close": "Close", - "Invalid alias format": "Invalid alias format", - "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias", - "Invalid address format": "Invalid address format", - "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address", - "not specified": "not specified", - "not set": "not set", - "Remote addresses for this room:": "Remote addresses for this room:", - "Addresses": "Addresses", - "The main address for this room is": "The main address for this room is", - "Local addresses for this room:": "Local addresses for this room:", - "This room has no local addresses": "This room has no local addresses", - "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)", - "Invalid community ID": "Invalid community ID", - "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID", - "Flair": "Flair", - "Showing flair for these communities:": "Showing flair for these communities:", - "This room is not showing flair for any communities": "This room is not showing flair for any communities", - "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)", - "You have enabled URL previews by default.": "You have enabled URL previews by default.", - "You have disabled URL previews by default.": "You have disabled URL previews by default.", - "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.", - "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.", - "URL Previews": "URL Previews", "Sunday": "Sunday", "Monday": "Monday", "Tuesday": "Tuesday", @@ -664,6 +665,7 @@ "Delete widget": "Delete widget", "Revoke widget access": "Revoke widget access", "Minimize apps": "Minimize apps", + "Reload widget": "Reload widget", "Popout widget": "Popout widget", "Picture": "Picture", "Edit": "Edit", @@ -856,6 +858,11 @@ "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)", "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.": "This will allow you to return to your account after signing out, and sign in on other devices.", + "Share Room": "Share Room", + "Link to most recent message": "Link to most recent message", + "Share User": "Share User", + "Share Community": "Share Community", + "COPY": "COPY", "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.", "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.", "Room contains unknown devices": "Room contains unknown devices", diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index 909b466da3..fe9d3db424 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -1170,20 +1170,13 @@ "Enable widget screenshots on supported widgets": "Gaitu trepeten pantaila-argazkiak onartzen duten trepetetan", "Send analytics data": "Bidali datu analitikoak", "Muted Users": "Mutututako erabiltzaileak", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du. (Ikusi gure Cookie eta pribatutasun politikak).", - "Help improve Riot by sending usage data? This will use a cookie.": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du.", - "Yes please": "Bai mesedez", "Warning: This widget might use cookies.": "Abisua: Trepeta honek cookie-ak erabili litzake.", "Terms and Conditions": "Termino eta baldintzak", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)s hasiera-zerbitzaria erabiltzen jarraitzeko gure termino eta baldintzak irakurri eta onartu behar dituzu.", "Review terms and conditions": "Irakurri termino eta baldintzak", "Failed to indicate account erasure": "Ezin izan da kontuaren ezabaketa jakinarazi", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Honek zure kontua betiko erabilgaitz bihurtuko du. Ezin izango duzu saioa hasi, eta beste inork ezin izango du erabiltzaile ID bera erabili. Ez dago ekintza hau desegiterik.", - "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "Zure kontua desaktibatzean ez dira lehenetsita zuk bidalitako mezuak ezabatuko. Zuk bidalitako mezuak ezabatu nahi badituzu, markatu beheko kutxa.", - "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna, e-mail mezuen antzekoa da. Zure mezuak ezabatzeak esan nahi du bidali dituzun mezuak ez direla erabiltzaile berriekin partekatuko, baina aurretik zure mezuak jaso dituzten erabiltzaile erregistratuek bere kopia izango dute.", "To continue, please enter your password:": "Jarraitzeko, sartu zure pasahitza:", "password": "pasahitza", - "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Ezabatu bidali ditudan mezu guztiak nire kontua desaktibatzean. (Abisua: Etorkizuneko erabiltzaileek elkarrizketa partzialak ikusiko dituzte, esperientzia kaskarra sortuz).", "e.g. %(exampleValue)s": "adib. %(exampleValue)s", "Reload widget": "Birkargatu trepeta", "To notify everyone in the room, you must be a": "Gelan dauden guztiei jakinarazteko", diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 8dd45192e6..367e89d2b6 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -1169,25 +1169,17 @@ "Collapse Reply Thread": "Dévoiler le fil de réponse", "Enable widget screenshots on supported widgets": "Activer les captures d'écran des widgets pris en charge", "Send analytics data": "Envoyer les données analytiques", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie. (Voir nos politiques de cookie et de confidentialité).", - "Help improve Riot by sending usage data? This will use a cookie.": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie.", - "Yes please": "Oui, s'il vous plaît", "Muted Users": "Utilisateurs ignorés", "Warning: This widget might use cookies.": "Avertissement : ce widget utilise peut-être des cookies.", "Terms and Conditions": "Conditions générales", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Pour continuer à utiliser le serveur d'accueil %(homeserverDomain)s, vous devez lire et accepter nos conditions générales.", "Review terms and conditions": "Voir les conditions générales", "Failed to indicate account erasure": "Échec de notification de la suppression du compte", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Cela rendra votre compte inutilisable de façon permanente. Vous ne pourrez plus vous connecter et ne pourrez plus vous enregistrer avec le même identifiant d'utilisateur. Cette action est irréversible.", - "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "Désactiver votre compte ne supprime pas les messages que vous avez envoyés par défaut. Si vous souhaitez supprimer vos messages, cochez la case ci-dessous.", - "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Supprimer vos messages signifie que les messages que vous avez envoyés ne seront pas partagés avec de nouveaux utilisateurs ou les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à vos messages continueront d'en avoir une copie.", "To continue, please enter your password:": "Pour continuer, veuillez renseigner votre mot de passe :", "password": "mot de passe", - "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Veuillez supprimer tous les messages que j'ai envoyé quand mon compte est désactivé. (Attention : les futurs utilisateurs verront alors des conversations incomplètes, ce qui est une mauvaise expérience).", "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous reconnecter et personne ne pourra se réenregistrer avec le même identifiant d'utilisateur. Votre compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d'identité. Cette action est irréversible.", "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "La désactivation du compte ne nous fait pas oublier les messages que vous avez envoyés par défaut. Si vous souhaitez que nous les oubliions, cochez la case ci-dessous.", "e.g. %(exampleValue)s": "par ex. %(exampleValue)s", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Cela utilisera un cookie. (Voir nos politiques de cookie et de confidentialité).", "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.", "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (Avertissement : les futurs utilisateurs verront des conversations incomplètes)", "Reload widget": "Recharger le widget", diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 6b52958ea6..3d8100d8f1 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1169,27 +1169,19 @@ "Collapse Reply Thread": "Beszélgetés szál becsukása", "Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott ott képernyőkép készítés engedélyezése", "Send analytics data": "Analitikai adatok küldése", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ. (Nézd meg a sütikről és titoktartási irányelvekről szóló leírást).", - "Help improve Riot by sending usage data? This will use a cookie.": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ.", - "Yes please": "Igen, kérlek", "Muted Users": "Elnémított felhasználók", "Warning: This widget might use cookies.": "Figyelmeztetés: Ez a kisalkalmazás sütiket (cookies) használhat.", "Terms and Conditions": "Általános Szerződési Feltételek", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "A %(homeserverDomain)s szerver használatának folytatásához el kell olvasnod és el kell fogadnod az általános szerződési feltételeket.", "Review terms and conditions": "Általános Szerződési Feltételek elolvasása", "Failed to indicate account erasure": "A fiók törlésének jelzése sikertelen", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Ezzel a felhasználói fiókod végleg használhatatlanná válik. Nem tudsz bejelentkezni, és senki más sem fog tudni újra regisztrálni ugyanezzel az azonosítóval. Ez a művelet visszafordíthatatlan.", - "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "A felhasználói fiók felfüggesztése alapértelmezetten nem töröli semelyik általad küldött üzenetet. Ha az elküldött üzeneteidet törölni szeretnéd pipáld be a jelölőnégyzetet alul.", - "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban olyan mint az e-mail. Az üzeneted törlése azt jelenti, hogy amit elküldtél már nem lesz megosztva új- vagy vendég felhasználóval, de azok a regisztrált felhasználók akik már látták az üzenetet továbbra is hozzáférnek a saját példányukhoz.", "To continue, please enter your password:": "Folytatáshoz add meg a jelszavad:", "password": "jelszó", - "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Töröld az összes üzenetet amit küldtem amikor felfüggeszted a felhasználói fiókomat. (Figyelem: ezzel a jövőbeni felhasználók csak részleges beszélgetést láthatnak majd, ami rosszul eshet).", "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Ez végleg használhatatlanná teszi a fiókodat. Ezután nem fogsz tudni bejelentkezni, és más sem tud majd ezzel az azonosítóval fiókot létrehozni. Minden szobából amibe beléptél ki fogsz lépni, és törölni fogja minden fiók adatod az \"identity\" szerverről. Ez a művelet visszafordíthatatlan.", "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "A fiókod felfüggesztése nem jelenti alapértelmezetten azt, hogy az általad küldött üzenetek elfelejtődnek. Ha törölni szeretnéd az általad küldött üzeneteket, pipáld be a jelölőnégyzetet alul.", "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban hasonlít az emailhez. Az általad küldött üzenet törlése azt jelenti, hogy nem osztjuk meg új-, vagy vendég felhasználóval de a már regisztrált felhasználók akik már hozzáfértek az üzenethez továbbra is elérik a saját másolatukat.", "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (Figyelem: ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)", "e.g. %(exampleValue)s": "pl. %(exampleValue)s", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Segítesz jobbá tenni a Riotot használati adat küldésével? Ez sütit (cookie) fog használni. (Nézd meg az Általános Szerződési Feltételeket).", "Reload widget": "Kisalkalmazás újratöltése", "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Kérlek segíts javítani a Riot.im-et azzal, hogy anonim felhasználási adatokat küldesz. Ez szütit (cookie) fog használni (lásd a sütire vonatkozó szabályozásunkat).", "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Kérlek segíts javítani a Riot.im-et azzal, hogy anonim felhasználási adatokat küldesz. Ez szütit (cookie) fog használni.", diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index fa22725f78..c73dc8b60d 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -1159,9 +1159,6 @@ "Refresh": "Aggiorna", "We encountered an error trying to restore your previous session.": "Abbiamo riscontrato un errore tentando di ripristinare la tua sessione precedente.", "Send analytics data": "Invia dati statistici", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie. (Vedi la nostra politica sui cookie e sulla privacy).", - "Help improve Riot by sending usage data? This will use a cookie.": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie.", - "Yes please": "Sì grazie", "Clear Storage and Sign Out": "Elimina lo storage e disconnetti", "Send Logs": "Invia i log", "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Eliminare lo storage del browser potrebbe risolvere il problema, ma verrai disconnesso e la cronologia delle chat criptate sarà illeggibile.", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index 9d7f8901ab..2bdce2fe4f 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -1167,16 +1167,12 @@ "Enable widget screenshots on supported widgets": "Включить скриншоты виджета в поддерживаемых виджетах", "Collapse Reply Thread": "Ответить с цитированием", "Send analytics data": "Отправить данные аналитики", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie. (См. наши политики cookie и конфиденциальности).", - "Help improve Riot by sending usage data? This will use a cookie.": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie.", - "Yes please": "Да, пожалуйста", "Muted Users": "Приглушенные пользователи", "Warning: This widget might use cookies.": "Внимание: этот виджет может использовать cookie.", "Terms and Conditions": "Условия и положения", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Для продолжения использования сервера %(homeserverDomain)s вы должны ознакомиться и принять условия и положения.", "Review terms and conditions": "Просмотр условий и положений", "e.g. %(exampleValue)s": "напр. %(exampleValue)s", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Помогите улучшить Riot, отправляя данные использования? Будут использоваться файлы cookie. (Смотрите наши политики cookie и конфиденциальности).", "Failed to indicate account erasure": "Не удается удалить учетную запись", "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Это навсегда сделает вашу учетную запись невозможной для использования. Вы не сможете войти в систему, и никто не сможет перерегистрировать тот же идентификатор пользователя. Это приведет к тому, что ваша учетная запись выйдет из всех комнат, в которые она входит, и будут удалены данные вашей учетной записи с сервера идентификации. Это действие необратимо.", "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "По умолчанию деактивация вашей учетной записи не приведет к удалению всех ваших сообщений. Если вы хотите, чтобы мы удалили ваши сообщения, поставьте отметку в поле ниже.", diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index 8e5d8e2f21..ff64f1a8e6 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -901,8 +901,6 @@ "This setting cannot be changed later!": "Den här inställningen kan inte ändras senare!", "Unknown error": "Okänt fel", "Incorrect password": "Felaktigt lösenord", - "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Detta kommer att göra ditt konto permanent oanvändbart. Du kommer inte att kunna registrera samma användar-ID igen.", - "This action is irreversible.": "Denna åtgärd går inte att ångra.", "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "För att verifiera att denna enhet kan litas på, vänligen kontakta ägaren på annat sätt (t ex personligen eller med ett telefonsamtal) och fråga om nyckeln ägaren har i sina användarinställningar för enheten matchar nyckeln nedan:", "Device name": "Enhetsnamn", "Device key": "Enhetsnyckel", diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 80dce1cc2d..95424eaefb 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -1170,9 +1170,6 @@ "Enable widget screenshots on supported widgets": "在支援的小工具上啟用小工具螢幕快照", "Send analytics data": "傳送分析資料", "Muted Users": "已靜音的使用者", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。（參見我們的 cookie 與隱私政策）。", - "Help improve Riot by sending usage data? This will use a cookie.": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。", - "Yes please": "好的，請", "e.g. %(exampleValue)s": "範例：%(exampleValue)s", "Reload widget": "重新載入小工具", "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "請透過傳送匿名使用資料來協助改善 Riot.im。這將會使用 cookie（請參見我們的 Cookie 政策）。", From 18546dbe06b86955b89a27dca5b29a3d3621bf11 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 11:33:38 +0100 Subject: [PATCH 039/283] QR Code align [m] logo Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/ShareDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js index 8bfa0ad931..a88052ee6d 100644 --- a/src/components/views/dialogs/ShareDialog.js +++ b/src/components/views/dialogs/ShareDialog.js @@ -186,7 +186,7 @@ export default class ShareDialog extends React.Component {

QR Code

- +
From 093400681700c7c441cde55f3a22900a5ebb5635 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Tue, 12 Jun 2018 14:13:09 +0100 Subject: [PATCH 040/283] Track decryption success/failure rate with piwik Emit a piwik event when a decryption occurs in the category "E2E" with the action "Decryption result" and the name either "failure" or "success". NB: This will cause Riot to a lot of networking when decrypting many events. One HTTP request per decrypted event should be expected. --- src/components/structures/MatrixChat.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index bd8f66163f..d4969a8bf9 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1308,6 +1308,15 @@ export default React.createClass({ } }); + // XXX: This will do a HTTP request for each Event.decrypted event + cli.on("Event.decrypted", (e) => { + if (e.isDecryptionFailure()) { + Analytics.trackEvent('E2E', 'Decryption result', 'failure'); + } else { + Analytics.trackEvent('E2E', 'Decryption result', 'success'); + } + }); + const krh = new KeyRequestHandler(cli); cli.on("crypto.roomKeyRequest", (req) => { krh.handleKeyRequest(req); From 334dccbdc78597aa071762267a55447a61686dcd Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 12 Jun 2018 14:14:14 +0100 Subject: [PATCH 041/283] Released js-sdk --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index f183f1635d..bb77fcb92b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.12.2", + "version": "0.12.7-rc.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6add75f972..581d25688a 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "linkifyjs": "^2.1.3", "lodash": "^4.13.1", "lolex": "2.3.2", - "matrix-js-sdk": "0.10.4-rc.1", + "matrix-js-sdk": "0.10.4", "optimist": "^0.6.1", "pako": "^1.0.5", "prop-types": "^15.5.8", From 0ad738d51044d9c92e73777d0dd79ded32118a23 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 12 Jun 2018 14:21:30 +0100 Subject: [PATCH 042/283] Prepare changelog for v0.12.7 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae8f535cb6..3b97251604 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.12.7](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.7) (2018-06-12) +===================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.7-rc.1...v0.12.7) + + * No changes since rc.1 + Changes in [0.12.7-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.7-rc.1) (2018-06-06) =============================================================================================================== [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.6...v0.12.7-rc.1) From ef1f580abbdb96446cf112f8206d776bdeb3e9c6 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 12 Jun 2018 14:21:30 +0100 Subject: [PATCH 043/283] v0.12.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 581d25688a..2984679bed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.12.7-rc.1", + "version": "0.12.7", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From 9b6c3f44ec03974665e4af77085f1a6b287237a1 Mon Sep 17 00:00:00 2001 From: Silke Date: Mon, 11 Jun 2018 20:27:41 +0000 Subject: [PATCH 044/283] Translated using Weblate (Dutch) Currently translated at 100.0% (1190 of 1190 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/ --- src/i18n/strings/nl.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index f09c63118e..130be0d344 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -64,7 +64,7 @@ "Active call (%(roomName)s)": "Actief gesprek (%(roomName)s)", "Add": "Toevoegen", "Add a topic": "Een onderwerp toevoegen", - "Admin Tools": "Beheerhulpmiddelen", + "Admin Tools": "Beheerdershulpmiddelen", "VoIP": "VoiP", "Missing Media Permissions, click here to request.": "Ontbrekende mediatoestemmingen, klik hier om aan te vragen.", "No Microphones detected": "Geen microfoons gevonden", @@ -410,7 +410,7 @@ "Tried to load a specific point in this room's timeline, but was unable to find it.": "Het is niet gelukt om een specifiek punt in de tijdlijn van deze ruimte te laden.", "Turn Markdown off": "Zet Markdown uit", "Turn Markdown on": "Zet Markdown aan", - "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s heeft eind-tot-eind versleuteling aangezet (algoritme %(algorithm)s).", + "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s heeft end-to-endbeveiliging aangezet (algoritme %(algorithm)s).", "Unable to add email address": "Niet mogelijk om e-mailadres toe te voegen", "Unable to remove contact information": "Niet mogelijk om contactinformatie te verwijderen", "Unable to verify email address.": "Niet mogelijk om het e-mailadres te verifiëren.", @@ -581,7 +581,7 @@ "Add User": "Gebruiker Toevoegen", "This Home Server would like to make sure you are not a robot": "Deze thuisserver wil er zeker van zijn dat je geen robot bent", "Sign in with CAS": "Inloggen met CAS", - "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Je kan de aangepaste server opties gebruiken om bij andere Matrix-servers in te loggen door een andere thuisserver-URL te specificeren.", + "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Je kan de alternatieve-serverinstellingen gebruiken om bij andere Matrix-servers in te loggen door een andere thuisserver-URL te specificeren.", "This allows you to use this app with an existing Matrix account on a different home server.": "Dit maakt het mogelijk om deze applicatie te gebruiken met een bestaand Matrix-account op een andere thuisserver.", "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Je kan ook een aangepaste identiteitsserver instellen maar dit zal waarschijnlijk interactie met gebruikers gebaseerd op een e-mailadres voorkomen.", "Please check your email to continue registration.": "Bekijk je e-mail om door te gaan met de registratie.", @@ -590,7 +590,7 @@ "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Als je geen e-mailadres specificeert zal je niet je wachtwoord kunnen resetten. Weet je het zeker?", "You are registering with %(SelectedTeamName)s": "Je registreert je met %(SelectedTeamName)s", "Default server": "Standaardserver", - "Custom server": "Aangepaste server", + "Custom server": "Alternatieve server", "Home server URL": "Thuisserver-URL", "Identity server URL": "Identiteitsserver-URL", "What does this mean?": "Wat betekent dit?", @@ -603,7 +603,7 @@ "URL Previews": "URL-Voorvertoningen", "Drop file here to upload": "Bestand hier laten vallen om te uploaden", " (unsupported)": " (niet ondersteund)", - "Ongoing conference call%(supportedText)s.": "Lopend vergaderingsgesprek %(supportedText)s.", + "Ongoing conference call%(supportedText)s.": "Lopend groepsgesprek%(supportedText)s.", "Online": "Online", "Idle": "Afwezig", "Offline": "Offline", @@ -759,7 +759,7 @@ "World readable": "Leesbaar voor iedereen", "Guests can join": "Gasten kunnen toetreden", "Remove avatar": "Avatar verwijderen", - "To change the room's avatar, you must be a": "Om de avatar van de ruimte te verwijderen, moet het volgende zijn:", + "To change the room's avatar, you must be a": "Om de avatar van de ruimte te verwijderen, moet je het volgende zijn:", "Drop here to favourite": "Hier laten vallen om aan favorieten toe te voegen", "Drop here to tag direct chat": "Hier laten vallen om als privégesprek te markeren", "Drop here to restore": "Hier laten vallen om te herstellen", @@ -923,7 +923,7 @@ "This Home server does not support communities": "Deze Thuisserver ondersteunt geen gemeenschappen", "Failed to load %(groupId)s": "Het is niet gelukt om %(groupId)s te laden", "Old cryptography data detected": "Oude cryptografie gegevens gedetecteerd", - "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Er zijn gegevens van een oudere versie van Riot gedetecteerd. Dit zal eind-tot-eind versleuteling laten storen in de oudere versie. Eind-tot-eind berichten dat recent zijn uitgewisseld zal misschien niet ontsleutelbaar zijn in deze versie. Dit zou er misschien ook voor kunnen zorgen dat berichten die zijn uitgewisseld in deze versie falen. Indien je problemen ervaart, log opnieuw in. Om de berichtgeschiedenis te behouden, exporteer de sleutels en importeer ze achteraf weer.", + "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Er zijn gegevens van een oudere versie van Riot gedetecteerd. Dit verstoorde end-to-endbeveiliging in de oude versie. End-to-endbeveiligde berichten die recent uitgewisseld zijn met de oude versie zijn wellicht niet te ontsleutelen in deze versie. Dit zou er ook voor kunnen zorgen dat berichten die zijn uitgewisseld in deze versie falen. Log opnieuw in als je problemen ervaart. Exporteer de sleutels en importeer ze achteraf weer om de berichtgeschiedenis te behouden.", "Your Communities": "Jouw Gemeenschappen", "Error whilst fetching joined communities": "Er is een fout opgetreden tijdens het ophalen van de gemeenschappen waar je lid van bent", "Create a new community": "Maak een nieuwe gemeenschap aan", @@ -1166,7 +1166,7 @@ "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Help Riot.im te verbeteren door het versturen van anonieme gebruiksgegevens. Dit zal een cookie gebruiken.", "Yes, I want to help!": "Ja, ik wil helpen!", "Warning: This widget might use cookies.": "Waarschuwing: deze widget gebruikt misschien cookies.", - "Popout widget": "Opspringende widget", + "Popout widget": "Widget in nieuw venster openen", "Picture": "Afbeelding", "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Niet mogelijk om de gebeurtenis te laden waar op gereageerd was. Het kan zijn dat het niet bestaat of dat je niet toestemming hebt om het te bekijken.", "Riot bugs are tracked on GitHub: create a GitHub issue.": "Riot fouten worden bijgehouden op GitHub: maak een GitHub melding.", From 848052bb808d82885ec7993e5b351f39c6af4de8 Mon Sep 17 00:00:00 2001 From: strix aluco Date: Sun, 10 Jun 2018 02:40:40 +0000 Subject: [PATCH 045/283] Translated using Weblate (Ukrainian) Currently translated at 23.6% (281 of 1190 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/ --- src/i18n/strings/uk.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json index 74bf855d22..b454c02884 100644 --- a/src/i18n/strings/uk.json +++ b/src/i18n/strings/uk.json @@ -94,7 +94,7 @@ "Register": "Зарегіструватись", "Rooms": "Кімнати", "Add rooms to this community": "Добавити кімнати в це суспільство", - "This email address is already in use": "Ця адреса елект. почти вже використовується", + "This email address is already in use": "Ця е-пошта вже використовується", "This phone number is already in use": "Цей телефонний номер вже використовується", "Fetching third party location failed": "Не вдалось отримати стороннє місцеперебування", "Messages in one-to-one chats": "Повідомлення у чатах \"сам на сам\"", @@ -270,5 +270,15 @@ "Your language of choice": "Обрана мова", "Which officially provided instance you are using, if any": "Яким офіційно наданим примірником ви користуєтесь (якщо користуєтесь)", "Whether or not you're using the Richtext mode of the Rich Text Editor": "Чи використовуєте ви режим Richtext у редакторі Rich Text Editor", - "Your homeserver's URL": "URL адреса вашого домашнього серверу" + "Your homeserver's URL": "URL адреса вашого домашнього серверу", + "Failed to verify email address: make sure you clicked the link in the email": "Не вдалось перевірити адресу е-пошти: переконайтесь, що ви перейшли за посиланням у листі", + "The platform you're on": "Використовувана платформа", + "Your identity server's URL": "URL адреса серверу ідентифікації", + "e.g. %(exampleValue)s": "напр. %(exampleValue)s", + "Every page you use in the app": "Кожна використовувана у застосунку сторінка", + "e.g. ": "напр. ", + "Your User Agent": "Ваш користувацький агент", + "Your device resolution": "Роздільність вашого пристрою", + "Analytics": "Аналітика", + "The information being sent to us to help make Riot.im better includes:": "Надсилана інформація, що допомагає нам покращити Riot.im, вміщує:" } From c820836bcc1c95d0fb292f47ecb377e602f5b9ee Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 15:22:45 +0100 Subject: [PATCH 046/283] make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../GroupInviteTileContextMenu.js | 87 ++++++++++++++++ .../views/groups/GroupInviteTile.js | 98 +++++++++++++++++-- src/components/views/rooms/RoomList.js | 3 +- src/components/views/rooms/RoomTile.js | 4 +- src/components/views/rooms/RoomTooltip.js | 25 ++--- 5 files changed, 189 insertions(+), 28 deletions(-) create mode 100644 src/components/views/context_menus/GroupInviteTileContextMenu.js diff --git a/src/components/views/context_menus/GroupInviteTileContextMenu.js b/src/components/views/context_menus/GroupInviteTileContextMenu.js new file mode 100644 index 0000000000..844845ea82 --- /dev/null +++ b/src/components/views/context_menus/GroupInviteTileContextMenu.js @@ -0,0 +1,87 @@ +/* +Copyright 2018 Vector Creations 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 React from 'react'; +import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import sdk from '../../../index'; +import { _t, _td } from '../../../languageHandler'; +import Modal from '../../../Modal'; +import {Group} from 'matrix-js-sdk'; +import GroupStore from "../../../stores/GroupStore"; + +export default class GroupInviteTileContextMenu extends React.Component { + static propTypes = { + group: PropTypes.instanceOf(Group).isRequired, + /* callback called when the menu is dismissed */ + onFinished: PropTypes.func, + }; + + constructor(props, context) { + super(props, context); + + this._onClickReject = this._onClickReject.bind(this); + } + + componentWillMount() { + this._unmounted = false; + } + + componentWillUnmount() { + this._unmounted = true; + } + + _onClickReject() { + const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog'); + Modal.createTrackedDialog('Reject community invite', '', QuestionDialog, { + title: _t('Reject invitation'), + description: _t('Are you sure you want to reject the invitation?'), + onFinished: async (shouldLeave) => { + if (!shouldLeave) return; + + // FIXME: controller shouldn't be loading a view :( + const Loader = sdk.getComponent("elements.Spinner"); + const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner'); + + try { + await GroupStore.leaveGroup(this.props.group.groupId); + } catch (e) { + console.error(e); + const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); + Modal.createTrackedDialog('Error rejecting invite', '', ErrorDialog, { + title: _t("Error"), + description: _t("Unable to reject invite"), + }); + } + modal.close(); + }, + }); + + // Close the context menu + if (this.props.onFinished) { + this.props.onFinished(); + } + } + + render() { + return
+
+ + { _t('Reject') } +
+
; + } +} diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js index d97464e8ca..65e8a07d5a 100644 --- a/src/components/views/groups/GroupInviteTile.js +++ b/src/components/views/groups/GroupInviteTile.js @@ -1,5 +1,5 @@ /* -Copyright 2017 New Vector Ltd +Copyright 2017, 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,6 +20,8 @@ import { MatrixClient } from 'matrix-js-sdk'; import sdk from '../../../index'; import dis from '../../../dispatcher'; import AccessibleButton from '../elements/AccessibleButton'; +import * as ContextualMenu from "../../structures/ContextualMenu"; +import classNames from 'classnames'; export default React.createClass({ displayName: 'GroupInviteTile', @@ -32,6 +34,15 @@ export default React.createClass({ matrixClient: PropTypes.instanceOf(MatrixClient), }, + getInitialState: function() { + return ({ + hover: false, + badgeHover: false, + menuDisplayed: false, + selected: this.props.group.groupId === null, // XXX: this needs linking to LoggedInView/GroupView state + }); + }, + onClick: function(e) { dis.dispatch({ action: 'view_group', @@ -39,6 +50,56 @@ export default React.createClass({ }); }, + onMouseEnter: function() { + const state = {hover: true}; + // Only allow non-guests to access the context menu + if (!this.context.matrixClient.isGuest()) { + state.badgeHover = true; + } + this.setState(state); + }, + + onMouseLeave: function() { + this.setState({ + badgeHover: false, + hover: false, + }); + }, + + onBadgeClicked: function(e) { + // Prevent the RoomTile onClick event firing as well + e.stopPropagation(); + + // Only allow none guests to access the context menu + if (this.context.matrixClient.isGuest()) return; + + // If the badge is clicked, then no longer show tooltip + if (this.props.collapsed) { + this.setState({ hover: false }); + } + + const RoomTileContextMenu = sdk.getComponent('context_menus.GroupInviteTileContextMenu'); + const elementRect = e.target.getBoundingClientRect(); + + // The window X and Y offsets are to adjust position when zoomed in to page + const x = elementRect.right + window.pageXOffset + 3; + const chevronOffset = 12; + let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset); + y = y - (chevronOffset + 8); // where 8 is half the height of the chevron + + ContextualMenu.createMenu(RoomTileContextMenu, { + chevronOffset: chevronOffset, + left: x, + top: y, + group: this.props.group, + onFinished: () => { + this.setState({ menuDisplayed: false }); + // this.props.refreshSubList(); + }, + }); + this.setState({ menuDisplayed: true }); + }, + render: function() { const BaseAvatar = sdk.getComponent('avatars.BaseAvatar'); const EmojiText = sdk.getComponent('elements.EmojiText'); @@ -49,19 +110,37 @@ export default React.createClass({ const av = ; - const label = + const nameClasses = classNames({ + 'mx_RoomTile_name': true, + 'mx_RoomTile_invite': this.props.isInvite, + 'mx_RoomTile_badgeShown': this.state.badgeHover || this.state.menuDisplayed, + }); + + const label = { groupName } ; - const badge =
!
; + const badgeEllipsis = this.state.badgeHover || this.state.menuDisplayed; + const badgeClasses = classNames('mx_RoomSubList_badge mx_RoomSubList_badgeHighlight', { + 'mx_RoomTile_badgeButton': badgeEllipsis, + }); + + const badgeContent = badgeEllipsis ? '\u00B7\u00B7\u00B7' : '!'; + const badge =
{ badgeContent }
; + + let tooltip; + if (this.props.collapsed && this.state.hover) { + const RoomTooltip = sdk.getComponent("rooms.RoomTooltip"); + tooltip = ; + } + + const classes = classNames('mx_RoomTile mx_RoomTile_highlight', { + 'mx_RoomTile_menuDisplayed': this.state.menuDisplayed, + 'mx_RoomTile_selected': this.state.selected, + }); return ( - +
{ av }
@@ -69,6 +148,7 @@ export default React.createClass({ { label } { badge }
+ { tooltip } ); }, diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js index fc1872249f..2722bad88b 100644 --- a/src/components/views/rooms/RoomList.js +++ b/src/components/views/rooms/RoomList.js @@ -589,8 +589,7 @@ module.exports = React.createClass({ const GroupInviteTile = sdk.getComponent('groups.GroupInviteTile'); for (const group of MatrixClientPeg.get().getGroups()) { if (group.myMembership !== 'invite') continue; - - ret.push(); + ret.push(); } return ret; diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js index 05aaf79e0b..11eb2090f2 100644 --- a/src/components/views/rooms/RoomTile.js +++ b/src/components/views/rooms/RoomTile.js @@ -301,7 +301,7 @@ module.exports = React.createClass({ } } else if (this.state.hover) { const RoomTooltip = sdk.getComponent("rooms.RoomTooltip"); - tooltip = ; + tooltip = ; } //var incomingCallBox; @@ -314,7 +314,7 @@ module.exports = React.createClass({ let directMessageIndicator; if (this._isDirectMessageRoom(this.props.room.roomId)) { - directMessageIndicator = dm; + directMessageIndicator = dm; } return diff --git a/src/components/views/rooms/RoomTooltip.js b/src/components/views/rooms/RoomTooltip.js index b17f54ef3c..bce0922637 100644 --- a/src/components/views/rooms/RoomTooltip.js +++ b/src/components/views/rooms/RoomTooltip.js @@ -14,11 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -'use strict'; -var React = require('react'); -var ReactDOM = require('react-dom'); -var dis = require('../../../dispatcher'); +import React from 'react'; +import ReactDOM from 'react-dom'; +import dis from '../../../dispatcher'; import classNames from 'classnames'; const MIN_TOOLTIP_HEIGHT = 25; @@ -77,25 +76,21 @@ module.exports = React.createClass({ }, _renderTooltip: function() { - var label = this.props.room ? this.props.room.name : this.props.label; - // Add the parent's position to the tooltips, so it's correctly // positioned, also taking into account any window zoom // NOTE: The additional 6 pixels for the left position, is to take account of the // tooltips chevron - var parent = ReactDOM.findDOMNode(this).parentNode; - var style = {}; + const parent = ReactDOM.findDOMNode(this).parentNode; + let style = {}; style = this._updatePosition(style); style.display = "block"; - const tooltipClasses = classNames( - "mx_RoomTooltip", this.props.tooltipClassName, - ); + const tooltipClasses = classNames("mx_RoomTooltip", this.props.tooltipClassName); - var tooltip = ( -
-
- { label } + const tooltip = ( +
+
+ { this.props.label }
); From 9dd2184b33720b44c34b29f8039652df02eb66ce Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 15:29:05 +0100 Subject: [PATCH 047/283] remove unused imports Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../views/context_menus/GroupInviteTileContextMenu.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/views/context_menus/GroupInviteTileContextMenu.js b/src/components/views/context_menus/GroupInviteTileContextMenu.js index 844845ea82..bbdc3a4244 100644 --- a/src/components/views/context_menus/GroupInviteTileContextMenu.js +++ b/src/components/views/context_menus/GroupInviteTileContextMenu.js @@ -15,10 +15,9 @@ limitations under the License. */ import React from 'react'; -import classNames from 'classnames'; import PropTypes from 'prop-types'; import sdk from '../../../index'; -import { _t, _td } from '../../../languageHandler'; +import { _t } from '../../../languageHandler'; import Modal from '../../../Modal'; import {Group} from 'matrix-js-sdk'; import GroupStore from "../../../stores/GroupStore"; From ed779cabc403145107110def3e3d5b29d432ebbb Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 15:34:35 +0100 Subject: [PATCH 048/283] add mx_filterFlipColor to mx_MemberInfo_cancel img Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/groups/GroupMemberInfo.js | 2 +- src/components/views/rooms/MemberInfo.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js index 4fed293bec..ca59075912 100644 --- a/src/components/views/groups/GroupMemberInfo.js +++ b/src/components/views/groups/GroupMemberInfo.js @@ -187,7 +187,7 @@ module.exports = React.createClass({ return (
- +
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js index 2789c0e4cd..75e6990120 100644 --- a/src/components/views/rooms/MemberInfo.js +++ b/src/components/views/rooms/MemberInfo.js @@ -902,7 +902,9 @@ module.exports = withMatrixClient(React.createClass({ return (
- + + +
From ffcba9498ec4281c4d308476764f5fdde64ea51e Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Tue, 12 Jun 2018 16:14:24 +0100 Subject: [PATCH 049/283] Keep context menus that extend downwards vertically on screen This fixes https://github.com/vector-im/riot-web/issues/3429 in the case of RoomList context menus *and* EventTile context menus. This was mostly stolen from #1903 and it would be good to factor things out at a later date such that #1903 is replaced with similar logic within ContextualMenu. --- src/components/structures/ContextualMenu.js | 37 +++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js index daac294d12..3e867ad384 100644 --- a/src/components/structures/ContextualMenu.js +++ b/src/components/structures/ContextualMenu.js @@ -63,6 +63,24 @@ export default class ContextualMenu extends React.Component { hasBackground: PropTypes.bool, } + constructor() { + super(); + this.state = { + contextMenuRect: null, + }; + + this.collectContextMenuRect = this.collectContextMenuRect.bind(this); + } + + collectContextMenuRect(element) { + // We don't need to clean up when unmounting, so ignore + if (!element) return; + + this.setState({ + contextMenuRect: element.getBoundingClientRect(), + }); + } + render() { const position = {}; let chevronFace = null; @@ -83,6 +101,9 @@ export default class ContextualMenu extends React.Component { chevronFace = 'right'; } + const contextMenuRect = this.state.contextMenuRect || null; + const padding = 10; + const chevronOffset = {}; if (props.chevronFace) { chevronFace = props.chevronFace; @@ -90,7 +111,19 @@ export default class ContextualMenu extends React.Component { if (chevronFace === 'top' || chevronFace === 'bottom') { chevronOffset.left = props.chevronOffset; } else { - chevronOffset.top = props.chevronOffset; + const target = position.top; + + // By default, no adjustment is made + let adjusted = target; + + // If we know the dimensions of the context menu, adjust its position + // such that it does not leave the (padded) window. + if (contextMenuRect) { + adjusted = Math.min(position.top, document.body.clientHeight - contextMenuRect.height - padding); + } + + position.top = adjusted; + chevronOffset.top = Math.max(props.chevronOffset, props.chevronOffset + target - adjusted); } // To override the default chevron colour, if it's been set @@ -154,7 +187,7 @@ export default class ContextualMenu extends React.Component { // FIXME: If a menu uses getDefaultProps it clobbers the onFinished // property set here so you can't close the menu from a button click! return
-
+
{ chevron }
From 6a382aa57c10bc8ef8817f054beac45ca34b72a1 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 12 Jun 2018 13:44:07 +0000 Subject: [PATCH 050/283] Translated using Weblate (Russian) Currently translated at 99.8% (1188 of 1190 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/ --- src/i18n/strings/ru.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index bc6b51a269..bed1cb3a21 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -1189,5 +1189,6 @@ "Reload widget": "Перезагрузить виджет", "To notify everyone in the room, you must be a": "Для уведомления всех в комнате, вы должны быть", "Can't leave Server Notices room": "Невозможно покинуть комнату сервера уведомлений", - "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната используется для важных сообщений от сервера, поэтому вы не можете ее покинуть." + "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната используется для важных сообщений от сервера, поэтому вы не можете ее покинуть.", + "Try the app first": "Сначала попробуйте приложение" } From 175f1aa15cc51f28d376d550cc76520830535806 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 16:43:54 +0100 Subject: [PATCH 051/283] don't set the displayname on registration as Synapse now does it Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/MatrixChat.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index bd8f66163f..50a1f70496 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1143,11 +1143,6 @@ export default React.createClass({ } else if (this._is_registered) { this._is_registered = false; - // Set the display name = user ID localpart - MatrixClientPeg.get().setDisplayName( - MatrixClientPeg.get().getUserIdLocalpart(), - ); - if (this.props.config.welcomeUserId && getCurrentLanguage().startsWith("en")) { createRoom({ dmUserId: this.props.config.welcomeUserId, From c1d375c3fd76b252b0e12a0e9636dde96d15d8b4 Mon Sep 17 00:00:00 2001 From: Osoitz Date: Sat, 2 Jun 2018 12:31:10 +0000 Subject: [PATCH 052/283] Translated using Weblate (Basque) Currently translated at 100.0% (1190 of 1190 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/ --- src/i18n/strings/eu.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index ac2187456e..b8ebdde7e4 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -1194,5 +1194,6 @@ "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ahaztean ez dizkiogu erabiltzaile berriei edo izena eman ez dutenei erakutsiko, baina jada zure mezuak jaso dituzten erregistratutako erabiltzaileen bere kopia izaten jarraituko dute.", "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Ahaztu bidali ditudan mezu guztiak kontua desaktibatzean (Abisua: Honekin etorkizuneko erabiltzaileek elkarrizketaren bertsio ez oso bat ikusiko dute)", "Can't leave Server Notices room": "Ezin zara Server Notices gelatik atera", - "This room is used for important messages from the Homeserver, so you cannot leave it.": "Gela hau mezu hasiera zerbitzariaren garrantzitsuak bidaltzeko erabiltzen da, eta ezin zara atera." + "This room is used for important messages from the Homeserver, so you cannot leave it.": "Gela hau mezu hasiera zerbitzariaren garrantzitsuak bidaltzeko erabiltzen da, eta ezin zara atera.", + "Try the app first": "Probatu aplikazioa aurretik" } From 18d542965de969331c527e6543a2fa60b91e5f6f Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Wed, 30 May 2018 12:53:39 +0000 Subject: [PATCH 053/283] Translated using Weblate (Bulgarian) Currently translated at 100.0% (1190 of 1190 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/ --- src/i18n/strings/bg.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json index e1709f1e0a..e9482f9b59 100644 --- a/src/i18n/strings/bg.json +++ b/src/i18n/strings/bg.json @@ -1187,5 +1187,6 @@ "Terms and Conditions": "Правила и условия", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "За да продължите да ползвате %(homeserverDomain)s е необходимо да прегледате и да се съгласите с правилата и условията за ползване.", "Review terms and conditions": "Прегледай правилата и условията", - "Failed to indicate account erasure": "Неуспешно указване на желанието за изтриване на акаунта" + "Failed to indicate account erasure": "Неуспешно указване на желанието за изтриване на акаунта", + "Try the app first": "Първо пробвайте приложението" } From b477d1d976a84d8a93090d7ed7ed6847b6c1bcd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Mon, 28 May 2018 06:49:16 +0000 Subject: [PATCH 054/283] Translated using Weblate (French) Currently translated at 100.0% (1190 of 1190 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ --- src/i18n/strings/fr.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index c3cfdef5fc..4518b92c61 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -1195,5 +1195,6 @@ "Yes, I want to help!": "Oui, je veux aider !", "Can't leave Server Notices room": "Impossible de quitter le salon des Annonces du serveur", "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d'accueil, donc vous ne pouvez pas en partir.", - "To notify everyone in the room, you must be a": "Pour notifier tout le monde dans le salon, vous devez être un(e)" + "To notify everyone in the room, you must be a": "Pour notifier tout le monde dans le salon, vous devez être un(e)", + "Try the app first": "Essayer d'abord l'application" } From 22bec0d67d6928afedeaca9be43b45c924d3f639 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 Jun 2018 09:13:32 +0100 Subject: [PATCH 055/283] allow CreateRoom to scale properly horizontally Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/css/views/dialogs/_CreateRoomDialog.scss | 5 +++++ src/components/views/dialogs/CreateRoomDialog.js | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/res/css/views/dialogs/_CreateRoomDialog.scss b/res/css/views/dialogs/_CreateRoomDialog.scss index 888f147d21..05d5bfcebf 100644 --- a/res/css/views/dialogs/_CreateRoomDialog.scss +++ b/res/css/views/dialogs/_CreateRoomDialog.scss @@ -23,6 +23,10 @@ limitations under the License. padding-bottom: 12px; } +.mx_CreateRoomDialog_input_container { + padding-right: 20px; +} + .mx_CreateRoomDialog_input { font-size: 15px; border-radius: 3px; @@ -30,4 +34,5 @@ limitations under the License. padding: 9px; color: $primary-fg-color; background-color: $primary-bg-color; + width: 100%; } diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js index 51693a19c9..3b5369e8f6 100644 --- a/src/components/views/dialogs/CreateRoomDialog.js +++ b/src/components/views/dialogs/CreateRoomDialog.js @@ -52,8 +52,8 @@ export default React.createClass({
-
- +
+

From 846c14062a424544d1aa9345c85778c17c6ba92f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 Jun 2018 09:28:35 +0100 Subject: [PATCH 056/283] show redacted stickers like other redacted messages Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/messages/MessageEvent.js | 3 ++- src/components/views/rooms/EventTile.js | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js index 38f55c9d70..babe1bbf29 100644 --- a/src/components/views/messages/MessageEvent.js +++ b/src/components/views/messages/MessageEvent.js @@ -69,7 +69,8 @@ module.exports = React.createClass({ if (msgtype && bodyTypes[msgtype]) { BodyType = bodyTypes[msgtype]; } else if (this.props.mxEvent.getType() === 'm.sticker') { - BodyType = sdk.getComponent('messages.MStickerBody'); + // if sticker is redacted, show UnknownBody otherwise it'll fall through to elif + BodyType = this.props.mxEvent.isRedacted() ? UnknownBody : sdk.getComponent('messages.MStickerBody'); } else if (content.url) { // Fallback to MFileBody if there's a content URL BodyType = bodyTypes['m.file']; diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index 589524bb9e..c43ddaad11 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -490,7 +490,7 @@ module.exports = withMatrixClient(React.createClass({ } const isSending = (['sending', 'queued', 'encrypting'].indexOf(this.props.eventSendStatus) !== -1); - const isRedacted = (eventType === 'm.room.message') && this.props.isRedacted; + const isRedacted = isMessageEvent(this.props.mxEvent) && this.props.isRedacted; const isEncryptionFailure = this.props.mxEvent.isDecryptionFailure(); const classes = classNames({ @@ -715,9 +715,15 @@ module.exports = withMatrixClient(React.createClass({ }, })); +// XXX this'll eventually be dynamic based on the fields once we have extensible event types +const messageTypes = ['m.room.message', 'm.sticker']; +function isMessageEvent(ev) { + return (messageTypes.includes(ev.getType())); +} + module.exports.haveTileForEvent = function(e) { // Only messages have a tile (black-rectangle) if redacted - if (e.isRedacted() && e.getType() !== 'm.room.message') return false; + if (e.isRedacted() && !isMessageEvent(e)) return false; const handler = getHandlerTile(e); if (handler === undefined) return false; From 20caea47f81aaa46ae04d9408b15da5b28374aa8 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 Jun 2018 09:32:21 +0100 Subject: [PATCH 057/283] make more generic Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/messages/MessageEvent.js | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js index babe1bbf29..c4d29257ff 100644 --- a/src/components/views/messages/MessageEvent.js +++ b/src/components/views/messages/MessageEvent.js @@ -62,18 +62,24 @@ module.exports = React.createClass({ 'm.audio': sdk.getComponent('messages.MAudioBody'), 'm.video': sdk.getComponent('messages.MVideoBody'), }; + const evTypes = { + 'm.sticker': sdk.getComponent('messages.MStickerBody'), + }; const content = this.props.mxEvent.getContent(); + const type = this.props.mxEvent.getType(); const msgtype = content.msgtype; let BodyType = UnknownBody; - if (msgtype && bodyTypes[msgtype]) { - BodyType = bodyTypes[msgtype]; - } else if (this.props.mxEvent.getType() === 'm.sticker') { - // if sticker is redacted, show UnknownBody otherwise it'll fall through to elif - BodyType = this.props.mxEvent.isRedacted() ? UnknownBody : sdk.getComponent('messages.MStickerBody'); - } else if (content.url) { - // Fallback to MFileBody if there's a content URL - BodyType = bodyTypes['m.file']; + if (!this.props.mxEvent.isRedacted()) { + // only resolve BodyType if event is not redacted + if (msgtype && bodyTypes[msgtype]) { + BodyType = bodyTypes[msgtype]; + } else if (type && evTypes[type]) { + BodyType = evTypes[type]; + } else if (content.url) { + // Fallback to MFileBody if there's a content URL + BodyType = bodyTypes['m.file']; + } } return Date: Wed, 13 Jun 2018 09:38:23 +0100 Subject: [PATCH 058/283] Only track decryption failures --- src/components/structures/MatrixChat.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index d4969a8bf9..b5c5efa230 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1311,9 +1311,7 @@ export default React.createClass({ // XXX: This will do a HTTP request for each Event.decrypted event cli.on("Event.decrypted", (e) => { if (e.isDecryptionFailure()) { - Analytics.trackEvent('E2E', 'Decryption result', 'failure'); - } else { - Analytics.trackEvent('E2E', 'Decryption result', 'success'); + Analytics.trackEvent('E2E', 'Decryption failure'); } }); From 230de44071196151fbc247f0a90a9b9954286d38 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Wed, 13 Jun 2018 09:38:57 +0100 Subject: [PATCH 059/283] Adjust comment --- src/components/structures/MatrixChat.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index b5c5efa230..c94baa63ef 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1309,6 +1309,7 @@ export default React.createClass({ }); // XXX: This will do a HTTP request for each Event.decrypted event + // if the decryption was a failure cli.on("Event.decrypted", (e) => { if (e.isDecryptionFailure()) { Analytics.trackEvent('E2E', 'Decryption failure'); From 8136069046db911f231d41f56b8d657a6cde94d2 Mon Sep 17 00:00:00 2001 From: Osoitz Date: Tue, 12 Jun 2018 21:55:54 +0000 Subject: [PATCH 060/283] Translated using Weblate (Basque) Currently translated at 100.0% (1190 of 1190 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/ --- src/i18n/strings/eu.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index b8ebdde7e4..1be59bdbd5 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -844,8 +844,8 @@ "were unbanned %(count)s times|one": "debekua kendu zaie", "was unbanned %(count)s times|other": "%(count)s aldiz kendu zaio debekua", "was unbanned %(count)s times|one": "debekua kendu zaio", - "were kicked %(count)s times|other": "%(count)s kanporatu zaie", - "were kicked %(count)s times|one": "kanporatu zaie", + "were kicked %(count)s times|other": "%(count)s aldiz kanporatu zaie", + "were kicked %(count)s times|one": "(r) kanporatu zaie", "was kicked %(count)s times|other": "%(count)s aldiz kanporatu zaio", "was kicked %(count)s times|one": "kanporatu zaio", "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s erabiltzaileek bere izena aldatu dute %(count)s aldiz", From 41be46a7120075b5792194bcdf2c56f6e9b240fa Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 Jun 2018 09:51:35 +0100 Subject: [PATCH 061/283] apply roomlist searchFilter to aliases if it begins with a `#` Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/RoomSubList.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js index fb82ee067b..17daa8553b 100644 --- a/src/components/structures/RoomSubList.js +++ b/src/components/structures/RoomSubList.js @@ -105,8 +105,15 @@ var RoomSubList = React.createClass({ applySearchFilter: function(list, filter) { if (filter === "") return list; + const lcFilter = filter.toLowerCase(); return list.filter((room) => { - return room.name && room.name.toLowerCase().indexOf(filter.toLowerCase()) >= 0 + if (room.name && room.name.toLowerCase().includes(lcFilter)) return true; + // only apply search filter to aliases if it looks like an alias (starts with `#`) + // to prevent loads of false positives with server names, e.g `matrix` + if (filter[0] === '#' && room.getAliases().some((alias) => { + return alias.toLowerCase().startsWith(lcFilter); + })) return true; + return false; }); }, From 1cb794753e4114c86132de7058d13a920fafe448 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 13 Jun 2018 10:39:52 +0100 Subject: [PATCH 062/283] Simplify & refactor some widget stuff * ScalarMessaging onMessage was getting the current room ID by listening for view_and remembering the room id or alias, and so having to look up the alias if it was alias. We have RoomViewStore for this. * Move waitForUserWidget into WidgetUtils * s/require/import/ --- src/ScalarMessaging.js | 193 +++++++++++++---------------------------- src/WidgetUtils.js | 46 ++++++++++ 2 files changed, 106 insertions(+), 133 deletions(-) diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js index 9457e6ccfb..dd3975dfe5 100644 --- a/src/ScalarMessaging.js +++ b/src/ScalarMessaging.js @@ -1,6 +1,7 @@ /* Copyright 2016 OpenMarket Ltd Copyright 2017 Vector Creations Ltd +Copyright 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -231,11 +232,12 @@ Example: } */ -const SdkConfig = require('./SdkConfig'); -const MatrixClientPeg = require("./MatrixClientPeg"); -const MatrixEvent = require("matrix-js-sdk").MatrixEvent; -const dis = require("./dispatcher"); -const Widgets = require('./utils/widgets'); +import SdkConfig from './SdkConfig'; +import MatrixClientPeg from './MatrixClientPeg'; +import { MatrixEvent } from 'matrix-js-sdk'; +import dis from './dispatcher'; +import Widgets from './utils/widgets'; +import RoomViewStore from './stores/RoomViewStore'; import { _t } from './languageHandler'; function sendResponse(event, res) { @@ -286,51 +288,6 @@ function inviteUser(event, roomId, userId) { }); } -/** - * Returns a promise that resolves when a widget with the given - * ID has been added as a user widget (ie. the accountData event - * arrives) or rejects after a timeout - * - * @param {string} widgetId The ID of the widget to wait for - * @param {boolean} add True to wait for the widget to be added, - * false to wait for it to be deleted. - * @returns {Promise} that resolves when the widget is available - */ -function waitForUserWidget(widgetId, add) { - return new Promise((resolve, reject) => { - const currentAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets'); - - // Tests an account data event, returning true if it's in the state - // we're waiting for it to be in - function eventInIntendedState(ev) { - if (!ev || !currentAccountDataEvent.getContent()) return false; - if (add) { - return ev.getContent()[widgetId] !== undefined; - } else { - return ev.getContent()[widgetId] === undefined; - } - } - - if (eventInIntendedState(currentAccountDataEvent)) { - resolve(); - return; - } - - function onAccountData(ev) { - if (eventInIntendedState(currentAccountDataEvent)) { - MatrixClientPeg.get().removeListener('accountData', onAccountData); - clearTimeout(timerId); - resolve(); - } - } - const timerId = setTimeout(() => { - MatrixClientPeg.get().removeListener('accountData', onAccountData); - reject(new Error("Timed out waiting for widget ID " + widgetId + " to appear")); - }, 10000); - MatrixClientPeg.get().on('accountData', onAccountData); - }); -} - function setWidget(event, roomId) { const widgetId = event.data.widget_id; const widgetType = event.data.type; @@ -637,19 +594,6 @@ function returnStateEvent(event, roomId, eventType, stateKey) { sendResponse(event, stateEvent.getContent()); } -let currentRoomId = null; -let currentRoomAlias = null; - -// Listen for when a room is viewed -dis.register(onAction); -function onAction(payload) { - if (payload.action !== "view_room") { - return; - } - currentRoomId = payload.room_id; - currentRoomAlias = payload.room_alias; -} - const onMessage = function(event) { if (!event.origin) { // stupid chrome event.origin = event.originalEvent.origin; @@ -700,80 +644,63 @@ const onMessage = function(event) { return; } } - let promise = Promise.resolve(currentRoomId); - if (!currentRoomId) { - if (!currentRoomAlias) { - sendError(event, _t('Must be viewing a room')); - return; - } - // no room ID but there is an alias, look it up. - console.log("Looking up alias " + currentRoomAlias); - promise = MatrixClientPeg.get().getRoomIdForAlias(currentRoomAlias).then((res) => { - return res.room_id; - }); + + if (roomId !== RoomViewStore.getRoomId()) { + sendError(event, _t('Room %(roomId)s not visible', {roomId: roomId})); + return; } - promise.then((viewingRoomId) => { - if (roomId !== viewingRoomId) { - sendError(event, _t('Room %(roomId)s not visible', {roomId: roomId})); - return; - } + // Get and set room-based widgets + if (event.data.action === "get_widgets") { + getWidgets(event, roomId); + return; + } else if (event.data.action === "set_widget") { + setWidget(event, roomId); + return; + } - // Get and set room-based widgets - if (event.data.action === "get_widgets") { - getWidgets(event, roomId); - return; - } else if (event.data.action === "set_widget") { - setWidget(event, roomId); - return; - } + // These APIs don't require userId + if (event.data.action === "join_rules_state") { + getJoinRules(event, roomId); + return; + } else if (event.data.action === "set_plumbing_state") { + setPlumbingState(event, roomId, event.data.status); + return; + } else if (event.data.action === "get_membership_count") { + getMembershipCount(event, roomId); + return; + } else if (event.data.action === "get_room_enc_state") { + getRoomEncState(event, roomId); + return; + } else if (event.data.action === "can_send_event") { + canSendEvent(event, roomId); + return; + } - // These APIs don't require userId - if (event.data.action === "join_rules_state") { - getJoinRules(event, roomId); - return; - } else if (event.data.action === "set_plumbing_state") { - setPlumbingState(event, roomId, event.data.status); - return; - } else if (event.data.action === "get_membership_count") { - getMembershipCount(event, roomId); - return; - } else if (event.data.action === "get_room_enc_state") { - getRoomEncState(event, roomId); - return; - } else if (event.data.action === "can_send_event") { - canSendEvent(event, roomId); - return; - } - - if (!userId) { - sendError(event, _t('Missing user_id in request')); - return; - } - switch (event.data.action) { - case "membership_state": - getMembershipState(event, roomId, userId); - break; - case "invite": - inviteUser(event, roomId, userId); - break; - case "bot_options": - botOptions(event, roomId, userId); - break; - case "set_bot_options": - setBotOptions(event, roomId, userId); - break; - case "set_bot_power": - setBotPower(event, roomId, userId, event.data.level); - break; - default: - console.warn("Unhandled postMessage event with action '" + event.data.action +"'"); - break; - } - }, (err) => { - console.error(err); - sendError(event, _t('Failed to lookup current room') + '.'); - }); + if (!userId) { + sendError(event, _t('Missing user_id in request')); + return; + } + switch (event.data.action) { + case "membership_state": + getMembershipState(event, roomId, userId); + break; + case "invite": + inviteUser(event, roomId, userId); + break; + case "bot_options": + botOptions(event, roomId, userId); + break; + case "set_bot_options": + setBotOptions(event, roomId, userId); + break; + case "set_bot_power": + setBotPower(event, roomId, userId, event.data.level); + break; + default: + console.warn("Unhandled postMessage event with action '" + event.data.action +"'"); + break; + } }; let listenerCount = 0; diff --git a/src/WidgetUtils.js b/src/WidgetUtils.js index 10cd473904..c6816d28b6 100644 --- a/src/WidgetUtils.js +++ b/src/WidgetUtils.js @@ -1,5 +1,6 @@ /* Copyright 2017 Vector Creations Ltd +Copyright 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -90,4 +91,49 @@ export default class WidgetUtils { } return false; } + + /** + * Returns a promise that resolves when a widget with the given + * ID has been added as a user widget (ie. the accountData event + * arrives) or rejects after a timeout + * + * @param {string} widgetId The ID of the widget to wait for + * @param {boolean} add True to wait for the widget to be added, + * false to wait for it to be deleted. + * @returns {Promise} that resolves when the widget is available + */ + static waitForUserWidget(widgetId, add) { + return new Promise((resolve, reject) => { + const currentAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets'); + + // Tests an account data event, returning true if it's in the state + // we're waiting for it to be in + function eventInIntendedState(ev) { + if (!ev || !currentAccountDataEvent.getContent()) return false; + if (add) { + return ev.getContent()[widgetId] !== undefined; + } else { + return ev.getContent()[widgetId] === undefined; + } + } + + if (eventInIntendedState(currentAccountDataEvent)) { + resolve(); + return; + } + + function onAccountData(ev) { + if (eventInIntendedState(currentAccountDataEvent)) { + MatrixClientPeg.get().removeListener('accountData', onAccountData); + clearTimeout(timerId); + resolve(); + } + } + const timerId = setTimeout(() => { + MatrixClientPeg.get().removeListener('accountData', onAccountData); + reject(new Error("Timed out waiting for widget ID " + widgetId + " to appear")); + }, 10000); + MatrixClientPeg.get().on('accountData', onAccountData); + }); + } } From e98112254d7061e3ab913a3c7e2d0edbf078cec2 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Mon, 21 May 2018 19:37:07 +0900 Subject: [PATCH 063/283] Update lolex to 2.7.0 Signed-off-by: Akihiko Odaki --- package-lock.json | 379 +++++----------------------------------------- package.json | 2 +- 2 files changed, 41 insertions(+), 340 deletions(-) diff --git a/package-lock.json b/package-lock.json index 97ed7b5dea..433ed3ea4a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.12.4", + "version": "0.12.7", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -52,17 +52,6 @@ "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=", "dev": true }, - "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" - } - }, "ajv-keywords": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz", @@ -86,11 +75,6 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", "dev": true }, - "another-json": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/another-json/-/another-json-0.2.0.tgz", - "integrity": "sha1-tfQBnJc7bdXGUGotk0acttMq7tw=" - }, "ansi-escapes": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", @@ -205,11 +189,6 @@ "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" }, - "asn1": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" - }, "assert": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", @@ -219,11 +198,6 @@ "util": "0.10.3" } }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - }, "async": { "version": "0.9.2", "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", @@ -236,21 +210,6 @@ "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", "dev": true }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" - }, - "aws4": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", - "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==" - }, "babel-cli": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz", @@ -1145,15 +1104,6 @@ "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=", "dev": true }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", - "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", - "optional": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, "better-assert": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", @@ -1321,11 +1271,6 @@ "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", "dev": true }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" - }, "center-align": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", @@ -1420,7 +1365,8 @@ "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "dev": true }, "code-point-at": { "version": "1.1.0", @@ -1443,14 +1389,6 @@ "lodash": "^4.5.0" } }, - "combined-stream": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", - "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", - "requires": { - "delayed-stream": "~1.0.0" - } - }, "commander": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", @@ -1538,7 +1476,8 @@ "content-type": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "dev": true }, "convert-source-map": { "version": "1.5.0", @@ -1611,14 +1550,6 @@ "es5-ext": "^0.10.9" } }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "requires": { - "assert-plus": "^1.0.0" - } - }, "date-names": { "version": "0.1.10", "resolved": "https://registry.npmjs.org/date-names/-/date-names-0.1.10.tgz", @@ -1676,11 +1607,6 @@ "rimraf": "^2.2.8" } }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" - }, "depd": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", @@ -1805,15 +1731,6 @@ "resolved": "https://registry.npmjs.org/draft-js-utils/-/draft-js-utils-1.2.0.tgz", "integrity": "sha1-9csj6xZzJf/tPXmIL9wxdyHS/RI=" }, - "ecc-jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", - "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", - "optional": true, - "requires": { - "jsbn": "~0.1.0" - } - }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -2382,21 +2299,6 @@ "is-extglob": "^1.0.0" } }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" - }, - "fast-deep-equal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", - "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" - }, - "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" - }, "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", @@ -2610,21 +2512,6 @@ "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=", "dev": true }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" - }, - "form-data": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", - "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "1.0.6", - "mime-types": "^2.1.12" - } - }, "fs-access": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", @@ -2669,8 +2556,8 @@ "dev": true, "optional": true, "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" + "co": "^4.6.0", + "json-stable-stringify": "^1.0.1" } }, "ansi-regex": { @@ -2750,7 +2637,6 @@ "version": "2.10.1", "bundled": true, "dev": true, - "optional": true, "requires": { "hoek": "2.x.x" } @@ -2988,8 +2874,8 @@ "dev": true, "optional": true, "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" + "ajv": "^4.9.1", + "har-schema": "^1.0.5" } }, "has-unicode": { @@ -3004,17 +2890,16 @@ "dev": true, "optional": true, "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" + "boom": "2.x.x", + "cryptiles": "2.x.x", + "hoek": "2.x.x", + "sntp": "1.x.x" } }, "hoek": { "version": "2.16.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "http-signature": { "version": "1.1.1", @@ -3197,8 +3082,8 @@ "dev": true, "optional": true, "requires": { - "abbrev": "1.1.0", - "osenv": "0.1.4" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npmlog": { @@ -3294,10 +3179,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.4", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "~0.4.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -3389,7 +3274,7 @@ "dev": true, "optional": true, "requires": { - "hoek": "2.16.3" + "hoek": "2.x.x" } }, "sshpk": { @@ -3422,9 +3307,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -3432,7 +3317,7 @@ "bundled": true, "dev": true, "requires": { - "safe-buffer": "5.0.1" + "safe-buffer": "^5.0.1" } }, "stringstream": { @@ -3446,7 +3331,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { @@ -3487,7 +3372,7 @@ "dev": true, "optional": true, "requires": { - "punycode": "1.4.1" + "punycode": "^1.4.1" } }, "tunnel-agent": { @@ -3496,7 +3381,7 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "5.0.1" + "safe-buffer": "^5.0.1" } }, "tweetnacl": { @@ -3558,10 +3443,6 @@ "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-2.7.4.tgz", "integrity": "sha1-luQg/efvARrEnCWKYhMU/ldlNvk=" }, - "gemini-scrollbar": { - "version": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b", - "from": "gemini-scrollbar@github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b" - }, "generate-function": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", @@ -3577,14 +3458,6 @@ "is-property": "^1.0.0" } }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "requires": { - "assert-plus": "^1.0.0" - } - }, "gfm.css": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/gfm.css/-/gfm.css-1.1.2.tgz", @@ -3663,20 +3536,6 @@ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "dev": true }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" - }, - "har-validator": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", - "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", - "requires": { - "ajv": "^5.1.0", - "har-schema": "^2.0.0" - } - }, "has": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", @@ -3785,16 +3644,6 @@ "requires-port": "1.x.x" } }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, "https-browserify": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz", @@ -4108,11 +3957,6 @@ "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=", "dev": true }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" - }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -4148,15 +3992,11 @@ "whatwg-fetch": ">=0.10.0" } }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" - }, "jquery": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz", - "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c=" + "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c=", + "optional": true }, "js-tokens": { "version": "3.0.2", @@ -4173,12 +4013,6 @@ "esprima": "^4.0.0" } }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "optional": true - }, "jsesc": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", @@ -4191,16 +4025,6 @@ "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==", "dev": true }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" - }, - "json-schema-traverse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" - }, "json-stable-stringify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", @@ -4210,11 +4034,6 @@ "jsonify": "~0.0.0" } }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" - }, "json3": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", @@ -4239,17 +4058,6 @@ "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", "dev": true }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, "jsx-ast-utils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz", @@ -4532,9 +4340,9 @@ } }, "lolex": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz", - "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.0.tgz", + "integrity": "sha512-uJkH2e0BVfU5KOJUevbTOtpDduooSarH5PopO+LfM/vZf8Z9sJzODqKev804JYM2i++ktJfUmC1le4LwFQ1VMg==" }, "longest": { "version": "1.0.1", @@ -4556,19 +4364,6 @@ "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=", "dev": true }, - "matrix-js-sdk": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.10.2.tgz", - "integrity": "sha512-7o9a+4wWmxoW4cfdGVLGjZgTFLpWf/I0UqyicIzdV73qotYIO/q6k1bLf1+G0hgwZ/umwke4CB7GemxvvvxMcA==", - "requires": { - "another-json": "^0.2.0", - "babel-runtime": "^6.26.0", - "bluebird": "^3.5.0", - "browser-request": "^0.3.3", - "content-type": "^1.0.2", - "request": "^2.53.0" - } - }, "matrix-mock-request": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/matrix-mock-request/-/matrix-mock-request-1.2.1.tgz", @@ -4645,12 +4440,14 @@ "mime-db": { "version": "1.30.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", - "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=" + "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=", + "dev": true }, "mime-types": { "version": "2.1.17", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", + "dev": true, "requires": { "mime-db": "~1.30.0" } @@ -4877,11 +4674,6 @@ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, - "oauth-sign": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" - }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -5242,7 +5034,8 @@ "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true }, "qjobs": { "version": "1.1.5", @@ -5253,7 +5046,8 @@ "qs": { "version": "6.5.1", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", - "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==" + "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", + "dev": true }, "querystring": { "version": "0.2.0", @@ -5389,13 +5183,6 @@ "prop-types": "^15.5.10" } }, - "react-gemini-scrollbar": { - "version": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9", - "from": "react-gemini-scrollbar@github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9", - "requires": { - "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b" - } - }, "react-motion": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz", @@ -5592,33 +5379,6 @@ "is-finite": "^1.0.0" } }, - "request": { - "version": "2.87.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", - "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.6.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.5", - "extend": "~3.0.1", - "forever-agent": "~0.6.1", - "form-data": "~2.3.1", - "har-validator": "~5.0.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.17", - "oauth-sign": "~0.8.2", - "performance-now": "^2.1.0", - "qs": "~6.5.1", - "safe-buffer": "^5.1.1", - "tough-cookie": "~2.3.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.1.0" - } - }, "require-json": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/require-json/-/require-json-0.0.1.tgz", @@ -6049,21 +5809,6 @@ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz", "integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw=" }, - "sshpk": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", - "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "tweetnacl": "~0.14.0" - } - }, "statuses": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", @@ -6288,14 +6033,6 @@ "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", "dev": true }, - "tough-cookie": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", - "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", - "requires": { - "punycode": "^1.4.1" - } - }, "trim-right": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", @@ -6314,20 +6051,6 @@ "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "optional": true - }, "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -6462,11 +6185,6 @@ "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", "dev": true }, - "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" - }, "v8flags": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", @@ -6476,23 +6194,6 @@ "user-home": "^1.1.1" } }, - "velocity-vector": { - "version": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f", - "from": "velocity-vector@github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f", - "requires": { - "jquery": ">= 1.4.3" - } - }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, "vm-browserify": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", diff --git a/package.json b/package.json index 1fed55748c..885d37d754 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "isomorphic-fetch": "^2.2.1", "linkifyjs": "^2.1.3", "lodash": "^4.13.1", - "lolex": "2.3.2", + "lolex": "^2.7.0", "matrix-js-sdk": "0.10.4", "optimist": "^0.6.1", "pako": "^1.0.5", From 3cadbd3974a4ccc7aae395c96f63332dced9ff72 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Wed, 13 Jun 2018 11:21:26 +0100 Subject: [PATCH 064/283] Include decryption error in decryption failure metrics --- src/components/structures/MatrixChat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index c94baa63ef..da729a1a2d 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1312,7 +1312,7 @@ export default React.createClass({ // if the decryption was a failure cli.on("Event.decrypted", (e) => { if (e.isDecryptionFailure()) { - Analytics.trackEvent('E2E', 'Decryption failure'); + Analytics.trackEvent('E2E', 'Decryption failure', 'ev.content.body: ' + e.getContent().body); } }); From d4b2f06a63a65e4897d6cbbb6a46df22be933b83 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 Jun 2018 13:51:04 +0100 Subject: [PATCH 065/283] fix message appears unencrypted while in flight Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/img/e2e-pending.svg | 12 ++++++++++++ src/components/views/rooms/EventTile.js | 24 ++++++++++++++---------- 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 res/img/e2e-pending.svg diff --git a/res/img/e2e-pending.svg b/res/img/e2e-pending.svg new file mode 100644 index 0000000000..469611cc8d --- /dev/null +++ b/res/img/e2e-pending.svg @@ -0,0 +1,12 @@ + + + +48BF5D32-306C-4B20-88EB-24B1F743CAC9 +Created with sketchtool. + + + + + + + diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index 589524bb9e..50fe0928b0 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -34,6 +34,7 @@ const ContextualMenu = require('../../structures/ContextualMenu'); import dis from '../../../dispatcher'; import {makeEventPermalink} from "../../../matrix-to"; import SettingsStore from "../../../settings/SettingsStore"; +import {EventStatus} from 'matrix-js-sdk'; const ObjectUtils = require('../../../ObjectUtils'); @@ -442,7 +443,6 @@ module.exports = withMatrixClient(React.createClass({ const ev = this.props.mxEvent; const props = {onClick: this.onCryptoClicked}; - if (ev.getContent().msgtype === 'm.bad.encrypted') { return ; } else if (ev.isEncrypted()) { @@ -451,15 +451,15 @@ module.exports = withMatrixClient(React.createClass({ } else { return ; } - } else { - // XXX: if the event is being encrypted (ie eventSendStatus === - // encrypting), it might be nice to show something other than the - // open padlock? - - // if the event is not encrypted, but it's an e2e room, show the - // open padlock - const e2eEnabled = this.props.matrixClient.isRoomEncrypted(ev.getRoomId()); - if (e2eEnabled) { + } else if (this.props.matrixClient.isRoomEncrypted(ev.getRoomId())) { + // else if room is encrypted + // and event is being encrypted or is not_sent (Unknown Devices/Network Error) + if (ev.status === EventStatus.ENCRYPTING || ev.status === EventStatus.NOT_SENT) { + // XXX: if the event is being encrypted (ie eventSendStatus === encrypting), + // it might be nice to show something other than the open padlock? + return ; + } else { + // if the event is not encrypted, but it's an e2e room, show the open padlock return ; } } @@ -736,6 +736,10 @@ function E2ePadlockUndecryptable(props) { ); } +function E2ePadlockPending(props) { + return ; +} + function E2ePadlockVerified(props) { return ( Date: Wed, 13 Jun 2018 15:50:19 +0100 Subject: [PATCH 066/283] Fix widgets re-appearing after being deleted Widgets would sometimes briefly re-appear after having been deleted. This was because of the following race: * User presses delete, send POST req, we set `deleting`. Widget hides. * POST request completes, we unset `deleting` so widget unhides. * State event comes down sync so widget hides again. This fixes this by introducing `waitForRoomWidget` and using it to wait until the state event comes down the sync until clearing the `deleting` flag. Since we now have `waitForRoomWidget`, this also uses it when adding a widget so the 'widget saved' appears at the same time the widget does. --- src/ScalarMessaging.js | 9 ++-- src/WidgetUtils.js | 60 ++++++++++++++++++++++-- src/components/views/elements/AppTile.js | 4 +- 3 files changed, 64 insertions(+), 9 deletions(-) diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js index dd3975dfe5..f80162e635 100644 --- a/src/ScalarMessaging.js +++ b/src/ScalarMessaging.js @@ -237,6 +237,7 @@ import MatrixClientPeg from './MatrixClientPeg'; import { MatrixEvent } from 'matrix-js-sdk'; import dis from './dispatcher'; import Widgets from './utils/widgets'; +import WidgetUtils from './WidgetUtils'; import RoomViewStore from './stores/RoomViewStore'; import { _t } from './languageHandler'; @@ -362,7 +363,7 @@ function setWidget(event, roomId) { // wait for this, the action will complete but if the user is fast enough, // the widget still won't actually be there. client.setAccountData('m.widgets', userWidgets).then(() => { - return waitForUserWidget(widgetId, widgetUrl !== null); + return WidgetUtils.waitForUserWidget(widgetId, widgetUrl !== null); }).then(() => { sendResponse(event, { success: true, @@ -382,9 +383,9 @@ function setWidget(event, roomId) { } // TODO - Room widgets need to be moved to 'm.widget' state events // https://docs.google.com/document/d/1uPF7XWY_dXTKVKV7jZQ2KmsI19wn9-kFRgQ1tFQP7wQ/edit?usp=sharing - client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).done(() => { - // XXX: We should probably wait for the echo of the state event to come back from the server, - // as we do with user widgets. + client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).then(() => { + return WidgetUtils.waitForRoomWidget(widgetId, roomId, widgetUrl !== null); + }).then(() => { sendResponse(event, { success: true, }); diff --git a/src/WidgetUtils.js b/src/WidgetUtils.js index c6816d28b6..14fe3f59bd 100644 --- a/src/WidgetUtils.js +++ b/src/WidgetUtils.js @@ -104,12 +104,10 @@ export default class WidgetUtils { */ static waitForUserWidget(widgetId, add) { return new Promise((resolve, reject) => { - const currentAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets'); - // Tests an account data event, returning true if it's in the state // we're waiting for it to be in function eventInIntendedState(ev) { - if (!ev || !currentAccountDataEvent.getContent()) return false; + if (!ev || !ev.getContent()) return false; if (add) { return ev.getContent()[widgetId] !== undefined; } else { @@ -117,12 +115,14 @@ export default class WidgetUtils { } } - if (eventInIntendedState(currentAccountDataEvent)) { + const startingAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets'); + if (eventInIntendedState(startingAccountDataEvent)) { resolve(); return; } function onAccountData(ev) { + const currentAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets'); if (eventInIntendedState(currentAccountDataEvent)) { MatrixClientPeg.get().removeListener('accountData', onAccountData); clearTimeout(timerId); @@ -136,4 +136,56 @@ export default class WidgetUtils { MatrixClientPeg.get().on('accountData', onAccountData); }); } + + /** + * Returns a promise that resolves when a widget with the given + * ID has been added as a room widget in the given room (ie. the + * room state event arrives) or rejects after a timeout + * + * @param {string} widgetId The ID of the widget to wait for + * @param {string} roomId The ID of the room to wait for the widget in + * @param {boolean} add True to wait for the widget to be added, + * false to wait for it to be deleted. + * @returns {Promise} that resolves when the widget is available + */ + static waitForRoomWidget(widgetId, roomId, add) { + return new Promise((resolve, reject) => { + // Tests a list of state events, returning true if it's in the state + // we're waiting for it to be in + function eventsInIntendedState(evList) { + const widgetPresent = evList.some((ev) => { + return ev.getContent() && ev.getContent()['id'] === widgetId; + }); + if (add) { + return widgetPresent; + } else { + return !widgetPresent; + } + } + + const room = MatrixClientPeg.get().getRoom(roomId); + const startingWidgetEvents = room.currentState.getStateEvents('im.vector.modular.widgets'); + if (eventsInIntendedState(startingWidgetEvents)) { + resolve(); + return; + } + + function onRoomStateEvents(ev) { + if (ev.getRoomId() !== roomId) return; + + const currentWidgetEvents = room.currentState.getStateEvents('im.vector.modular.widgets'); + + if (eventsInIntendedState(currentWidgetEvents)) { + MatrixClientPeg.get().removeListener('RoomState.events', onRoomStateEvents); + clearTimeout(timerId); + resolve(); + } + } + const timerId = setTimeout(() => { + MatrixClientPeg.get().removeListener('RoomState.events', onRoomStateEvents); + reject(new Error("Timed out waiting for widget ID " + widgetId + " to appear")); + }, 10000); + MatrixClientPeg.get().on('RoomState.events', onRoomStateEvents); + }); + } } diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js index 429b5941b9..70b5bd651e 100644 --- a/src/components/views/elements/AppTile.js +++ b/src/components/views/elements/AppTile.js @@ -324,7 +324,9 @@ export default class AppTile extends React.Component { 'im.vector.modular.widgets', {}, // empty content this.props.id, - ).catch((e) => { + ).then(() => { + return WidgetUtils.waitForRoomWidget(this.props.id, this.props.room.roomId, false); + }).catch((e) => { console.error('Failed to delete widget', e); }).finally(() => { this.setState({deleting: false}); From 5cc2361737608ec7875b46151ea84c5989e6e8d3 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 Jun 2018 15:52:50 +0100 Subject: [PATCH 067/283] change not_sent e2e lock to match colour of text Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../{e2e-pending.svg => e2e-encrypting.svg} | 0 res/img/e2e-not_sent.svg | 12 ++++++ src/components/views/rooms/EventTile.js | 38 +++++++++++-------- 3 files changed, 34 insertions(+), 16 deletions(-) rename res/img/{e2e-pending.svg => e2e-encrypting.svg} (100%) create mode 100644 res/img/e2e-not_sent.svg diff --git a/res/img/e2e-pending.svg b/res/img/e2e-encrypting.svg similarity index 100% rename from res/img/e2e-pending.svg rename to res/img/e2e-encrypting.svg diff --git a/res/img/e2e-not_sent.svg b/res/img/e2e-not_sent.svg new file mode 100644 index 0000000000..fca79ae547 --- /dev/null +++ b/res/img/e2e-not_sent.svg @@ -0,0 +1,12 @@ + + + +48BF5D32-306C-4B20-88EB-24B1F743CAC9 +Created with sketchtool. + + + + + + + diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index 50fe0928b0..9863a1c60a 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -443,25 +443,27 @@ module.exports = withMatrixClient(React.createClass({ const ev = this.props.mxEvent; const props = {onClick: this.onCryptoClicked}; + // event could not be decrypted if (ev.getContent().msgtype === 'm.bad.encrypted') { return ; - } else if (ev.isEncrypted()) { - if (this.state.verified) { - return ; - } else { - return ; - } - } else if (this.props.matrixClient.isRoomEncrypted(ev.getRoomId())) { + } + + // event is encrypted, display padlock corresponding to whether or not it is verified + if (ev.isEncrypted()) { + return this.state.verified ? : ; + } + + if (this.props.matrixClient.isRoomEncrypted(ev.getRoomId())) { // else if room is encrypted // and event is being encrypted or is not_sent (Unknown Devices/Network Error) - if (ev.status === EventStatus.ENCRYPTING || ev.status === EventStatus.NOT_SENT) { - // XXX: if the event is being encrypted (ie eventSendStatus === encrypting), - // it might be nice to show something other than the open padlock? - return ; - } else { - // if the event is not encrypted, but it's an e2e room, show the open padlock - return ; + if (ev.status === EventStatus.ENCRYPTING) { + return ; } + if (ev.status === EventStatus.NOT_SENT) { + return ; + } + // if the event is not encrypted, but it's an e2e room, show the open padlock + return ; } // no padlock needed @@ -736,8 +738,12 @@ function E2ePadlockUndecryptable(props) { ); } -function E2ePadlockPending(props) { - return ; +function E2ePadlockEncrypting(props) { + return ; +} + +function E2ePadlockNotSent(props) { + return ; } function E2ePadlockVerified(props) { From ac77b2d9ec1106427f0e887f416deb3b7eed04bc Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 Jun 2018 16:00:57 +0100 Subject: [PATCH 068/283] run gen-i18n and prune-i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/i18n/strings/de_DE.json | 3 -- src/i18n/strings/en_EN.json | 64 ++++++++++++++++++----------------- src/i18n/strings/eu.json | 7 ---- src/i18n/strings/fr.json | 8 ----- src/i18n/strings/hu.json | 8 ----- src/i18n/strings/is.json | 1 - src/i18n/strings/it.json | 3 -- src/i18n/strings/ru.json | 4 --- src/i18n/strings/sv.json | 2 -- src/i18n/strings/zh_Hant.json | 3 -- 10 files changed, 33 insertions(+), 70 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index aaf51f0d9e..c3ff855020 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -1168,9 +1168,6 @@ "At this time it is not possible to reply with an emote.": "An dieser Stelle ist es nicht möglich mit einer Umschreibung zu antworten.", "Enable widget screenshots on supported widgets": "Widget-Screenshots bei unterstützten Widgets aktivieren", "Send analytics data": "Analysedaten senden", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden. (Siehe unsere Datenschutzerklärung).", - "Help improve Riot by sending usage data? This will use a cookie.": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden.", - "Yes please": "Ja, bitte", "e.g. %(exampleValue)s": "z.B. %(exampleValue)s", "Reload widget": "Widget neu laden", "To notify everyone in the room, you must be a": "Notwendiges Berechtigungslevel, um jeden im Raum zu benachrichten:", diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index f182ecdbad..1a761c2c5c 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -42,6 +42,10 @@ "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload", "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads", "Upload Failed": "Upload Failed", + "Failure to create room": "Failure to create room", + "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.", + "Send anyway": "Send anyway", + "Send": "Send", "Sun": "Sun", "Mon": "Mon", "Tue": "Tue", @@ -81,6 +85,7 @@ "Failed to invite users to community": "Failed to invite users to community", "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s", "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:", + "Unnamed Room": "Unnamed Room", "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings", "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again", "Unable to enable Notifications": "Unable to enable Notifications", @@ -104,7 +109,6 @@ "You need to be logged in.": "You need to be logged in.", "You need to be able to invite users to do that.": "You need to be able to invite users to do that.", "Unable to create widget.": "Unable to create widget.", - "Reload widget": "Reload widget", "Missing roomId.": "Missing roomId.", "Failed to send request.": "Failed to send request.", "This room is not recognised.": "This room is not recognised.", @@ -180,11 +184,6 @@ "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing", "%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing", "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing", - "Failure to create room": "Failure to create room", - "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.", - "Send anyway": "Send anyway", - "Send": "Send", - "Unnamed Room": "Unnamed Room", "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions", "Not a valid Riot keyfile": "Not a valid Riot keyfile", "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?", @@ -298,6 +297,29 @@ "Off": "Off", "On": "On", "Noisy": "Noisy", + "Invalid alias format": "Invalid alias format", + "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias", + "Invalid address format": "Invalid address format", + "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address", + "not specified": "not specified", + "not set": "not set", + "Remote addresses for this room:": "Remote addresses for this room:", + "Addresses": "Addresses", + "The main address for this room is": "The main address for this room is", + "Local addresses for this room:": "Local addresses for this room:", + "This room has no local addresses": "This room has no local addresses", + "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)", + "Invalid community ID": "Invalid community ID", + "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID", + "Flair": "Flair", + "Showing flair for these communities:": "Showing flair for these communities:", + "This room is not showing flair for any communities": "This room is not showing flair for any communities", + "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)", + "You have enabled URL previews by default.": "You have enabled URL previews by default.", + "You have disabled URL previews by default.": "You have disabled URL previews by default.", + "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.", + "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.", + "URL Previews": "URL Previews", "Cannot add any more widgets": "Cannot add any more widgets", "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.", "Add a widget": "Add a widget", @@ -316,6 +338,8 @@ "Key request sent.": "Key request sent.", "Re-request encryption keys from your other devices.": "Re-request encryption keys from your other devices.", "Undecryptable": "Undecryptable", + "Encrypting": "Encrypting", + "Encrypted, not sent": "Encrypted, not sent", "Encrypted by a verified device": "Encrypted by a verified device", "Encrypted by an unverified device": "Encrypted by an unverified device", "Unencrypted message": "Unencrypted message", @@ -394,11 +418,11 @@ "numbullet": "numbullet", "Markdown is disabled": "Markdown is disabled", "Markdown is enabled": "Markdown is enabled", - "Unpin Message": "Unpin Message", - "Jump to message": "Jump to message", "No pinned messages.": "No pinned messages.", "Loading...": "Loading...", "Pinned Messages": "Pinned Messages", + "Unpin Message": "Unpin Message", + "Jump to message": "Jump to message", "%(duration)ss": "%(duration)ss", "%(duration)sm": "%(duration)sm", "%(duration)sh": "%(duration)sh", @@ -531,29 +555,6 @@ "Scroll to unread messages": "Scroll to unread messages", "Jump to first unread message.": "Jump to first unread message.", "Close": "Close", - "Invalid alias format": "Invalid alias format", - "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias", - "Invalid address format": "Invalid address format", - "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address", - "not specified": "not specified", - "not set": "not set", - "Remote addresses for this room:": "Remote addresses for this room:", - "Addresses": "Addresses", - "The main address for this room is": "The main address for this room is", - "Local addresses for this room:": "Local addresses for this room:", - "This room has no local addresses": "This room has no local addresses", - "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)", - "Invalid community ID": "Invalid community ID", - "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID", - "Flair": "Flair", - "Showing flair for these communities:": "Showing flair for these communities:", - "This room is not showing flair for any communities": "This room is not showing flair for any communities", - "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)", - "You have enabled URL previews by default.": "You have enabled URL previews by default.", - "You have disabled URL previews by default.": "You have disabled URL previews by default.", - "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.", - "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.", - "URL Previews": "URL Previews", "Sunday": "Sunday", "Monday": "Monday", "Tuesday": "Tuesday", @@ -664,6 +665,7 @@ "Delete widget": "Delete widget", "Revoke widget access": "Revoke widget access", "Minimize apps": "Minimize apps", + "Reload widget": "Reload widget", "Popout widget": "Popout widget", "Picture": "Picture", "Edit": "Edit", diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index ac2187456e..af04f66fa6 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -1169,20 +1169,13 @@ "Enable widget screenshots on supported widgets": "Gaitu trepeten pantaila-argazkiak onartzen duten trepetetan", "Send analytics data": "Bidali datu analitikoak", "Muted Users": "Mutututako erabiltzaileak", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du. (Ikusi gure Cookie eta pribatutasun politikak).", - "Help improve Riot by sending usage data? This will use a cookie.": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du.", - "Yes please": "Bai mesedez", "Warning: This widget might use cookies.": "Abisua: Trepeta honek cookie-ak erabili litzake.", "Terms and Conditions": "Termino eta baldintzak", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)s hasiera-zerbitzaria erabiltzen jarraitzeko gure termino eta baldintzak irakurri eta onartu behar dituzu.", "Review terms and conditions": "Irakurri termino eta baldintzak", "Failed to indicate account erasure": "Ezin izan da kontuaren ezabaketa jakinarazi", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Honek zure kontua betiko erabilgaitz bihurtuko du. Ezin izango duzu saioa hasi, eta beste inork ezin izango du erabiltzaile ID bera erabili. Ez dago ekintza hau desegiterik.", - "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "Zure kontua desaktibatzean ez dira lehenetsita zuk bidalitako mezuak ezabatuko. Zuk bidalitako mezuak ezabatu nahi badituzu, markatu beheko kutxa.", - "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna, e-mail mezuen antzekoa da. Zure mezuak ezabatzeak esan nahi du bidali dituzun mezuak ez direla erabiltzaile berriekin partekatuko, baina aurretik zure mezuak jaso dituzten erabiltzaile erregistratuek bere kopia izango dute.", "To continue, please enter your password:": "Jarraitzeko, sartu zure pasahitza:", "password": "pasahitza", - "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Ezabatu bidali ditudan mezu guztiak nire kontua desaktibatzean. (Abisua: Etorkizuneko erabiltzaileek elkarrizketa partzialak ikusiko dituzte, esperientzia kaskarra sortuz).", "e.g. %(exampleValue)s": "adib. %(exampleValue)s", "Reload widget": "Birkargatu trepeta", "To notify everyone in the room, you must be a": "Gelan dauden guztiei jakinarazteko", diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index c3cfdef5fc..9f276f4699 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -1168,25 +1168,17 @@ "Collapse Reply Thread": "Dévoiler le fil de réponse", "Enable widget screenshots on supported widgets": "Activer les captures d'écran des widgets pris en charge", "Send analytics data": "Envoyer les données analytiques", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie. (Voir nos politiques de cookie et de confidentialité).", - "Help improve Riot by sending usage data? This will use a cookie.": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie.", - "Yes please": "Oui, s'il vous plaît", "Muted Users": "Utilisateurs ignorés", "Warning: This widget might use cookies.": "Avertissement : ce widget utilise peut-être des cookies.", "Terms and Conditions": "Conditions générales", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Pour continuer à utiliser le serveur d'accueil %(homeserverDomain)s, vous devez lire et accepter nos conditions générales.", "Review terms and conditions": "Voir les conditions générales", "Failed to indicate account erasure": "Échec de notification de la suppression du compte", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Cela rendra votre compte inutilisable de façon permanente. Vous ne pourrez plus vous connecter et ne pourrez plus vous enregistrer avec le même identifiant d'utilisateur. Cette action est irréversible.", - "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "Désactiver votre compte ne supprime pas les messages que vous avez envoyés par défaut. Si vous souhaitez supprimer vos messages, cochez la case ci-dessous.", - "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Supprimer vos messages signifie que les messages que vous avez envoyés ne seront pas partagés avec de nouveaux utilisateurs ou les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à vos messages continueront d'en avoir une copie.", "To continue, please enter your password:": "Pour continuer, veuillez renseigner votre mot de passe :", "password": "mot de passe", - "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Veuillez supprimer tous les messages que j'ai envoyé quand mon compte est désactivé. (Attention : les futurs utilisateurs verront alors des conversations incomplètes, ce qui est une mauvaise expérience).", "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous reconnecter et personne ne pourra se réenregistrer avec le même identifiant d'utilisateur. Votre compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d'identité. Cette action est irréversible.", "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "La désactivation du compte ne nous fait pas oublier les messages que vous avez envoyés par défaut. Si vous souhaitez que nous les oubliions, cochez la case ci-dessous.", "e.g. %(exampleValue)s": "par ex. %(exampleValue)s", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Cela utilisera un cookie. (Voir nos politiques de cookie et de confidentialité).", "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.", "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (Avertissement : les futurs utilisateurs verront des conversations incomplètes)", "Reload widget": "Recharger le widget", diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index aa1904d0bf..0be5087d55 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1168,27 +1168,19 @@ "Collapse Reply Thread": "Beszélgetés szál becsukása", "Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott ott képernyőkép készítés engedélyezése", "Send analytics data": "Analitikai adatok küldése", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ. (Nézd meg a sütikről és titoktartási irányelvekről szóló leírást).", - "Help improve Riot by sending usage data? This will use a cookie.": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ.", - "Yes please": "Igen, kérlek", "Muted Users": "Elnémított felhasználók", "Warning: This widget might use cookies.": "Figyelmeztetés: Ez a kisalkalmazás sütiket (cookies) használhat.", "Terms and Conditions": "Általános Szerződési Feltételek", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "A %(homeserverDomain)s szerver használatának folytatásához el kell olvasnod és el kell fogadnod az általános szerződési feltételeket.", "Review terms and conditions": "Általános Szerződési Feltételek elolvasása", "Failed to indicate account erasure": "A fiók törlésének jelzése sikertelen", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Ezzel a felhasználói fiókod végleg használhatatlanná válik. Nem tudsz bejelentkezni, és senki más sem fog tudni újra regisztrálni ugyanezzel az azonosítóval. Ez a művelet visszafordíthatatlan.", - "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "A felhasználói fiók felfüggesztése alapértelmezetten nem töröli semelyik általad küldött üzenetet. Ha az elküldött üzeneteidet törölni szeretnéd pipáld be a jelölőnégyzetet alul.", - "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban olyan mint az e-mail. Az üzeneted törlése azt jelenti, hogy amit elküldtél már nem lesz megosztva új- vagy vendég felhasználóval, de azok a regisztrált felhasználók akik már látták az üzenetet továbbra is hozzáférnek a saját példányukhoz.", "To continue, please enter your password:": "Folytatáshoz add meg a jelszavad:", "password": "jelszó", - "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Töröld az összes üzenetet amit küldtem amikor felfüggeszted a felhasználói fiókomat. (Figyelem: ezzel a jövőbeni felhasználók csak részleges beszélgetést láthatnak majd, ami rosszul eshet).", "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Ez végleg használhatatlanná teszi a fiókodat. Ezután nem fogsz tudni bejelentkezni, és más sem tud majd ezzel az azonosítóval fiókot létrehozni. Minden szobából amibe beléptél ki fogsz lépni, és törölni fogja minden fiók adatod az \"identity\" szerverről. Ez a művelet visszafordíthatatlan.", "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "A fiókod felfüggesztése nem jelenti alapértelmezetten azt, hogy az általad küldött üzenetek elfelejtődnek. Ha törölni szeretnéd az általad küldött üzeneteket, pipáld be a jelölőnégyzetet alul.", "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban hasonlít az emailhez. Az általad küldött üzenet törlése azt jelenti, hogy nem osztjuk meg új-, vagy vendég felhasználóval de a már regisztrált felhasználók akik már hozzáfértek az üzenethez továbbra is elérik a saját másolatukat.", "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (Figyelem: ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)", "e.g. %(exampleValue)s": "pl. %(exampleValue)s", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Segítesz jobbá tenni a Riotot használati adat küldésével? Ez sütit (cookie) fog használni. (Nézd meg az Általános Szerződési Feltételeket).", "Reload widget": "Kisalkalmazás újratöltése", "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Kérlek segíts javítani a Riot.im-et azzal, hogy anonim felhasználási adatokat küldesz. Ez szütit (cookie) fog használni (lásd a sütire vonatkozó szabályozásunkat).", "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Kérlek segíts javítani a Riot.im-et azzal, hogy anonim felhasználási adatokat küldesz. Ez szütit (cookie) fog használni.", diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json index d901c52f60..234def7dba 100644 --- a/src/i18n/strings/is.json +++ b/src/i18n/strings/is.json @@ -628,7 +628,6 @@ "No Microphones detected": "Engir hljóðnemar fundust", "No Webcams detected": "Engar vefmyndavélar fundust", "Homeserver is": "Heimanetþjónn er", - "Login as guest": "Skrá inn sem gestur", "Sign in to get started": "Skráðu þig inn til að komast í gang", "Failed to fetch avatar URL": "Ekki tókst að sækja slóð á auðkennismynd", "Set a display name:": "Stilltu birtingarnafn:", diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index 884dac4269..61c80b6789 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -1158,9 +1158,6 @@ "Refresh": "Aggiorna", "We encountered an error trying to restore your previous session.": "Abbiamo riscontrato un errore tentando di ripristinare la tua sessione precedente.", "Send analytics data": "Invia dati statistici", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie. (Vedi la nostra politica sui cookie e sulla privacy).", - "Help improve Riot by sending usage data? This will use a cookie.": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie.", - "Yes please": "Sì grazie", "Clear Storage and Sign Out": "Elimina lo storage e disconnetti", "Send Logs": "Invia i log", "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Eliminare lo storage del browser potrebbe risolvere il problema, ma verrai disconnesso e la cronologia delle chat criptate sarà illeggibile.", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index a7e590c7ed..55840f752e 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -1166,16 +1166,12 @@ "Enable widget screenshots on supported widgets": "Включить скриншоты виджета в поддерживаемых виджетах", "Collapse Reply Thread": "Ответить с цитированием", "Send analytics data": "Отправить данные аналитики", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie. (См. наши политики cookie и конфиденциальности).", - "Help improve Riot by sending usage data? This will use a cookie.": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie.", - "Yes please": "Да, пожалуйста", "Muted Users": "Приглушенные пользователи", "Warning: This widget might use cookies.": "Внимание: этот виджет может использовать cookie.", "Terms and Conditions": "Условия и положения", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Для продолжения использования сервера %(homeserverDomain)s вы должны ознакомиться и принять условия и положения.", "Review terms and conditions": "Просмотр условий и положений", "e.g. %(exampleValue)s": "напр. %(exampleValue)s", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Помогите улучшить Riot, отправляя данные использования? Будут использоваться файлы cookie. (Смотрите наши политики cookie и конфиденциальности).", "Failed to indicate account erasure": "Не удается удалить учетную запись", "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Это навсегда сделает вашу учетную запись невозможной для использования. Вы не сможете войти в систему, и никто не сможет перерегистрировать тот же идентификатор пользователя. Это приведет к тому, что ваша учетная запись выйдет из всех комнат, в которые она входит, и будут удалены данные вашей учетной записи с сервера идентификации. Это действие необратимо.", "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "По умолчанию деактивация вашей учетной записи не приведет к удалению всех ваших сообщений. Если вы хотите, чтобы мы удалили ваши сообщения, поставьте отметку в поле ниже.", diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index 5e27d5713d..9dcc74d790 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -900,8 +900,6 @@ "This setting cannot be changed later!": "Den här inställningen kan inte ändras senare!", "Unknown error": "Okänt fel", "Incorrect password": "Felaktigt lösenord", - "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Detta kommer att göra ditt konto permanent oanvändbart. Du kommer inte att kunna registrera samma användar-ID igen.", - "This action is irreversible.": "Denna åtgärd går inte att ångra.", "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "För att verifiera att denna enhet kan litas på, vänligen kontakta ägaren på annat sätt (t ex personligen eller med ett telefonsamtal) och fråga om nyckeln ägaren har i sina användarinställningar för enheten matchar nyckeln nedan:", "Device name": "Enhetsnamn", "Device key": "Enhetsnyckel", diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index e8217e0277..88cc5b6ad2 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -1169,9 +1169,6 @@ "Enable widget screenshots on supported widgets": "在支援的小工具上啟用小工具螢幕快照", "Send analytics data": "傳送分析資料", "Muted Users": "已靜音的使用者", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。（參見我們的 cookie 與隱私政策）。", - "Help improve Riot by sending usage data? This will use a cookie.": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。", - "Yes please": "好的，請", "e.g. %(exampleValue)s": "範例：%(exampleValue)s", "Reload widget": "重新載入小工具", "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "請透過傳送匿名使用資料來協助改善 Riot.im。這將會使用 cookie（請參見我們的 Cookie 政策）。", From 75abb415d437d337382dc57717277fae67f57580 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 Jun 2018 16:17:26 +0100 Subject: [PATCH 069/283] improve tag panel accessibility and remove a no-op dispatch Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/TagPanel.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js index 0b6dc9fc75..77259c863d 100644 --- a/src/components/structures/TagPanel.js +++ b/src/components/structures/TagPanel.js @@ -84,7 +84,10 @@ const TagPanel = React.createClass({ }, onMouseDown(e) { - dis.dispatch({action: 'deselect_tags'}); + // only dispatch if its not a no-op + if (this.state.selectedTags.length > 0) { + dis.dispatch({action: 'deselect_tags'}); + } }, onCreateGroupClick(ev) { @@ -113,17 +116,18 @@ const TagPanel = React.createClass({ />; }); - const clearButton = this.state.selectedTags.length > 0 ? - : -
; + let clearButton; + if (this.state.selectedTags.length > 0) { + clearButton = + + ; + } return
- - { clearButton } - + { clearButton }
Date: Wed, 13 Jun 2018 16:55:16 +0100 Subject: [PATCH 070/283] Fix exception when opening dev tools Apparently draft sometimes gets unhappy when you try to move to the end of an empty state, so only move to the end if we actually created a non-empty state. This will be irrelevant once https://github.com/matrix-org/matrix-react-sdk/pull/1890 is merged, but I have the fix now, and this is probably otherwise going to annoy me now I'm doing things where devtools is very useful. Fixes https://github.com/vector-im/riot-web/issues/6436 --- src/components/views/rooms/MessageComposerInput.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js index 97e8780f0f..66bae869ff 100644 --- a/src/components/views/rooms/MessageComposerInput.js +++ b/src/components/views/rooms/MessageComposerInput.js @@ -244,12 +244,14 @@ export default class MessageComposerInput extends React.Component { let editorState = null; if (contentState) { - editorState = EditorState.createWithContent(contentState, compositeDecorator); + editorState = EditorState.moveFocusToEnd( + EditorState.createWithContent(contentState, compositeDecorator) + ); } else { editorState = EditorState.createEmpty(compositeDecorator); } - return EditorState.moveFocusToEnd(editorState); + return editorState; } componentDidMount() { From 77708d5b659f498e3b4279014c887f1f4bdbe04f Mon Sep 17 00:00:00 2001 From: Osoitz Date: Wed, 13 Jun 2018 09:20:33 +0000 Subject: [PATCH 071/283] Translated using Weblate (Basque) Currently translated at 100.0% (1190 of 1190 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/ --- src/i18n/strings/eu.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index 1be59bdbd5..caeca8daf9 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -586,7 +586,7 @@ "Please enter the code it contains:": "Sartu dakarren kodea:", "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ez baduzu e-mail helbide bat zehazten, ezin izango duzu zure pasahitza berrezarri. Ziur zaude?", "You are registering with %(SelectedTeamName)s": "%(SelectedTeamName)s erabiliz erregistratzen ari zara", - "Default server": "Zerbitzari lenetetsia", + "Default server": "Zerbitzari lehenetsia", "Custom server": "Zerbitzari aukeratua", "Home server URL": "Hasiera zerbitzariaren URLa", "Identity server URL": "Identitate zerbitzariaren URLa", From d4578783ef3b3ae6a788b2059f57d4b23381fea2 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 Jun 2018 18:46:02 +0100 Subject: [PATCH 072/283] apply pr review feedback fix copyright headers fix user settings link accessibility fix typo and add noopener Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/ContextualMenu.js | 2 +- src/components/structures/UserSettings.js | 4 ++-- src/components/views/dialogs/ShareDialog.js | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js index d6a11ca974..12603c1b45 100644 --- a/src/components/structures/ContextualMenu.js +++ b/src/components/structures/ContextualMenu.js @@ -1,6 +1,6 @@ /* Copyright 2015, 2016 OpenMarket Ltd -Copyright 2018 Vector Creations Ltd +Copyright 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js index 8511010ed6..25ca70056b 100644 --- a/src/components/structures/UserSettings.js +++ b/src/components/structures/UserSettings.js @@ -1304,9 +1304,9 @@ module.exports = React.createClass({
{ _t("Logged in as:") + ' ' } - + { this._me } - +
{ _t('Access Token:') + ' ' } diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js index a88052ee6d..e68922d35a 100644 --- a/src/components/views/dialogs/ShareDialog.js +++ b/src/components/views/dialogs/ShareDialog.js @@ -1,5 +1,5 @@ /* -Copyright 2018 Vector Creations Ltd +Copyright 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ const socials = [ img: 'img/social/', url: (url) => `https://plus.google.com/share?url=${url}`, },*/ { - name: 'Linked In', + name: 'LinkedIn', img: 'img/social/linkedin.png', url: (url) => `https://www.linkedin.com/shareArticle?mini=true&url=${url}`, }, { @@ -193,13 +193,14 @@ export default class ShareDialog extends React.Component {

Social

{ - socials.map((social) => - + {social.name} ) }
From a257dc27c5c7af9ad4af3847ea1b91d49db5ae3c Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 Jun 2018 19:08:24 +0100 Subject: [PATCH 073/283] move css rule to be more generic; remove overriden rule Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/css/views/messages/_MTextBody.scss | 5 ----- res/css/views/rooms/_EventTile.scss | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/res/css/views/messages/_MTextBody.scss b/res/css/views/messages/_MTextBody.scss index fcf397fd2d..93a89ad1b7 100644 --- a/res/css/views/messages/_MTextBody.scss +++ b/res/css/views/messages/_MTextBody.scss @@ -17,8 +17,3 @@ limitations under the License. .mx_MTextBody { white-space: pre-wrap; } - -.mx_MTextBody pre{ - overflow-y: auto; - max-height: 30vh; -} diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss index ce2bf9c8a4..80d2cd3418 100644 --- a/res/css/views/rooms/_EventTile.scss +++ b/res/css/views/rooms/_EventTile.scss @@ -391,6 +391,7 @@ limitations under the License. .mx_EventTile_content .markdown-body pre { overflow-x: overlay; overflow-y: visible; + max-height: 30vh; } .mx_EventTile_content .markdown-body code { From 3c4d62ddf85924777b7b883f5c71096b83fef5c1 Mon Sep 17 00:00:00 2001 From: Szimszon Date: Sun, 27 May 2018 19:14:49 +0000 Subject: [PATCH 074/283] Translated using Weblate (Hungarian) Currently translated at 100.0% (1190 of 1190 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index aa1904d0bf..ce0e859a22 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1195,5 +1195,6 @@ "Yes, I want to help!": "Igen, segítek!", "Can't leave Server Notices room": "Nem lehet elhagyni a Szerver Üzenetek szobát", "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ez a szoba fontos szerverüzenetek közlésére jött létre, nem tudsz kilépni belőle.", - "To notify everyone in the room, you must be a": "Hogy mindenkinek tudj üzenni ahhoz ilyen szinten kell lenned:" + "To notify everyone in the room, you must be a": "Hogy mindenkinek tudj üzenni ahhoz ilyen szinten kell lenned:", + "Try the app first": "Először próbáld ki az alkalmazást" } From 5dced2f699777fad937115fc0e072c0d1c27fdfb Mon Sep 17 00:00:00 2001 From: Sotiris Papatheodorou Date: Wed, 13 Jun 2018 22:21:32 +0000 Subject: [PATCH 075/283] Translated using Weblate (Greek) Currently translated at 71.8% (855 of 1190 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/ --- src/i18n/strings/el.json | 88 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 4 deletions(-) diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index 929ca5e7df..1b22679520 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -107,7 +107,7 @@ "Failed to reject invitation": "Δεν ήταν δυνατή η απόρριψη της πρόσκλησης", "Failed to save settings": "Δεν ήταν δυνατή η αποθήκευση των ρυθμίσεων", "Failed to send email": "Δεν ήταν δυνατή η αποστολή ηλ. αλληλογραφίας", - "Failed to verify email address: make sure you clicked the link in the email": "Δεν ήταν δυνατή η επιβεβαίωση του μηνύματος ηλεκτρονικής αλληλογραφίας βεβαιωθείτε οτι κάνατε κλικ στον σύνδεσμο που σας στάλθηκε", + "Failed to verify email address: make sure you clicked the link in the email": "Δεν ήταν δυνατή η επιβεβαίωση της διεύθυνσης ηλεκτρονικής αλληλογραφίας: βεβαιωθείτε οτι κάνατε κλικ στον σύνδεσμο που σας στάλθηκε", "Favourite": "Αγαπημένο", "Favourites": "Αγαπημένα", "Fill screen": "Γέμισε την οθόνη", @@ -264,7 +264,7 @@ "Room %(roomId)s not visible": "Το δωμάτιο %(roomId)s δεν είναι ορατό", "%(roomName)s does not exist.": "Το %(roomName)s δεν υπάρχει.", "Searches DuckDuckGo for results": "Γίνεται αναζήτηση στο DuckDuckGo για αποτελέσματα", - "Seen by %(userName)s at %(dateTime)s": "Διαβάστηκε από %(userName)s στις %(dateTime)s", + "Seen by %(userName)s at %(dateTime)s": "Διαβάστηκε από τον/την %(userName)s στις %(dateTime)s", "Send anyway": "Αποστολή ούτως ή άλλως", "Send Invites": "Αποστολή προσκλήσεων", "Send Reset Email": "Αποστολή μηνύματος επαναφοράς", @@ -465,7 +465,7 @@ "%(senderName)s removed their profile picture.": "Ο %(senderName)s αφαίρεσε τη φωτογραφία του προφίλ του.", "%(senderName)s requested a VoIP conference.": "Ο %(senderName)s αιτήθηκε μια συνδιάσκεψη VoIP.", "Riot does not have permission to send you notifications - please check your browser settings": "Το Riot δεν έχει δικαιώματα για αποστολή ειδοποιήσεων - παρακαλούμε ελέγξτε τις ρυθμίσεις του περιηγητή σας", - "Riot was not given permission to send notifications - please try again": "Δεν δόθηκαν δικαιώματα στο Riot να αποστείλει ειδοποιήσεις - παρακαλούμε προσπαθήστε ξανά", + "Riot was not given permission to send notifications - please try again": "Δεν δόθηκαν δικαιώματα αποστολής ειδοποιήσεων στο Riot - παρακαλούμε προσπαθήστε ξανά", "Room contains unknown devices": "Το δωμάτιο περιέχει άγνωστες συσκευές", "%(roomName)s is not accessible at this time.": "Το %(roomName)s δεν είναι προσβάσιμο αυτή τη στιγμή.", "Scroll to bottom of page": "Μετάβαση στο τέλος της σελίδας", @@ -773,5 +773,85 @@ "e.g. ": "π.χ. ", "Your device resolution": "Η ανάλυση της συσκευής σας", "The information being sent to us to help make Riot.im better includes:": "Οι πληροφορίες που στέλνονται σε εμάς με σκοπό την βελτίωση του Riot.im περιλαμβάνουν:", - "Call Failed": "Η κλήση απέτυχε" + "Call Failed": "Η κλήση απέτυχε", + "Whether or not you're logged in (we don't record your user name)": "Εάν είστε συνδεδεμένος/η ή όχι (δεν καταγράφουμε το όνομα χρήστη σας)", + "e.g. %(exampleValue)s": "π.χ. %(exampleValue)s", + "Review Devices": "Ανασκόπηση συσκευών", + "Call Anyway": "Κλήση όπως και να 'χει", + "Answer Anyway": "Απάντηση όπως και να 'χει", + "Call": "Κλήση", + "Answer": "Απάντηση", + "AM": "ΠΜ", + "PM": "ΜΜ", + "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s", + "Who would you like to add to this community?": "Ποιον/α θα θέλατε να προσθέσετε σε αυτή την κοινότητα;", + "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Προσοχή: κάθε άτομο που προσθέτετε στην κοινότητα θε είναι δημοσίως ορατό σε οποιονδήποτε γνωρίζει το αναγνωριστικό της κοινότητας", + "Invite new community members": "Προσκαλέστε νέα μέλη στην κοινότητα", + "Name or matrix ID": "Όνομα ή αναγνωριστικό του matrix", + "Invite to Community": "Πρόσκληση στην κοινότητα", + "Which rooms would you like to add to this community?": "Ποια δωμάτια θα θέλατε να προσθέσετε σε αυτή την κοινότητα;", + "Add rooms to the community": "Προσθήκη δωματίων στην κοινότητα", + "Add to community": "Προσθήκη στην κοινότητα", + "Failed to invite the following users to %(groupId)s:": "Αποτυχία πρόσκλησης των ακόλουθων χρηστών στο %(groupId)s :", + "Failed to invite users to community": "Αποτυχία πρόσκλησης χρηστών στην κοινότητα", + "Failed to invite users to %(groupId)s": "Αποτυχία πρόσκλησης χρηστών στο %(groupId)s", + "Failed to add the following rooms to %(groupId)s:": "Αποτυχία προσθήκης των ακόλουθων δωματίων στο %(groupId)s:", + "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Υπάρχουν άγνωστες συσκευές στο δωμάτιο: εάν συνεχίσετε χωρίς να τις επιβεβαιώσετε, θα μπορούσε κάποιος να κρυφακούει την κλήση σας.", + "Show these rooms to non-members on the community page and room list?": "Εμφάνιση αυτών των δωματίων σε μη-μέλη στην σελίδα της κοινότητας και στη λίστα δωματίων;", + "Room name or alias": "Όνομα η ψευδώνυμο δωματίου", + "Restricted": "Περιορισμένο", + "Unable to create widget.": "Αδυναμία δημιουργίας widget.", + "Reload widget": "Ανανέωση widget", + "You are not in this room.": "Δεν είστε μέλος αυτού του δωματίου.", + "You do not have permission to do that in this room.": "Δεν έχετε την άδεια να το κάνετε αυτό σε αυτό το δωμάτιο.", + "You are now ignoring %(userId)s": "Τώρα αγνοείτε τον/την %(userId)s", + "You are no longer ignoring %(userId)s": "Δεν αγνοείτε πια τον/την %(userId)s", + "%(oldDisplayName)s changed their display name to %(displayName)s.": "Ο/Η %(oldDisplayName)s άλλαξε το εμφανιζόμενο όνομά του/της σε %(displayName)s.", + "%(senderName)s changed the pinned messages for the room.": "Ο/Η %(senderName)s άλλαξε τα καρφιτσωμένα μηνύματα του δωματίου.", + "%(widgetName)s widget modified by %(senderName)s": "Έγινε αλλαγή στο widget %(widgetName)s από τον/την %(senderName)s", + "%(widgetName)s widget added by %(senderName)s": "Προστέθηκε το widget %(widgetName)s από τον/την %(senderName)s", + "%(widgetName)s widget removed by %(senderName)s": "Το widget %(widgetName)s αφαιρέθηκε από τον/την %(senderName)s", + "%(names)s and %(count)s others are typing|other": "Ο/Η %(names)s και άλλοι/ες %(count)s πληκτρολογούν", + "%(names)s and %(count)s others are typing|one": "Ο/Η %(names)s και άλλος ένας πληκτρολογούν", + "Message Replies": "Απαντήσεις", + "Message Pinning": "Καρφίτσωμα Μηνυμάτων", + "Hide avatar changes": "Απόκρυψη αλλαγών εικονιδίων χρηστών", + "Hide display name changes": "Απόκρυψη αλλαγών εμφανιζόμενων ονομάτων", + "Hide avatars in user and room mentions": "Απόκρυψη εικονιδίων στις αναφορές χρηστών και δωματίων", + "Enable URL previews for this room (only affects you)": "Ενεργοποίηση προεπισκόπισης URL για αυτό το δωμάτιο (επηρεάζει μόνο εσάς)", + "Delete %(count)s devices|other": "Διαγραφή %(count)s συσκευών", + "Delete %(count)s devices|one": "Διαγραφή συσκευής", + "Select devices": "Επιλογή συσκευών", + "Cannot add any more widgets": "Δεν είναι δυνατή η προσθήκη άλλων widget", + "The maximum permitted number of widgets have already been added to this room.": "Ο μέγιστος επιτρεπτός αριθμός widget έχει ήδη προστεθεί σε αυτό το δωμάτιο.", + "Add a widget": "Προσθήκη widget", + "%(senderName)s sent an image": "Ο/Η %(senderName)s έστειλε μία εικόνα", + "%(senderName)s sent a video": "Ο/Η %(senderName)s έστειλε ένα βίντεο", + "%(senderName)s uploaded a file": "Ο/Η %(senderName)s αναφόρτωσε ένα αρχείο", + "If your other devices do not have the key for this message you will not be able to decrypt them.": "Εάν οι άλλες συσκευές σας δεν έχουν το κλειδί για αυτό το μήνυμα, τότε δεν θα μπορείτε να το αποκρυπτογραφήσετε.", + "Disinvite this user?": "Ακύρωση πρόσκλησης αυτού του χρήστη;", + "Mention": "Αναφορά", + "Invite": "Πρόσκληση", + "User Options": "Επιλογές Χρήστη", + "Send an encrypted reply…": "Αποστολή κρυπτογραφημένης απάντησης…", + "Send a reply (unencrypted)…": "Αποστολή απάντησης (μη κρυπτογραφημένης)…", + "Send an encrypted message…": "Αποστολή κρυπτογραφημένου μηνύματος…", + "Send a message (unencrypted)…": "Αποστολή μηνύματος (μη κρυπτογραφημένου)…", + "Unable to reply": "Αδυναμία απάντησης", + "Unpin Message": "Ξεκαρφίτσωμα μηνύματος", + "Jump to message": "Πηγαίντε στο μήνυμα", + "No pinned messages.": "Κανένα καρφιτσωμένο μήνυμα.", + "Loading...": "Φόρτωση...", + "Pinned Messages": "Καρφιτσωμένα Μηνύματα", + "%(duration)ss": "%(duration)sδ", + "%(duration)sm": "%(duration)sλ", + "%(duration)sh": "%(duration)sω", + "%(duration)sd": "%(duration)sμ", + "Online for %(duration)s": "Σε σύνδεση για %(duration)s", + "Idle for %(duration)s": "Αδρανής για %(duration)s", + "Offline for %(duration)s": "Εκτός σύνδεσης για %(duration)s", + "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Διαβάστηκε από τον/την %(displayName)s (%(userName)s) στις %(dateTime)s", + "Room Notification": "Ειδοποίηση Δωματίου", + "Notify the whole room": "Ειδοποιήστε όλο το δωμάτιο", + "Sets the room topic": "Ορίζει το θέμα του δωματίου" } From 05e1dd55f0890eb11d354e2e35cefa75402b3ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= Date: Wed, 13 Jun 2018 17:55:34 +0000 Subject: [PATCH 076/283] Translated using Weblate (Serbian) Currently translated at 99.6% (1186 of 1190 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/ --- src/i18n/strings/sr.json | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json index e73107376b..b2eee28b37 100644 --- a/src/i18n/strings/sr.json +++ b/src/i18n/strings/sr.json @@ -1160,5 +1160,29 @@ "Clear Storage and Sign Out": "Очисти складиште и одјави ме", "Refresh": "Освежи", "We encountered an error trying to restore your previous session.": "Наишли смо на грешку приликом повраћаја ваше претходне сесије.", - "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Чишћење складишта вашег прегледача може решити проблем али ће вас то одјавити и учинити шифровани историјат ћаскања нечитљивим." + "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Чишћење складишта вашег прегледача може решити проблем али ће вас то одјавити и учинити шифровани историјат ћаскања нечитљивим.", + "e.g. %(exampleValue)s": "нпр.: %(exampleValue)s", + "Reload widget": "Поново учитај виџет", + "Send analytics data": "Пошаљи аналитичке податке", + "Enable widget screenshots on supported widgets": "Омогући снимке екрана виџета у подржаним виџетима", + "At this time it is not possible to reply with a file so this will be sent without being a reply.": "У овом тренутку није могуће одговорити са датотеком тако да ово неће бити послато у облику одговора.", + "Unable to reply": "Не могу да одговорим", + "At this time it is not possible to reply with an emote.": "У овом тренутку није могуће одговорити са емотиконом.", + "To notify everyone in the room, you must be a": "Да бисте обавестили све у соби, морате бити", + "Muted Users": "Утишани корисници", + "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Помозите побољшавање Riot.im програма тако што ћете послати анонимне податке о коришћењу. Ово ће захтевати коришћење колачића (погледајте нашу политику о колачићима).", + "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Помозите побољшавање Riot.im програма тако што ћете послати анонимне податке о коришћењу. Ово ће захтевати коришћење колачића.", + "Yes, I want to help!": "Да, желим помоћи!", + "Warning: This widget might use cookies.": "Упозорење: овај виџет ће можда користити колачиће.", + "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не могу да учитам догађај на који је послат одговор, или не постоји или немате овлашћење да га погледате.", + "Failed to indicate account erasure": "Неуспех при наговештавању да је налог обрисан", + "To continue, please enter your password:": "Да бисте наставили, унесите вашу лозинку:", + "password": "лозинка", + "Collapse Reply Thread": "Скупи нит са одговорима", + "Can't leave Server Notices room": "Не могу да напустим собу са напоменама сервера", + "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ова соба се користи за важне поруке са Кућног сервера, не можете изаћи из ове собе.", + "Terms and Conditions": "Услови коришћења", + "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Да бисте наставили са коришћењем Кућног сервера %(homeserverDomain)s морате погледати и пристати на наше услове коришћења.", + "Review terms and conditions": "Погледај услове коришћења", + "Try the app first": "Пробајте прво апликацију" } From 666d46922266974004f8662ca654c932e865b58c Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 14 Jun 2018 10:52:39 +0100 Subject: [PATCH 077/283] Revert "Fix exception when opening dev tools" --- src/components/views/rooms/MessageComposerInput.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js index 66bae869ff..97e8780f0f 100644 --- a/src/components/views/rooms/MessageComposerInput.js +++ b/src/components/views/rooms/MessageComposerInput.js @@ -244,14 +244,12 @@ export default class MessageComposerInput extends React.Component { let editorState = null; if (contentState) { - editorState = EditorState.moveFocusToEnd( - EditorState.createWithContent(contentState, compositeDecorator) - ); + editorState = EditorState.createWithContent(contentState, compositeDecorator); } else { editorState = EditorState.createEmpty(compositeDecorator); } - return editorState; + return EditorState.moveFocusToEnd(editorState); } componentDidMount() { From ebee8a8b5d3d801235a6a75b3ec1e17f7ff8545c Mon Sep 17 00:00:00 2001 From: Szimszon Date: Thu, 14 Jun 2018 09:58:17 +0000 Subject: [PATCH 078/283] Translated using Weblate (Hungarian) Currently translated at 100.0% (1192 of 1192 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index f878ca7b7d..d0b204bed6 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1188,5 +1188,7 @@ "Can't leave Server Notices room": "Nem lehet elhagyni a Szerver Üzenetek szobát", "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ez a szoba fontos szerverüzenetek közlésére jött létre, nem tudsz kilépni belőle.", "To notify everyone in the room, you must be a": "Hogy mindenkinek tudj üzenni ahhoz ilyen szinten kell lenned:", - "Try the app first": "Először próbáld ki az alkalmazást" + "Try the app first": "Először próbáld ki az alkalmazást", + "Encrypting": "Titkosít", + "Encrypted, not sent": "Titkosítva, de nincs elküldve" } From f6d75f865464d864fe5f31e2363711eae3391b13 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 14 Jun 2018 10:04:20 +0000 Subject: [PATCH 079/283] Translated using Weblate (Russian) Currently translated at 99.8% (1190 of 1192 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/ --- src/i18n/strings/ru.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index 859b1f2b3c..794a36e91f 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -1186,5 +1186,7 @@ "To notify everyone in the room, you must be a": "Для уведомления всех в комнате, вы должны быть", "Can't leave Server Notices room": "Невозможно покинуть комнату сервера уведомлений", "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната используется для важных сообщений от сервера, поэтому вы не можете ее покинуть.", - "Try the app first": "Сначала попробуйте приложение" + "Try the app first": "Сначала попробуйте приложение", + "Encrypting": "Шифрование", + "Encrypted, not sent": "Зашифровано, не отправлено" } From 384c9745896fa79311a3e4be474eb200d64656f9 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 14 Jun 2018 11:16:57 +0100 Subject: [PATCH 080/283] tidy up if statements and fix up comments Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/RoomSubList.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js index 17daa8553b..33ff17caa4 100644 --- a/src/components/structures/RoomSubList.js +++ b/src/components/structures/RoomSubList.js @@ -106,15 +106,10 @@ var RoomSubList = React.createClass({ applySearchFilter: function(list, filter) { if (filter === "") return list; const lcFilter = filter.toLowerCase(); - return list.filter((room) => { - if (room.name && room.name.toLowerCase().includes(lcFilter)) return true; - // only apply search filter to aliases if it looks like an alias (starts with `#`) - // to prevent loads of false positives with server names, e.g `matrix` - if (filter[0] === '#' && room.getAliases().some((alias) => { - return alias.toLowerCase().startsWith(lcFilter); - })) return true; - return false; - }); + // case insensitive if room name includes filter, + // or if starts with `#` and one of room's aliases starts with filter + return list.filter((room) => (room.name && room.name.toLowerCase().includes(lcFilter)) || + (filter[0] === '#' && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter)))); }, // The header is collapsable if it is hidden or not stuck From c811c30c0dd525aafa91409a19c3d3982535f200 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 14 Jun 2018 11:36:04 +0100 Subject: [PATCH 081/283] fix styling of clearButton when its not there Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/css/structures/_TagPanel.scss | 2 +- src/components/structures/TagPanel.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss index ab1d4feac3..a76c04805d 100644 --- a/res/css/structures/_TagPanel.scss +++ b/res/css/structures/_TagPanel.scss @@ -25,7 +25,7 @@ limitations under the License. justify-content: space-between; } -.mx_TagPanel .mx_TagPanel_clearButton { +.mx_TagPanel .mx_TagPanel_clearButton_container { /* Constant height within flex mx_TagPanel */ height: 70px; width: 60px; diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js index 77259c863d..6b6b09c5dc 100644 --- a/src/components/structures/TagPanel.js +++ b/src/components/structures/TagPanel.js @@ -127,7 +127,9 @@ const TagPanel = React.createClass({ } return
- { clearButton } +
+ { clearButton } +
Date: Thu, 14 Jun 2018 11:42:21 +0100 Subject: [PATCH 082/283] change cursor:pointer iff clicking TagPanel background does something Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/css/structures/_TagPanel.scss | 5 ++++- src/components/structures/TagPanel.js | 13 ++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss index a76c04805d..415aafd924 100644 --- a/res/css/structures/_TagPanel.scss +++ b/res/css/structures/_TagPanel.scss @@ -17,7 +17,6 @@ limitations under the License. .mx_TagPanel { flex: 0 0 60px; background-color: $tertiary-accent-color; - cursor: pointer; display: flex; flex-direction: column; @@ -25,6 +24,10 @@ limitations under the License. justify-content: space-between; } +.mx_TagPanel_items_selected { + cursor: pointer; +} + .mx_TagPanel .mx_TagPanel_clearButton_container { /* Constant height within flex mx_TagPanel */ height: 70px; diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js index 6b6b09c5dc..652211595b 100644 --- a/src/components/structures/TagPanel.js +++ b/src/components/structures/TagPanel.js @@ -1,5 +1,5 @@ /* -Copyright 2017 New Vector Ltd. +Copyright 2017, 2018 New Vector Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import dis from '../../dispatcher'; import { _t } from '../../languageHandler'; import { Droppable } from 'react-beautiful-dnd'; +import classNames from 'classnames'; const TagPanel = React.createClass({ displayName: 'TagPanel', @@ -116,8 +117,10 @@ const TagPanel = React.createClass({ />; }); + const itemsSelected = this.state.selectedTags.length > 0; + let clearButton; - if (this.state.selectedTags.length > 0) { + if (itemsSelected) { clearButton = ; } - return
+ const classes = classNames('mx_TagPanel', { + mx_TagPanel_items_selected: itemsSelected, + }); + + return
{ clearButton }
From 68e2ee4e51784a7de27bd9765b47b95262b66bb8 Mon Sep 17 00:00:00 2001 From: Szimszon Date: Thu, 14 Jun 2018 10:45:23 +0000 Subject: [PATCH 083/283] Translated using Weblate (Hungarian) Currently translated at 100.0% (1194 of 1194 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index d0b204bed6..427d6b89ea 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1190,5 +1190,7 @@ "To notify everyone in the room, you must be a": "Hogy mindenkinek tudj üzenni ahhoz ilyen szinten kell lenned:", "Try the app first": "Először próbáld ki az alkalmazást", "Encrypting": "Titkosít", - "Encrypted, not sent": "Titkosítva, de nincs elküldve" + "Encrypted, not sent": "Titkosítva, de nincs elküldve", + "No Audio Outputs detected": "Nem található hang kimenet", + "Audio Output": "Hang kimenet" } From 63e9c0aa1e02d066544e52691f5280570349e0b3 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 14 Jun 2018 10:21:15 +0000 Subject: [PATCH 084/283] Translated using Weblate (Russian) Currently translated at 99.8% (1192 of 1194 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/ --- src/i18n/strings/ru.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index 794a36e91f..9853c8a173 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -1188,5 +1188,7 @@ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната используется для важных сообщений от сервера, поэтому вы не можете ее покинуть.", "Try the app first": "Сначала попробуйте приложение", "Encrypting": "Шифрование", - "Encrypted, not sent": "Зашифровано, не отправлено" + "Encrypted, not sent": "Зашифровано, не отправлено", + "No Audio Outputs detected": "Аудиовыход не обнаружен", + "Audio Output": "Аудиовыход" } From 9a225840ce6a43f5e62a03a18cbe28ba6a1ecc7b Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 14 Jun 2018 12:00:53 +0100 Subject: [PATCH 085/283] check type before msgtype in the case of `m.sticker` with msgtype (undef) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/messages/MessageEvent.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js index c4d29257ff..fd51e6074b 100644 --- a/src/components/views/messages/MessageEvent.js +++ b/src/components/views/messages/MessageEvent.js @@ -72,10 +72,10 @@ module.exports = React.createClass({ let BodyType = UnknownBody; if (!this.props.mxEvent.isRedacted()) { // only resolve BodyType if event is not redacted - if (msgtype && bodyTypes[msgtype]) { - BodyType = bodyTypes[msgtype]; - } else if (type && evTypes[type]) { + if (type && evTypes[type]) { BodyType = evTypes[type]; + } else if (msgtype && bodyTypes[msgtype]) { + BodyType = bodyTypes[msgtype]; } else if (content.url) { // Fallback to MFileBody if there's a content URL BodyType = bodyTypes['m.file']; From d5fdfdaf8a1ee7ad219012e2ccefddb6d0351ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Thu, 14 Jun 2018 11:25:26 +0000 Subject: [PATCH 086/283] Translated using Weblate (French) Currently translated at 100.0% (1194 of 1194 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ --- src/i18n/strings/fr.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 50f801e94c..0b7abd6af5 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -1188,5 +1188,9 @@ "Can't leave Server Notices room": "Impossible de quitter le salon des Annonces du serveur", "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d'accueil, donc vous ne pouvez pas en partir.", "To notify everyone in the room, you must be a": "Pour notifier tout le monde dans le salon, vous devez être un(e)", - "Try the app first": "Essayer d'abord l'application" + "Try the app first": "Essayer d'abord l'application", + "Encrypting": "Chiffrement en cours", + "Encrypted, not sent": "Chiffré, pas envoyé", + "No Audio Outputs detected": "Aucune sortie audio détectée", + "Audio Output": "Sortie audio" } From 36574ca0fb1b0a14a5886a953b3d6dbaad2ea7d2 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 14 Jun 2018 13:03:42 +0100 Subject: [PATCH 087/283] Fix doc --- src/WidgetUtils.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/WidgetUtils.js b/src/WidgetUtils.js index 14fe3f59bd..98ee935f35 100644 --- a/src/WidgetUtils.js +++ b/src/WidgetUtils.js @@ -100,7 +100,8 @@ export default class WidgetUtils { * @param {string} widgetId The ID of the widget to wait for * @param {boolean} add True to wait for the widget to be added, * false to wait for it to be deleted. - * @returns {Promise} that resolves when the widget is available + * @returns {Promise} that resolves when the widget is the the + * requested state according to the `add` param */ static waitForUserWidget(widgetId, add) { return new Promise((resolve, reject) => { @@ -146,7 +147,8 @@ export default class WidgetUtils { * @param {string} roomId The ID of the room to wait for the widget in * @param {boolean} add True to wait for the widget to be added, * false to wait for it to be deleted. - * @returns {Promise} that resolves when the widget is available + * @returns {Promise} that resolves when the widget is the the + * requested state according to the `add` param */ static waitForRoomWidget(widgetId, roomId, add) { return new Promise((resolve, reject) => { From aa7d62b7402499297853fad02950679f8a279ce8 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 14 Jun 2018 13:20:16 +0100 Subject: [PATCH 088/283] fix naming of methods and fields Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/ShareDialog.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js index e68922d35a..97d496adbc 100644 --- a/src/components/views/dialogs/ShareDialog.js +++ b/src/components/views/dialogs/ShareDialog.js @@ -67,10 +67,10 @@ export default class ShareDialog extends React.Component { super(props); this.onCopyClick = this.onCopyClick.bind(this); - this.onCheckboxClick = this.onCheckboxClick.bind(this); + this.onLinkRecentCheckboxClick = this.onLinkRecentCheckboxClick.bind(this); this.state = { - ticked: false, + linkRecentTicked: false, }; } @@ -116,9 +116,9 @@ export default class ShareDialog extends React.Component { e.target.onmouseleave = close; } - onCheckboxClick() { + onLinkRecentCheckboxClick() { this.setState({ - ticked: !this.state.ticked, + linkRecentTicked: !this.state.linkRecentTicked, }); } @@ -135,16 +135,16 @@ export default class ShareDialog extends React.Component { if (events.length > 0) { checkbox =
+ onClick={this.onLinkRecentCheckboxClick} />
; } - if (this.state.ticked) { + if (this.state.linkRecentTicked) { matrixToUrl = makeEventPermalink(this.props.target.roomId, events[events.length - 1].getId()); } else { matrixToUrl = makeRoomPermalink(this.props.target.roomId); From 7d7a6f3d9c904874c352470d658b981196b3c8c9 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 14 Jun 2018 13:35:35 +0100 Subject: [PATCH 089/283] ShareDialog share Message, link to timestamp and permalink in ctx menu Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../views/context_menus/MessageContextMenu.js | 11 ++++++++++- src/components/views/dialogs/ShareDialog.js | 7 +++++-- src/components/views/rooms/EventTile.js | 15 +++++++++++++-- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js index 99ec493ced..bdd267c4ee 100644 --- a/src/components/views/context_menus/MessageContextMenu.js +++ b/src/components/views/context_menus/MessageContextMenu.js @@ -184,6 +184,15 @@ module.exports = React.createClass({ this.closeMenu(); }, + onPermalinkClick: function(e: Event) { + e.preventDefault(); + const ShareDialog = sdk.getComponent("dialogs.ShareDialog"); + Modal.createTrackedDialog('share room message dialog', '', ShareDialog, { + target: this.props.mxEvent, + }); + this.closeMenu(); + }, + onReplyClick: function() { dis.dispatch({ action: 'reply_to_event', @@ -290,7 +299,7 @@ module.exports = React.createClass({ const permalinkButton = (
{ _t('Permalink') } + target="_blank" rel="noopener" onClick={this.onPermalinkClick}>{ _t('Share Message') }
); diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js index 97d496adbc..12efc8b919 100644 --- a/src/components/views/dialogs/ShareDialog.js +++ b/src/components/views/dialogs/ShareDialog.js @@ -16,7 +16,7 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; -import {Room, User, Group, RoomMember} from 'matrix-js-sdk'; +import {Room, User, Group, RoomMember, MatrixEvent} from 'matrix-js-sdk'; import sdk from '../../../index'; import { _t } from '../../../languageHandler'; import QRCode from 'qrcode-react'; @@ -59,7 +59,7 @@ export default class ShareDialog extends React.Component { PropTypes.instanceOf(User), PropTypes.instanceOf(Group), PropTypes.instanceOf(RoomMember), - // PropTypes.instanceOf(MatrixEvent), + PropTypes.instanceOf(MatrixEvent), ]).isRequired, }; @@ -155,6 +155,9 @@ export default class ShareDialog extends React.Component { } else if (this.props.target instanceof Group) { title = _t('Share Community'); matrixToUrl = makeGroupPermalink(this.props.target.groupId); + } else if (this.props.target instanceof MatrixEvent) { + title = _t('Share Room Message'); + matrixToUrl = makeEventPermalink(this.props.target.roomId, this.props.target.eventId); } const encodedUrl = encodeURIComponent(matrixToUrl); diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index 589524bb9e..1160c7c886 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -438,6 +438,17 @@ module.exports = withMatrixClient(React.createClass({ }); }, + onPermalinkShareClicked: function(e) { + // These permalinks are like above, can be opened in new tab/window to matrix.to + // but otherwise fire the ShareDialog as it makes little sense to click permalink + // whilst it is in the current room + e.preventDefault(); + const ShareDialog = sdk.getComponent("dialogs.ShareDialog"); + Modal.createTrackedDialog('share room event dialog', '', ShareDialog, { + target: this.props.mxEvent, + }); + }, + _renderE2EPadlock: function() { const ev = this.props.mxEvent; const props = {onClick: this.onCryptoClicked}; @@ -667,7 +678,7 @@ module.exports = withMatrixClient(React.createClass({ { avatar } { sender }
- + { timestamp } { this._renderE2EPadlock() } @@ -694,7 +705,7 @@ module.exports = withMatrixClient(React.createClass({ { avatar } { sender }
- + { timestamp } { this._renderE2EPadlock() } From e1d3c2e4c73536f1f755edeb6aa18e7533b7b3fb Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 14 Jun 2018 13:36:39 +0100 Subject: [PATCH 090/283] run gen-i18n and prune-i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/i18n/strings/be.json | 1 - src/i18n/strings/bg.json | 1 - src/i18n/strings/ca.json | 1 - src/i18n/strings/cs.json | 1 - src/i18n/strings/da.json | 1 - src/i18n/strings/de_DE.json | 1 - src/i18n/strings/el.json | 1 - src/i18n/strings/en_EN.json | 3 ++- src/i18n/strings/en_US.json | 1 - src/i18n/strings/eo.json | 1 - src/i18n/strings/es.json | 1 - src/i18n/strings/eu.json | 1 - src/i18n/strings/fa.json | 1 - src/i18n/strings/fi.json | 1 - src/i18n/strings/fr.json | 1 - src/i18n/strings/gl.json | 1 - src/i18n/strings/he.json | 1 - src/i18n/strings/hu.json | 1 - src/i18n/strings/id.json | 1 - src/i18n/strings/is.json | 1 - src/i18n/strings/it.json | 1 - src/i18n/strings/ja.json | 1 - src/i18n/strings/ko.json | 1 - src/i18n/strings/lt.json | 1 - src/i18n/strings/lv.json | 1 - src/i18n/strings/ml.json | 1 - src/i18n/strings/nb_NO.json | 1 - src/i18n/strings/nl.json | 1 - src/i18n/strings/pl.json | 1 - src/i18n/strings/pt.json | 1 - src/i18n/strings/pt_BR.json | 1 - src/i18n/strings/ru.json | 1 - src/i18n/strings/sk.json | 1 - src/i18n/strings/sq.json | 1 - src/i18n/strings/sr.json | 1 - src/i18n/strings/sv.json | 1 - src/i18n/strings/ta.json | 1 - src/i18n/strings/th.json | 1 - src/i18n/strings/tr.json | 1 - src/i18n/strings/uk.json | 1 - src/i18n/strings/zh_Hans.json | 1 - src/i18n/strings/zh_Hant.json | 1 - 42 files changed, 2 insertions(+), 42 deletions(-) diff --git a/src/i18n/strings/be.json b/src/i18n/strings/be.json index 7e79f5d355..31360c87f4 100644 --- a/src/i18n/strings/be.json +++ b/src/i18n/strings/be.json @@ -31,7 +31,6 @@ "Noisy": "Шумна", "Resend": "Паўторна", "On": "Уключыць", - "Permalink": "Пастаянная спасылка", "remove %(name)s from the directory.": "выдаліць %(name)s з каталога.", "Off": "Выключыць", "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Выдаліць псеўданім пакоя %(alias)s і выдаліць %(name)s з каталога?", diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json index d157f4dff8..b86941b3b7 100644 --- a/src/i18n/strings/bg.json +++ b/src/i18n/strings/bg.json @@ -1125,7 +1125,6 @@ "Set Password": "Задаване на парола", "An error occurred whilst saving your email notification preferences.": "Възникна грешка при запазване на настройките за имейл известяване.", "Enable audible notifications in web client": "Включване на звукови известия в уеб клиент", - "Permalink": "Permalink", "Off": "Изключено", "Riot does not know how to join a room on this network": "Riot не знае как да се присъедини към стая от тази мрежа", "Mentions only": "Само при споменаване", diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json index 407b9f61d4..f7212619b2 100644 --- a/src/i18n/strings/ca.json +++ b/src/i18n/strings/ca.json @@ -1004,7 +1004,6 @@ "Unable to fetch notification target list": "No s'ha pogut obtenir la llista d'objectius de les notificacions", "Set Password": "Establiu una contrasenya", "Enable audible notifications in web client": "Habilita les notificacions d'àudio al client web", - "Permalink": "Enllaç permanent", "Off": "Apagat", "Riot does not know how to join a room on this network": "El Riot no sap com unir-se a una sala en aquesta xarxa", "Mentions only": "Només mencions", diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json index 33c7a3d5f1..99424d6043 100644 --- a/src/i18n/strings/cs.json +++ b/src/i18n/strings/cs.json @@ -1062,7 +1062,6 @@ "Set Password": "Nastavit heslo", "An error occurred whilst saving your email notification preferences.": "Při ukládání nastavení e-mailových upozornění nastala chyba.", "Enable audible notifications in web client": "Povolit zvuková upozornění ve webové aplikaci", - "Permalink": "Trvalý odkaz", "Off": "Vypnout", "#example": "#příklad", "Mentions only": "Pouze zmínky", diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json index 2a59530d5a..02497a7934 100644 --- a/src/i18n/strings/da.json +++ b/src/i18n/strings/da.json @@ -371,7 +371,6 @@ "Unable to fetch notification target list": "Kan ikke hente meddelelsesmålliste", "Set Password": "Indstil Password", "Enable audible notifications in web client": "Aktivér hørbare underretninger i webklienten", - "Permalink": "Permanent link", "Resend": "Send igen", "Riot does not know how to join a room on this network": "Riot ved ikke, hvordan man kan deltage i et rum på dette netværk", "Mentions only": "Kun nævninger", diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 8f75b71689..9688f4da8f 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -1126,7 +1126,6 @@ "Unable to fetch notification target list": "Liste der Benachrichtigungsempfänger konnte nicht abgerufen werden", "Set Password": "Passwort einrichten", "Enable audible notifications in web client": "Audio-Benachrichtigungen im Web-Client aktivieren", - "Permalink": "Permanenter Link", "Off": "Aus", "Riot does not know how to join a room on this network": "Riot weiß nicht, wie es einem Raum auf diesem Netzwerk beitreten soll", "Mentions only": "Nur, wenn du erwähnt wirst", diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index fabd88c74a..e12f9223a2 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -746,7 +746,6 @@ "What's New": "Τι νέο υπάρχει", "Set Password": "Ορισμός κωδικού πρόσβασης", "Enable audible notifications in web client": "Ενεργοποίηση ηχητικών ειδοποιήσεων", - "Permalink": "Μόνιμος σύνδεσμος", "Off": "Ανενεργό", "#example": "#παράδειγμα", "Mentions only": "Μόνο αναφορές", diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 76d0cb6f33..bb5ad5405b 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -862,6 +862,7 @@ "Link to most recent message": "Link to most recent message", "Share User": "Share User", "Share Community": "Share Community", + "Share Room Message": "Share Room Message", "COPY": "COPY", "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.", "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.", @@ -881,7 +882,7 @@ "View Source": "View Source", "View Decrypted Source": "View Decrypted Source", "Unhide Preview": "Unhide Preview", - "Permalink": "Permalink", + "Share Message": "Share Message", "Quote": "Quote", "Source URL": "Source URL", "Collapse Reply Thread": "Collapse Reply Thread", diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json index 43e2041020..be71d0ae1d 100644 --- a/src/i18n/strings/en_US.json +++ b/src/i18n/strings/en_US.json @@ -816,7 +816,6 @@ "Unable to fetch notification target list": "Unable to fetch notification target list", "Set Password": "Set Password", "Enable audible notifications in web client": "Enable audible notifications in web client", - "Permalink": "Permalink", "Off": "Off", "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network", "Mentions only": "Mentions only", diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json index 68645ffd9c..3c20baef9e 100644 --- a/src/i18n/strings/eo.json +++ b/src/i18n/strings/eo.json @@ -1077,7 +1077,6 @@ "Unable to fetch notification target list": "Malsukcesis akiri la liston de celoj por sciigoj", "Set Password": "Agordi pasvorton", "Enable audible notifications in web client": "Ŝalti aŭdeblajn sciigojn en la retkliento", - "Permalink": "Konstanta ligilo", "Off": "For", "Riot does not know how to join a room on this network": "Riot ne scias aliĝi al ĉambroj en tiu ĉi reto", "Mentions only": "Nur mencioj", diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index 8e7925ba36..b377e97e74 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -717,7 +717,6 @@ "Riot does not know how to join a room on this network": "Riot no sabe cómo unirse a una sala en esta red", "Set Password": "Establecer contraseña", "Enable audible notifications in web client": "Habilitar notificaciones audibles en el cliente web", - "Permalink": "Enlace permanente", "Off": "Apagado", "#example": "#ejemplo", "Mentions only": "Sólo menciones", diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index fe9d3db424..229c9d648e 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -1127,7 +1127,6 @@ "Unable to fetch notification target list": "Ezin izan da jakinarazpen helburuen zerrenda eskuratu", "Set Password": "Ezarri pasahitza", "Enable audible notifications in web client": "Gaitu jakinarazpen entzungarriak web bezeroan", - "Permalink": "Esteka iraunkorra", "Off": "Ez", "Riot does not know how to join a room on this network": "Riotek ez daki nola elkartu gela batetara sare honetan", "Mentions only": "Aipamenak besterik ez", diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json index 0e532d9483..2b18ba7693 100644 --- a/src/i18n/strings/fa.json +++ b/src/i18n/strings/fa.json @@ -124,7 +124,6 @@ "Set Password": "پسوردتان را انتخاب کنید", "An error occurred whilst saving your email notification preferences.": "خطایی در حین ذخیره‌ی ترجیجات شما درباره‌ی رایانامه رخ داد.", "Enable audible notifications in web client": "آگاه‌سازی صدادار را در کارگزار وب فعال کن", - "Permalink": "پایاپیوند", "Off": "خاموش", "Riot does not know how to join a room on this network": "رایوت از چگونگی ورود به یک گپ در این شبکه اطلاعی ندارد", "Mentions only": "فقط نام‌بردن‌ها", diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json index e5787ab561..204ed4ba87 100644 --- a/src/i18n/strings/fi.json +++ b/src/i18n/strings/fi.json @@ -1050,7 +1050,6 @@ "Set Password": "Aseta salasana", "An error occurred whilst saving your email notification preferences.": "Sähköposti-ilmoitusasetuksia tallettaessa tapahtui virhe.", "Enable audible notifications in web client": "Ota käyttöön äänelliset ilmoitukset", - "Permalink": "Pysyvä linkki", "remove %(name)s from the directory.": "poista %(name)s hakemistosta.", "Off": "Pois päältä", "Riot does not know how to join a room on this network": "Riot ei tiedä miten liittya huoneeseen tässä verkossa", diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 367e89d2b6..fa33d58846 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -1121,7 +1121,6 @@ "Unable to fetch notification target list": "Impossible de récupérer la liste des appareils recevant les notifications", "Set Password": "Définir un mot de passe", "Enable audible notifications in web client": "Activer les notifications sonores pour le client web", - "Permalink": "Permalien", "Off": "Désactivé", "Riot does not know how to join a room on this network": "Riot ne peut pas joindre un salon sur ce réseau", "Mentions only": "Seulement les mentions", diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index fdab066031..70d0889ae0 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -1127,7 +1127,6 @@ "Unable to fetch notification target list": "Non se puido procesar a lista de obxetivo de notificacións", "Set Password": "Establecer contrasinal", "Enable audible notifications in web client": "Habilitar notificacións audibles no cliente web", - "Permalink": "Ligazón permanente", "Off": "Off", "Riot does not know how to join a room on this network": "Riot non sabe cómo conectar con unha sala en esta rede", "Mentions only": "Só mencións", diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json index dbae2858a9..7d96dfa089 100644 --- a/src/i18n/strings/he.json +++ b/src/i18n/strings/he.json @@ -221,7 +221,6 @@ "Unable to fetch notification target list": "לא ניתן לאחזר רשימת יעדי התראה", "Set Password": "הגדר סיסמא", "Enable audible notifications in web client": "אפשר התראות קוליות בדפדפן", - "Permalink": "קישור קבוע", "Off": "סגור", "Riot does not know how to join a room on this network": "Riot אינו יודע כיצד להצטרף לחדר ברשת זו", "Mentions only": "מאזכר בלבד", diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 3d8100d8f1..e142e7506a 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1126,7 +1126,6 @@ "Unable to fetch notification target list": "Nem sikerült letölteni az értesítési célok listáját", "Set Password": "Jelszó beállítása", "Enable audible notifications in web client": "Hangértesítések engedélyezése a webkliensben", - "Permalink": "Állandó hivatkozás", "Off": "Ki", "Riot does not know how to join a room on this network": "A Riot nem tud csatlakozni szobához ezen a hálózaton", "Mentions only": "Csak ha megemlítenek", diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json index 9db1a4a99c..f0506d873e 100644 --- a/src/i18n/strings/id.json +++ b/src/i18n/strings/id.json @@ -324,7 +324,6 @@ "Unable to fetch notification target list": "Tidak dapat mengambil daftar notifikasi target", "Set Password": "Ubah Password", "Enable audible notifications in web client": "Aktifkan notifikasi suara di klien web", - "Permalink": "Permalink", "Off": "Mati", "Riot does not know how to join a room on this network": "Riot tidak tau bagaimana gabung ruang di jaringan ini", "Mentions only": "Hanya jika disinggung", diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json index d901c52f60..39f03156f5 100644 --- a/src/i18n/strings/is.json +++ b/src/i18n/strings/is.json @@ -380,7 +380,6 @@ "View Source": "Skoða frumkóða", "View Decrypted Source": "Skoða afkóðaða upprunaskrá", "Unhide Preview": "Birta forskoðun", - "Permalink": "Varanlegur tengill", "Quote": "Tilvitnun", "Source URL": "Upprunaslóð", "All messages (noisy)": "Öll skilaboð (hávært)", diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index c73dc8b60d..d96c315363 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -1122,7 +1122,6 @@ "What's New": "Novità", "Set Password": "Imposta Password", "Enable audible notifications in web client": "Abilita notifiche audio nel client web", - "Permalink": "Link permanente", "Off": "Spento", "#example": "#esempio", "Mentions only": "Solo le citazioni", diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json index 80bd4f1ff5..741de4b551 100644 --- a/src/i18n/strings/ja.json +++ b/src/i18n/strings/ja.json @@ -223,7 +223,6 @@ "Event Type": "イベントの形式", "What's New": "新着", "Enable audible notifications in web client": "ウェブクライアントで音による通知を有効化", - "Permalink": "パーマリンク", "remove %(name)s from the directory.": "ディレクトリから %(name)s を消去する。", "Riot does not know how to join a room on this network": "Riotはこのネットワークで部屋に参加する方法を知りません", "You can now return to your account after signing out, and sign in on other devices.": "サインアウト後にあなたの\nアカウントに戻る、また、他の端末でサインインすることができます。", diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json index 4e0a988223..7e58b9a253 100644 --- a/src/i18n/strings/ko.json +++ b/src/i18n/strings/ko.json @@ -754,7 +754,6 @@ "Riot does not know how to join a room on this network": "라이엇이 이 네트워크에서 방에 들어가는 법을 알 수 없어요", "Set Password": "비밀번호 설정", "Enable audible notifications in web client": "웹 클라이언트에서 알림 소리 켜기", - "Permalink": "고유주소", "Off": "끄기", "#example": "#예", "Mentions only": "답만 하기", diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json index bd46c25ed8..e1525f7af1 100644 --- a/src/i18n/strings/lt.json +++ b/src/i18n/strings/lt.json @@ -161,7 +161,6 @@ "Set Password": "Nustatyti slaptažodį", "An error occurred whilst saving your email notification preferences.": "Įrašant pranešimų el. paštu nuostatas, įvyko klaida.", "Unable to join network": "Nepavyko prisijungti prie tinklo", - "Permalink": "Pastovioji nuoroda", "Register": "Registruotis", "Off": "Išjungta", "Edit": "Koreguoti", diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json index 01e3ae5c6d..5622dcb408 100644 --- a/src/i18n/strings/lv.json +++ b/src/i18n/strings/lv.json @@ -1115,7 +1115,6 @@ "Unable to fetch notification target list": "Neizdevās iegūt paziņojumu mērķu sarakstu", "Set Password": "Iestatīt paroli", "Enable audible notifications in web client": "Iespējot skaņus paziņojumus web klientā", - "Permalink": "Pastāvīgā saite", "Off": "izslēgts", "Riot does not know how to join a room on this network": "Riot nezin kā pievienoties šajā tīklā esošajai istabai", "Mentions only": "Vienīgi atsauces", diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json index 6de7e92df7..a4bf0b421a 100644 --- a/src/i18n/strings/ml.json +++ b/src/i18n/strings/ml.json @@ -137,7 +137,6 @@ "Unable to fetch notification target list": "നോട്ടിഫിക്കേഷന്‍ ടാര്‍ഗെറ്റ് ലിസ്റ്റ് നേടാനായില്ല", "Set Password": "രഹസ്യവാക്ക് സജ്ജീകരിക്കുക", "Enable audible notifications in web client": "വെബ് പതിപ്പിലെ അറിയിപ്പുകള്‍ കേള്‍ക്കാവുന്നതാക്കുക", - "Permalink": "പെര്‍മാലിങ്ക്", "remove %(name)s from the directory.": "%(name)s ഡയറക്റ്ററിയില്‍ നിന്ന് നീക്കം ചെയ്യുക.", "Off": "ഓഫ്", "Riot does not know how to join a room on this network": "ഈ നെറ്റ്‍വര്‍ക്കിലെ ഒരു റൂമില്‍ എങ്ങനെ അംഗമാകാമെന്ന് റയട്ടിന് അറിയില്ല", diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json index 47da50122c..9a2b859854 100644 --- a/src/i18n/strings/nb_NO.json +++ b/src/i18n/strings/nb_NO.json @@ -98,7 +98,6 @@ "Riot does not know how to join a room on this network": "Riot vet ikke hvordan man kan komme inn på et rom på dette nettverket", "An error occurred whilst saving your email notification preferences.": "En feil oppsto i forbindelse med lagring av epost varsel innstillinger.", "Enable audible notifications in web client": "Aktiver lyd-varsel i webklient", - "Permalink": "Permanent lenke", "remove %(name)s from the directory.": "fjern %(name)s fra katalogen.", "Off": "Av", "#example": "#eksempel", diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index f09c63118e..bda64146cc 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -1120,7 +1120,6 @@ "Unable to fetch notification target list": "Het is mislukt om de lijst van notificatiedoelen op te halen", "Set Password": "Wachtwoord instellen", "Enable audible notifications in web client": "Geluidsmeldingen in de webclient aanzetten", - "Permalink": "Permanente link", "Off": "Uit", "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet deelnemen in een ruimte op dit netwerk", "Mentions only": "Alleen vermeldingen", diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json index d3dcb72f49..30afa07202 100644 --- a/src/i18n/strings/pl.json +++ b/src/i18n/strings/pl.json @@ -901,7 +901,6 @@ "Unable to fetch notification target list": "Nie można pobrać listy docelowej dla powiadomień", "Set Password": "Ustaw hasło", "Enable audible notifications in web client": "Włącz dźwiękowe powiadomienia w kliencie internetowym", - "Permalink": "Odnośnik bezpośredni", "Off": "Wyłącz", "Riot does not know how to join a room on this network": "Riot nie wie, jak dołączyć do pokoju w tej sieci", "Mentions only": "Tylko, gdy wymienieni", diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json index d165c6c057..c8f7a45dcf 100644 --- a/src/i18n/strings/pt.json +++ b/src/i18n/strings/pt.json @@ -826,7 +826,6 @@ "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação", "Set Password": "Definir palavra-passe", "Enable audible notifications in web client": "Ativar notificações de áudio no cliente web", - "Permalink": "Link permanente", "Off": "Desativado", "Riot does not know how to join a room on this network": "O Riot não sabe como entrar numa sala nesta rede", "Mentions only": "Apenas menções", diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index 0a4d847805..a5c4e06922 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -1101,7 +1101,6 @@ "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação", "Set Password": "Definir senha", "Enable audible notifications in web client": "Ativar notificações de áudio no cliente web", - "Permalink": "Link permanente", "Off": "Desativado", "Riot does not know how to join a room on this network": "O sistema não sabe como entrar na sala desta rede", "Mentions only": "Apenas menções", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index 2bdce2fe4f..599847ab84 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -1125,7 +1125,6 @@ "Unable to fetch notification target list": "Не удалось получить список устройств для уведомлений", "Set Password": "Задать пароль", "Enable audible notifications in web client": "Включить звуковые уведомления в веб-клиенте", - "Permalink": "Постоянная ссылка", "Off": "Выключить", "Riot does not know how to join a room on this network": "Riot не знает, как присоединиться к комнате, принадлежащей к этой сети", "Mentions only": "Только при упоминаниях", diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json index ed07ff5c09..fb49973550 100644 --- a/src/i18n/strings/sk.json +++ b/src/i18n/strings/sk.json @@ -1126,7 +1126,6 @@ "Set Password": "Nastaviť Heslo", "An error occurred whilst saving your email notification preferences.": "Počas ukladania vašich nastavení oznamovania emailom sa vyskytla chyba.", "Enable audible notifications in web client": "Povoliť zvukové oznámenia vo webovom klientovi", - "Permalink": "Trvalý odkaz", "Off": "Zakázané", "Riot does not know how to join a room on this network": "Riot nedokáže vstúpiť do miestnosti na tejto sieti", "Mentions only": "Len zmienky", diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json index 2936695a6d..66f6f032b7 100644 --- a/src/i18n/strings/sq.json +++ b/src/i18n/strings/sq.json @@ -269,7 +269,6 @@ "Set Password": "Caktoni Fjalëkalim", "An error occurred whilst saving your email notification preferences.": "Ndodhi një gabim teksa ruheshin parapëlqimet tuaja për njoftime me email.", "Enable audible notifications in web client": "Aktivizoni njoftime audio te klienti web", - "Permalink": "Permalidhje", "Register": "Regjistrohuni", "Off": "Off", "Edit": "Përpunoni", diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json index ebacd28a5c..e24fa93c09 100644 --- a/src/i18n/strings/sr.json +++ b/src/i18n/strings/sr.json @@ -1101,7 +1101,6 @@ "Set Password": "Постави лозинку", "An error occurred whilst saving your email notification preferences.": "Догодила се грешка при чувању ваших поставки мејл обавештења.", "Enable audible notifications in web client": "Омогући звучна обавештења у веб клијенту", - "Permalink": "Трајна веза", "Resend": "Поново пошаљи", "Riot does not know how to join a room on this network": "Riot не зна како да приступи соби на овој мрежи", "Mentions only": "Само спомињања", diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index ff64f1a8e6..91d1477190 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -547,7 +547,6 @@ "Unable to fetch notification target list": "Det gick inte att hämta aviseringsmållistan", "Set Password": "Välj lösenord", "Enable audible notifications in web client": "Sätt på högljudda aviseringar i webbklienten", - "Permalink": "Permanent länk", "Off": "Av", "Riot does not know how to join a room on this network": "Riot kan inte gå med i ett rum på det här nätverket", "Mentions only": "Endast omnämnande", diff --git a/src/i18n/strings/ta.json b/src/i18n/strings/ta.json index 6aecb54bfd..b8fe318b46 100644 --- a/src/i18n/strings/ta.json +++ b/src/i18n/strings/ta.json @@ -78,7 +78,6 @@ "Off": "அமை", "On": "மீது", "Operation failed": "செயல்பாடு தோல்வியுற்றது", - "Permalink": "நிரந்தரத் தொடுப்பு", "powered by Matrix": "Matrix-ஆல் ஆனது", "Quote": "மேற்கோள்", "Reject": "நிராகரி", diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json index 6fa7febabd..dac3656631 100644 --- a/src/i18n/strings/th.json +++ b/src/i18n/strings/th.json @@ -544,7 +544,6 @@ "Riot does not know how to join a room on this network": "Riot ไม่รู้วิธีเข้าร่วมห้องในเครือข่ายนี้", "Set Password": "ตั้งรหัสผ่าน", "Enable audible notifications in web client": "เปิดใช้งานเสียงแจ้งเตือนบนเว็บไคลเอนต์", - "Permalink": "ลิงก์ถาวร", "Off": "ปิด", "#example": "#example", "Mentions only": "เมื่อถูกกล่าวถึงเท่านั้น", diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index 797fed79ce..43ba89c968 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -741,7 +741,6 @@ "Unable to fetch notification target list": "Bildirim hedef listesi çekilemedi", "An error occurred whilst saving your email notification preferences.": "E-posta bildirim tercihlerinizi kaydetme işlemi sırasında bir hata oluştu.", "Enable audible notifications in web client": "Web istemcisinde sesli bildirimleri etkinleştir", - "Permalink": "Kalıcı Bağlantı(permalink)", "Off": "Kapalı", "Riot does not know how to join a room on this network": "Riot bu ağdaki bir odaya nasıl gireceğini bilmiyor", "Mentions only": "Sadece Mention'lar", diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json index 74bf855d22..b07a5dadab 100644 --- a/src/i18n/strings/uk.json +++ b/src/i18n/strings/uk.json @@ -232,7 +232,6 @@ "Unable to fetch notification target list": "Неможливо отримати перелік цілей сповіщення", "Set Password": "Задати пароль", "Enable audible notifications in web client": "Увімкнути звукові сповіщення у мережевому застосунку", - "Permalink": "Постійне посилання", "Off": "Вимкнено", "Riot does not know how to join a room on this network": "Riot не знає як приєднатись до кімнати у цій мережі", "Mentions only": "Тільки згадки", diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json index 8e2dc6e0f8..b1547170b0 100644 --- a/src/i18n/strings/zh_Hans.json +++ b/src/i18n/strings/zh_Hans.json @@ -1099,7 +1099,6 @@ "Unable to fetch notification target list": "无法获取通知目标列表", "Set Password": "设置密码", "Enable audible notifications in web client": "在网页客户端启用音频通知", - "Permalink": "永久链接", "Off": "关闭", "Riot does not know how to join a room on this network": "Riot 不知道如何在此网络中加入聊天室", "Mentions only": "只限提及", diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 95424eaefb..1e43f27a59 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -1126,7 +1126,6 @@ "Riot does not know how to join a room on this network": "Riot 不知道如何在此網路中加入聊天室", "Set Password": "設定密碼", "Enable audible notifications in web client": "在網頁客戶端啟用音訊通知", - "Permalink": "永久連結", "Off": "關閉", "#example": "#範例", "Mentions only": "僅提及", From bef435e15af87ebd622d88647f98df086e06be2f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 14 Jun 2018 13:41:12 +0100 Subject: [PATCH 091/283] allow ShareEvent to devolve into ShareRoom using checkbox + i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/ShareDialog.js | 31 +++++++++++++++------ src/i18n/strings/en_EN.json | 1 + 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js index 12efc8b919..873fcc4dee 100644 --- a/src/components/views/dialogs/ShareDialog.js +++ b/src/components/views/dialogs/ShareDialog.js @@ -67,10 +67,11 @@ export default class ShareDialog extends React.Component { super(props); this.onCopyClick = this.onCopyClick.bind(this); - this.onLinkRecentCheckboxClick = this.onLinkRecentCheckboxClick.bind(this); + this.onLinkSpecificEventCheckboxClick = this.onLinkSpecificEventCheckboxClick.bind(this); this.state = { - linkRecentTicked: false, + // MatrixEvent defaults to share linkSpecificEvent + linkSpecificEvent: this.props.target instanceof MatrixEvent, }; } @@ -116,9 +117,9 @@ export default class ShareDialog extends React.Component { e.target.onmouseleave = close; } - onLinkRecentCheckboxClick() { + onLinkSpecificEventCheckboxClick() { this.setState({ - linkRecentTicked: !this.state.linkRecentTicked, + linkSpecificEvent: !this.state.linkSpecificEvent, }); } @@ -135,16 +136,16 @@ export default class ShareDialog extends React.Component { if (events.length > 0) { checkbox =
+ onClick={this.onLinkSpecificEventCheckboxClick} />
; } - if (this.state.linkRecentTicked) { + if (this.state.linkSpecificEvent) { matrixToUrl = makeEventPermalink(this.props.target.roomId, events[events.length - 1].getId()); } else { matrixToUrl = makeRoomPermalink(this.props.target.roomId); @@ -157,7 +158,21 @@ export default class ShareDialog extends React.Component { matrixToUrl = makeGroupPermalink(this.props.target.groupId); } else if (this.props.target instanceof MatrixEvent) { title = _t('Share Room Message'); - matrixToUrl = makeEventPermalink(this.props.target.roomId, this.props.target.eventId); + checkbox =
+ + +
; + + if (this.state.linkSpecificEvent) { + matrixToUrl = makeEventPermalink(this.props.target.roomId, this.props.target.eventId); + } else { + matrixToUrl = makeRoomPermalink(this.props.target.roomId); + } } const encodedUrl = encodeURIComponent(matrixToUrl); diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index bb5ad5405b..3802c73431 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -863,6 +863,7 @@ "Share User": "Share User", "Share Community": "Share Community", "Share Room Message": "Share Room Message", + "Link to selected message": "Link to selected message", "COPY": "COPY", "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.", "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.", From e870399084ec9163f3fb655dbe586f9464c32287 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Thu, 14 Jun 2018 12:41:44 +0000 Subject: [PATCH 092/283] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (1194 of 1194 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 87886ec652..3f2e2d9dd5 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -1187,5 +1187,10 @@ "Terms and Conditions": "條款與細則", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "要繼續使用 %(homeserverDomain)s 家伺服器，您必須審閱並同意我們的條款與細則。", "Review terms and conditions": "審閱條款與細則", - "To notify everyone in the room, you must be a": "為了通知每個在聊天室裡的人，您必須為" + "To notify everyone in the room, you must be a": "為了通知每個在聊天室裡的人，您必須為", + "Encrypting": "正在加密", + "Encrypted, not sent": "已加密，未傳送", + "No Audio Outputs detected": "未偵測到音訊輸出", + "Audio Output": "音訊輸出", + "Try the app first": "先試試看應用程式" } From ef178b282c2f82181584a284b14b3d3e56a22f87 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 14 Jun 2018 13:44:05 +0100 Subject: [PATCH 093/283] use getters on MatrixEvent for roomId and eventId Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/ShareDialog.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js index 873fcc4dee..bbd381ad29 100644 --- a/src/components/views/dialogs/ShareDialog.js +++ b/src/components/views/dialogs/ShareDialog.js @@ -169,9 +169,9 @@ export default class ShareDialog extends React.Component {
; if (this.state.linkSpecificEvent) { - matrixToUrl = makeEventPermalink(this.props.target.roomId, this.props.target.eventId); + matrixToUrl = makeEventPermalink(this.props.target.getRoomId(), this.props.target.getId()); } else { - matrixToUrl = makeRoomPermalink(this.props.target.roomId); + matrixToUrl = makeRoomPermalink(this.props.target.getRoomId()); } } From 33a3cfead6e2766d9a0b7211f074290c92ae0257 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 14 Jun 2018 13:47:33 +0100 Subject: [PATCH 094/283] controlled checkboxes use `checked` not `value` Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/ShareDialog.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js index bbd381ad29..a1a8598fdb 100644 --- a/src/components/views/dialogs/ShareDialog.js +++ b/src/components/views/dialogs/ShareDialog.js @@ -136,8 +136,8 @@ export default class ShareDialog extends React.Component { if (events.length > 0) { checkbox =
{ contentHeader } From a2219472f6a115897ba23c6dcdfea64722d568b0 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 15 Jun 2018 18:47:15 +0100 Subject: [PATCH 127/283] inline redundant `bodyNodes`, fixes react no unique key warning too Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/GroupView.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js index c7610219f7..365aadffa5 100644 --- a/src/components/structures/GroupView.js +++ b/src/components/structures/GroupView.js @@ -1127,10 +1127,6 @@ export default React.createClass({ let avatarNode; let nameNode; let shortDescNode; - const bodyNodes = [ - this._getMembershipSection(), - this._getGroupSection(), - ]; const rightButtons = []; if (this.state.editing && this.state.isUserPrivileged) { let avatarImage; @@ -1269,7 +1265,8 @@ export default React.createClass({
- { bodyNodes } + { this._getMembershipSection() } + { this._getGroupSection() }
); From a7f5059aca1b6e61ade8ce5512ea782a22b20d08 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 15 Jun 2018 18:55:21 +0100 Subject: [PATCH 128/283] add nop to fix `onClick` being required warning Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/groups/GroupTile.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js index c1554cd9ed..509c209baa 100644 --- a/src/components/views/groups/GroupTile.js +++ b/src/components/views/groups/GroupTile.js @@ -22,6 +22,7 @@ import sdk from '../../../index'; import dis from '../../../dispatcher'; import FlairStore from '../../../stores/FlairStore'; +function nop() {} const GroupTile = React.createClass({ displayName: 'GroupTile', @@ -81,7 +82,7 @@ const GroupTile = React.createClass({ ) : null; // XXX: Use onMouseDown as a workaround for https://github.com/atlassian/react-beautiful-dnd/issues/273 // instead of onClick. Otherwise we experience https://github.com/vector-im/riot-web/issues/6156 - return + return { (droppableProvided, droppableSnapshot) => (
From a899871d52f6c296285064ff9a08ec38cab24fdd Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 15 Jun 2018 18:55:37 +0100 Subject: [PATCH 129/283] specify unique key to make react happy Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/MyGroups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js index 0bfb30674e..edb50fcedb 100644 --- a/src/components/structures/MyGroups.js +++ b/src/components/structures/MyGroups.js @@ -70,7 +70,7 @@ export default withMatrixClient(React.createClass({ if (this.state.groups) { const groupNodes = []; this.state.groups.forEach((g) => { - groupNodes.push(); + groupNodes.push(); }); contentHeader = groupNodes.length > 0 ?

{ _t('Your Communities') }

:
; content = groupNodes.length > 0 ? From 43681026b8f93f14bb5fbd7f97b52e36f506866f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 15 Jun 2018 19:01:12 +0100 Subject: [PATCH 130/283] s/onClick/onChange because react cries about it Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/GroupView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js index 365aadffa5..96dea14c1f 100644 --- a/src/components/structures/GroupView.js +++ b/src/components/structures/GroupView.js @@ -1052,7 +1052,7 @@ export default React.createClass({
{ _t('Only people who have been invited') } @@ -1064,7 +1064,7 @@ export default React.createClass({
{ _t('Everyone') } From 4f693a1ff5f51e876ed94d717d4903e89f782ccd Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 08:27:17 +0100 Subject: [PATCH 131/283] implement group links in matrixLinkify:MATRIXTO. Simplify if/else w/ map Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/linkify-matrix.js | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js index 6bbea77733..328cb98888 100644 --- a/src/linkify-matrix.js +++ b/src/linkify-matrix.js @@ -169,11 +169,18 @@ matrixLinkify.VECTOR_URL_PATTERN = "^(?:https?:\/\/)?(?:" + "(?:www\\.)?(?:riot|vector)\\.im/(?:app|beta|staging|develop)/" + ")(#.*)"; -matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/((#|@|!).*)"; +matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/([#@!+].*)"; matrixLinkify.MATRIXTO_MD_LINK_PATTERN = - '\\[([^\\]]*)\\]\\((?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/((#|@|!)[^\\)]*)\\)'; + '\\[([^\\]]*)\\]\\((?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/([#@!+][^\\)]*)\\)'; matrixLinkify.MATRIXTO_BASE_URL= baseUrl; +const matrixToEntityMap = { + '@': '#/user/', + '#': '#/room/', + '!': '#/room/', + '+': '#/group/', +}; + matrixLinkify.options = { events: function(href, type) { switch (type) { @@ -204,24 +211,20 @@ matrixLinkify.options = { case 'userid': case 'groupid': return matrixLinkify.MATRIXTO_BASE_URL + '/#/' + href; - default: - var m; + default: { // FIXME: horrible duplication with HtmlUtils' transform tags - m = href.match(matrixLinkify.VECTOR_URL_PATTERN); + let m = href.match(matrixLinkify.VECTOR_URL_PATTERN); if (m) { return m[1]; } m = href.match(matrixLinkify.MATRIXTO_URL_PATTERN); if (m) { const entity = m[1]; - if (entity[0] === '@') { - return '#/user/' + entity; - } else if (entity[0] === '#' || entity[0] === '!') { - return '#/room/' + entity; - } + if (matrixToEntityMap[entity[0]]) return matrixToEntityMap[entity[0]] + entity; } return href; + } } }, From 3ebec92ac592e0c10f37f1f47fa09989536319d8 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 08:27:47 +0100 Subject: [PATCH 132/283] replace hardcoded `matrix.to` with reference to const in matrix-to for easier changing Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/messages/TextualBody.js | 3 ++- src/matrix-to.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js index 018754411c..60377a47d7 100644 --- a/src/components/views/messages/TextualBody.js +++ b/src/components/views/messages/TextualBody.js @@ -36,6 +36,7 @@ import * as ContextualMenu from '../../structures/ContextualMenu'; import SettingsStore from "../../../settings/SettingsStore"; import PushProcessor from 'matrix-js-sdk/lib/pushprocessor'; import ReplyThread from "../elements/ReplyThread"; +import {host as matrixtoHost} from '../../../matrix-to'; linkifyMatrix(linkify); @@ -304,7 +305,7 @@ module.exports = React.createClass({ // never preview matrix.to links (if anything we should give a smart // preview of the room/user they point to: nobody needs to be reminded // what the matrix.to site looks like). - if (host == 'matrix.to') return false; + if (host === matrixtoHost) return false; if (node.textContent.toLowerCase().trim().startsWith(host.toLowerCase())) { // it's a "foo.pl" style link diff --git a/src/matrix-to.js b/src/matrix-to.js index 72fb3c38fc..90b0a66090 100644 --- a/src/matrix-to.js +++ b/src/matrix-to.js @@ -14,7 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -export const baseUrl = "https://matrix.to"; +export const host = "matrix.to"; +export const baseUrl = `https://${host}`; export function makeEventPermalink(roomId, eventId) { return `${baseUrl}/#/${roomId}/${eventId}`; From efaccf734478cc01d0bb67208d26d0ffbf34d074 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 08:42:28 +0100 Subject: [PATCH 133/283] implement `hitting enter after Ctrl-K should switch to the first result` Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/LeftPanel.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js index 5acceb1009..f3ca005f55 100644 --- a/src/components/structures/LeftPanel.js +++ b/src/components/structures/LeftPanel.js @@ -93,6 +93,11 @@ var LeftPanel = React.createClass({ this._onMoveFocus(false); handled = true; break; + case KeyCode.ENTER: + this._onMoveFocus(false); + this.focusedElement.click(); + handled = true; + break; } if (handled) { From 897121163917e9576c92e66eed067121e3665217 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 08:42:40 +0100 Subject: [PATCH 134/283] delint Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/LeftPanel.js | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js index f3ca005f55..416012c5f1 100644 --- a/src/components/structures/LeftPanel.js +++ b/src/components/structures/LeftPanel.js @@ -107,37 +107,33 @@ var LeftPanel = React.createClass({ }, _onMoveFocus: function(up) { - var element = this.focusedElement; + let element = this.focusedElement; // unclear why this isn't needed // var descending = (up == this.focusDirection) ? this.focusDescending : !this.focusDescending; // this.focusDirection = up; - var descending = false; // are we currently descending or ascending through the DOM tree? - var classes; + let descending = false; // are we currently descending or ascending through the DOM tree? + let classes; do { - var child = up ? element.lastElementChild : element.firstElementChild; - var sibling = up ? element.previousElementSibling : element.nextElementSibling; + const child = up ? element.lastElementChild : element.firstElementChild; + const sibling = up ? element.previousElementSibling : element.nextElementSibling; if (descending) { if (child) { element = child; - } - else if (sibling) { + } else if (sibling) { element = sibling; - } - else { + } else { descending = false; element = element.parentElement; } - } - else { + } else { if (sibling) { element = sibling; descending = true; - } - else { + } else { element = element.parentElement; } } @@ -149,8 +145,7 @@ var LeftPanel = React.createClass({ descending = true; } } - - } while(element && !( + } while (element && !( classes.contains("mx_RoomTile") || classes.contains("mx_SearchBox_search") || classes.contains("mx_RoomSubList_ellipsis"))); From 1afdb0e3c053dd45dd25fe8742c44449c2552269 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 08:44:57 +0100 Subject: [PATCH 135/283] add null-guard Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/LeftPanel.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js index 416012c5f1..7517103d88 100644 --- a/src/components/structures/LeftPanel.js +++ b/src/components/structures/LeftPanel.js @@ -95,7 +95,9 @@ var LeftPanel = React.createClass({ break; case KeyCode.ENTER: this._onMoveFocus(false); - this.focusedElement.click(); + if (this.focusedElement) { + this.focusedElement.click(); + } handled = true; break; } From ff33ef4b5150439f97e9bb21bee9e42e5efa4338 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 08:50:53 +0100 Subject: [PATCH 136/283] allow using tab to navigate room list smarter Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/LeftPanel.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js index 5acceb1009..7a930fa233 100644 --- a/src/components/structures/LeftPanel.js +++ b/src/components/structures/LeftPanel.js @@ -85,6 +85,10 @@ var LeftPanel = React.createClass({ let handled = false; switch (ev.keyCode) { + case KeyCode.TAB: + this._onMoveFocus(ev.shiftKey); + handled = true; + break; case KeyCode.UP: this._onMoveFocus(true); handled = true; From 423b8939e7c015eadbbe9e778031773b99614ff4 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 08:52:14 +0100 Subject: [PATCH 137/283] simplify handled logic by inverting it Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/LeftPanel.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js index 7a930fa233..7b115a6c4b 100644 --- a/src/components/structures/LeftPanel.js +++ b/src/components/structures/LeftPanel.js @@ -82,21 +82,20 @@ var LeftPanel = React.createClass({ _onKeyDown: function(ev) { if (!this.focusedElement) return; - let handled = false; + let handled = true; switch (ev.keyCode) { case KeyCode.TAB: this._onMoveFocus(ev.shiftKey); - handled = true; break; case KeyCode.UP: this._onMoveFocus(true); - handled = true; break; case KeyCode.DOWN: this._onMoveFocus(false); - handled = true; break; + default: + handled = false; } if (handled) { From 8fa96e19d562666410786ee7cfa506463693ea88 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 09:07:16 +0100 Subject: [PATCH 138/283] allow rightclicking for exposing room tile context menus Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/groups/GroupInviteTile.js | 16 +++++++++++++--- src/components/views/rooms/RoomTile.js | 17 ++++++++++++++--- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js index 4d5f3c6f3a..fff9aafac1 100644 --- a/src/components/views/groups/GroupInviteTile.js +++ b/src/components/views/groups/GroupInviteTile.js @@ -66,6 +66,11 @@ export default React.createClass({ }); }, + onContextMenu: function(e) { + this.onBadgeClicked(e); + e.preventDefault(); + }, + onBadgeClicked: function(e) { // Prevent the RoomTile onClick event firing as well e.stopPropagation(); @@ -79,7 +84,7 @@ export default React.createClass({ } const RoomTileContextMenu = sdk.getComponent('context_menus.GroupInviteTileContextMenu'); - const elementRect = e.target.getBoundingClientRect(); + const elementRect = this.refs.badge.getBoundingClientRect(); // The window X and Y offsets are to adjust position when zoomed in to page const x = elementRect.right + window.pageXOffset + 3; @@ -125,7 +130,7 @@ export default React.createClass({ }); const badgeContent = badgeEllipsis ? '\u00B7\u00B7\u00B7' : '!'; - const badge =
{ badgeContent }
; + const badge =
{ badgeContent }
; let tooltip; if (this.props.collapsed && this.state.hover) { @@ -139,7 +144,12 @@ export default React.createClass({ }); return ( - +
{ av }
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js index 11eb2090f2..1a9e404012 100644 --- a/src/components/views/rooms/RoomTile.js +++ b/src/components/views/rooms/RoomTile.js @@ -187,6 +187,11 @@ module.exports = React.createClass({ this.badgeOnMouseLeave(); }, + onContextMenu: function(e) { + this.onBadgeClicked(e); + e.preventDefault(); + }, + badgeOnMouseEnter: function() { // Only allow non-guests to access the context menu // and only change it if it needs to change @@ -208,7 +213,7 @@ module.exports = React.createClass({ } const RoomTileContextMenu = sdk.getComponent('context_menus.RoomTileContextMenu'); - const elementRect = e.target.getBoundingClientRect(); + const elementRect = this.refs.badge.getBoundingClientRect(); // The window X and Y offsets are to adjust position when zoomed in to page const x = elementRect.right + window.pageXOffset + 3; @@ -280,7 +285,7 @@ module.exports = React.createClass({ badgeContent = '\u200B'; } - badge =
{ badgeContent }
; + badge =
{ badgeContent }
; const EmojiText = sdk.getComponent('elements.EmojiText'); let label; @@ -317,7 +322,13 @@ module.exports = React.createClass({ directMessageIndicator = dm; } - return + return
From 4fdb64a04957309d691d8f80aeaf6971ab5a17f3 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 09:10:13 +0100 Subject: [PATCH 139/283] delint Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/rooms/RoomTile.js | 38 +++++++++++--------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js index 1a9e404012..bb9e0a8d3b 100644 --- a/src/components/views/rooms/RoomTile.js +++ b/src/components/views/rooms/RoomTile.js @@ -1,6 +1,7 @@ /* Copyright 2015, 2016 OpenMarket Ltd Copyright 2017 New Vector Ltd +Copyright 2018 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. @@ -15,19 +16,17 @@ See the License for the specific language governing permissions and limitations under the License. */ -'use strict'; -const React = require('react'); -const ReactDOM = require("react-dom"); +import React from 'react'; import PropTypes from 'prop-types'; -const classNames = require('classnames'); +import classNames from 'classnames'; import dis from '../../../dispatcher'; -const MatrixClientPeg = require('../../../MatrixClientPeg'); +import MatrixClientPeg from '../../../MatrixClientPeg'; import DMRoomMap from '../../../utils/DMRoomMap'; -const sdk = require('../../../index'); -const ContextualMenu = require('../../structures/ContextualMenu'); -const RoomNotifs = require('../../../RoomNotifs'); -const FormattingUtils = require('../../../utils/FormattingUtils'); +import sdk from '../../../index'; +import ContextualMenu from '../../structures/ContextualMenu'; +import * as RoomNotifs from '../../../RoomNotifs'; +import * as FormattingUtils from '../../../utils/FormattingUtils'; import AccessibleButton from '../elements/AccessibleButton'; import ActiveRoomObserver from '../../../ActiveRoomObserver'; import RoomViewStore from '../../../stores/RoomViewStore'; @@ -72,16 +71,12 @@ module.exports = React.createClass({ }, _shouldShowMentionBadge: function() { - return this.state.notifState != RoomNotifs.MUTE; + return this.state.notifState !== RoomNotifs.MUTE; }, _isDirectMessageRoom: function(roomId) { const dmRooms = DMRoomMap.shared().getUserIdForRoomId(roomId); - if (dmRooms) { - return true; - } else { - return false; - } + return Boolean(dmRooms); }, onRoomTimeline: function(ev, room) { @@ -99,7 +94,7 @@ module.exports = React.createClass({ }, onAccountData: function(accountDataEvent) { - if (accountDataEvent.getType() == 'm.push_rules') { + if (accountDataEvent.getType() === 'm.push_rules') { this.setState({ notifState: RoomNotifs.getRoomNotifsState(this.props.room.roomId), }); @@ -255,7 +250,7 @@ module.exports = React.createClass({ 'mx_RoomTile_unread': this.props.unread, 'mx_RoomTile_unreadNotify': notifBadges, 'mx_RoomTile_highlight': mentionBadges, - 'mx_RoomTile_invited': (me && me.membership == 'invite'), + 'mx_RoomTile_invited': (me && me.membership === 'invite'), 'mx_RoomTile_menuDisplayed': this.state.menuDisplayed, 'mx_RoomTile_noBadges': !badges, 'mx_RoomTile_transparent': this.props.transparent, @@ -273,7 +268,6 @@ module.exports = React.createClass({ let name = this.state.roomName; name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon - let badge; let badgeContent; if (this.state.badgeHover || this.state.menuDisplayed) { @@ -285,7 +279,7 @@ module.exports = React.createClass({ badgeContent = '\u200B'; } - badge =
{ badgeContent }
; + const badge =
{ badgeContent }
; const EmojiText = sdk.getComponent('elements.EmojiText'); let label; @@ -317,9 +311,9 @@ module.exports = React.createClass({ const RoomAvatar = sdk.getComponent('avatars.RoomAvatar'); - let directMessageIndicator; + let dmIndicator; if (this._isDirectMessageRoom(this.props.room.roomId)) { - directMessageIndicator = dm; + dmIndicator = dm; } return
- { directMessageIndicator } + { dmIndicator }
From 61e09395d0c49981663a3f6bbc110498127e9709 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 09:45:06 +0100 Subject: [PATCH 140/283] split continuations if longer than N Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/MessagePanel.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js index 50bdb37734..6e4697a8f0 100644 --- a/src/components/structures/MessagePanel.js +++ b/src/components/structures/MessagePanel.js @@ -1,5 +1,6 @@ /* Copyright 2016 OpenMarket Ltd +Copyright 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -25,6 +26,9 @@ import sdk from '../../index'; import MatrixClientPeg from '../../MatrixClientPeg'; +const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes +const continuedTypes = ['m.sticker', 'm.room.message']; + /* (almost) stateless UI component which builds the event tiles in the room timeline. */ module.exports = React.createClass({ @@ -449,16 +453,17 @@ module.exports = React.createClass({ // Some events should appear as continuations from previous events of // different types. - const continuedTypes = ['m.sticker', 'm.room.message']; + const eventTypeContinues = prevEvent !== null && continuedTypes.includes(mxEv.getType()) && continuedTypes.includes(prevEvent.getType()); - if (prevEvent !== null - && prevEvent.sender && mxEv.sender - && mxEv.sender.userId === prevEvent.sender.userId - && (mxEv.getType() == prevEvent.getType() || eventTypeContinues)) { + // if there is a previous event and it has the same sender as this event + // and the types are the same/is in continuedTypes and the time between them is <= CONTINUATION_MAX_INTERVAL + if (prevEvent !== null && prevEvent.sender && mxEv.sender && mxEv.sender.userId === prevEvent.sender.userId && + (mxEv.getType() === prevEvent.getType() || eventTypeContinues) && + (mxEv.getTs() - prevEvent.getTs() <= CONTINUATION_MAX_INTERVAL)) { continuation = true; } From 7d19841e6860c4a0de465398180cba85f314b8b6 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 09:48:57 +0100 Subject: [PATCH 141/283] delint Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/MessagePanel.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js index 6e4697a8f0..f5fa2ceabf 100644 --- a/src/components/structures/MessagePanel.js +++ b/src/components/structures/MessagePanel.js @@ -193,7 +193,7 @@ module.exports = React.createClass({ /** * Page up/down. * - * mult: -1 to page up, +1 to page down + * @param {number} mult: -1 to page up, +1 to page down */ scrollRelative: function(mult) { if (this.refs.scrollPanel) { @@ -203,6 +203,8 @@ module.exports = React.createClass({ /** * Scroll up/down in response to a scroll key + * + * @param {KeyboardEvent} ev: the keyboard event to handle */ handleScrollKey: function(ev) { if (this.refs.scrollPanel) { @@ -261,6 +263,7 @@ module.exports = React.createClass({ this.eventNodes = {}; + let visible = false; let i; // first figure out which is the last event in the list which we're @@ -301,7 +304,7 @@ module.exports = React.createClass({ // if the readmarker has moved, cancel any active ghost. if (this.currentReadMarkerEventId && this.props.readMarkerEventId && this.props.readMarkerVisible && - this.currentReadMarkerEventId != this.props.readMarkerEventId) { + this.currentReadMarkerEventId !== this.props.readMarkerEventId) { this.currentGhostEventId = null; } @@ -408,8 +411,8 @@ module.exports = React.createClass({ let isVisibleReadMarker = false; - if (eventId == this.props.readMarkerEventId) { - var visible = this.props.readMarkerVisible; + if (eventId === this.props.readMarkerEventId) { + visible = this.props.readMarkerVisible; // if the read marker comes at the end of the timeline (except // for local echoes, which are excluded from RMs, because they @@ -427,11 +430,11 @@ module.exports = React.createClass({ // XXX: there should be no need for a ghost tile - we should just use a // a dispatch (user_activity_end) to start the RM animation. - if (eventId == this.currentGhostEventId) { + if (eventId === this.currentGhostEventId) { // if we're showing an animation, continue to show it. ret.push(this._getReadMarkerGhostTile()); } else if (!isVisibleReadMarker && - eventId == this.currentReadMarkerEventId) { + eventId === this.currentReadMarkerEventId) { // there is currently a read-up-to marker at this point, but no // more. Show an animation of it disappearing. ret.push(this._getReadMarkerGhostTile()); @@ -498,7 +501,7 @@ module.exports = React.createClass({ } const eventId = mxEv.getId(); - const highlight = (eventId == this.props.highlightedEventId); + const highlight = (eventId === this.props.highlightedEventId); // we can't use local echoes as scroll tokens, because their event IDs change. // Local echos have a send "status". @@ -637,7 +640,8 @@ module.exports = React.createClass({ render: function() { const ScrollPanel = sdk.getComponent("structures.ScrollPanel"); const Spinner = sdk.getComponent("elements.Spinner"); - let topSpinner, bottomSpinner; + let topSpinner; + let bottomSpinner; if (this.props.backPaginating) { topSpinner =
    • ; } From 01a6b7f77fe25514a2a93b4224e5434e34da0c29 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 10:27:42 +0100 Subject: [PATCH 142/283] affix copyButton so that it doesn't get scrolled horizontally Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/css/views/rooms/_EventTile.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss index 80d2cd3418..525855f3ed 100644 --- a/res/css/views/rooms/_EventTile.scss +++ b/res/css/views/rooms/_EventTile.scss @@ -392,6 +392,7 @@ limitations under the License. overflow-x: overlay; overflow-y: visible; max-height: 30vh; + position: static; } .mx_EventTile_content .markdown-body code { @@ -406,7 +407,7 @@ limitations under the License. visibility: hidden; cursor: pointer; top: 6px; - right: 6px; + right: 36px; width: 19px; height: 19px; background-image: url($copy-button-url); From fd90992294c62464e1755731e242cc7fc67bd6da Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 15:58:16 +0100 Subject: [PATCH 143/283] s/onClick/onChange on checkbox to make React happy Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/groups/GroupPublicityToggle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/groups/GroupPublicityToggle.js b/src/components/views/groups/GroupPublicityToggle.js index 78522c2f55..ff0fc553b8 100644 --- a/src/components/views/groups/GroupPublicityToggle.js +++ b/src/components/views/groups/GroupPublicityToggle.js @@ -69,7 +69,7 @@ export default React.createClass({ render() { const GroupTile = sdk.getComponent('groups.GroupTile'); const input = ; const labelText = !this.state.ready ? _t("Loading...") : From f152ad84b88c4f943a73e596a94b42b8a42f35eb Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 16:40:44 +0100 Subject: [PATCH 144/283] Improve CommandProvider for Autocomplete improve Regexp so it leaves autocomplete up whilst typing arguments improve completion so it doesn't discard your arguments on-hover add a way to list all commands by using `/` Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/autocomplete/CommandProvider.js | 38 +++++++++++++++-------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js index e33fa7861f..2618b41c7d 100644 --- a/src/autocomplete/CommandProvider.js +++ b/src/autocomplete/CommandProvider.js @@ -2,6 +2,7 @@ Copyright 2016 Aviral Dasgupta Copyright 2017 Vector Creations Ltd Copyright 2017 New Vector Ltd +Copyright 2018 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. @@ -21,6 +22,7 @@ import { _t, _td } from '../languageHandler'; import AutocompleteProvider from './AutocompleteProvider'; import FuzzyMatcher from './FuzzyMatcher'; import {TextualCompletion} from './Components'; +import type {SelectionRange} from "./Autocompleter"; // TODO merge this with the factory mechanics of SlashCommands? // Warning: Since the description string will be translated in _t(result.description), all these strings below must be in i18n/strings/en_EN.json file @@ -110,10 +112,9 @@ const COMMANDS = [ args: '', description: _td('Opens the Developer Tools dialog'), }, - // Omitting `/markdown` as it only seems to apply to OldComposer ]; -const COMMAND_RE = /(^\/\w*)/g; +const COMMAND_RE = /(^\/\w*)(?: .*)?/g; export default class CommandProvider extends AutocompleteProvider { constructor() { @@ -123,23 +124,24 @@ export default class CommandProvider extends AutocompleteProvider { }); } - async getCompletions(query: string, selection: {start: number, end: number}) { - let completions = []; + async getCompletions(query: string, selection: SelectionRange, force?: boolean) { const {command, range} = this.getCurrentCommand(query, selection); - if (command) { - completions = this.matcher.match(command[0]).map((result) => { - return { - completion: result.command + ' ', - component: (), - range, - }; - }); - } - return completions; + if (!command) return []; + + // if the query is just `/` and the user hit TAB, show them all COMMANDS otherwise FuzzyMatch them + const matches = query === '/' && force ? COMMANDS : this.matcher.match(command[1]); + return matches.map((result) => { + return { + // If the command is the same as the one they entered, we don't want to discard their arguments + completion: result.command === command[1] ? command[0] : (result.command + ' '), + component: (), + range, + }; + }); } getName() { From a50f6094cce296f8a4017a1e45116f2b95a79cae Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 16:44:13 +0100 Subject: [PATCH 145/283] allow `/` + wait to also show all commands Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/autocomplete/CommandProvider.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js index 2618b41c7d..b162f2f92a 100644 --- a/src/autocomplete/CommandProvider.js +++ b/src/autocomplete/CommandProvider.js @@ -128,8 +128,8 @@ export default class CommandProvider extends AutocompleteProvider { const {command, range} = this.getCurrentCommand(query, selection); if (!command) return []; - // if the query is just `/` and the user hit TAB, show them all COMMANDS otherwise FuzzyMatch them - const matches = query === '/' && force ? COMMANDS : this.matcher.match(command[1]); + // if the query is just `/` (and the user hit TAB or waits), show them all COMMANDS otherwise FuzzyMatch them + const matches = query === '/' ? COMMANDS : this.matcher.match(command[1]); return matches.map((result) => { return { // If the command is the same as the one they entered, we don't want to discard their arguments From 6d978e018530208d55305cbf32d840bbd24c522f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Fri, 15 Jun 2018 16:09:24 +0000 Subject: [PATCH 146/283] Translated using Weblate (French) Currently translated at 100.0% (1203 of 1203 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ --- src/i18n/strings/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 7291e8b6fb..71a6f27c0e 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -1192,7 +1192,7 @@ "Encrypted, not sent": "Chiffré, pas envoyé", "No Audio Outputs detected": "Aucune sortie audio détectée", "Audio Output": "Sortie audio", - "Share Link to User": "Partager le lien à l'utilisateur", + "Share Link to User": "Partager le lien vers l'utilisateur", "Share room": "Partager le salon", "Share Room": "Partager le salon", "Link to most recent message": "Lien vers le message le plus récent", From b87824ba929334a567935dbe11ba14bb3a391c72 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 19:49:53 +0100 Subject: [PATCH 147/283] hide `m.room.avatar` from FilePanel via sync filter Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/FilePanel.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js index 3249cae22c..7d1d23839e 100644 --- a/src/components/structures/FilePanel.js +++ b/src/components/structures/FilePanel.js @@ -69,6 +69,7 @@ const FilePanel = React.createClass({ "timeline": { "contains_url": true, "not_types": [ + "m.room.avatar", "m.sticker", ], }, From eb32dda260bb421865c987dccb4f0f9c9d6b8898 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 19:52:15 +0100 Subject: [PATCH 148/283] given we also want to hide widget events, hide all except m.room.message Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/FilePanel.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js index 7d1d23839e..927449750c 100644 --- a/src/components/structures/FilePanel.js +++ b/src/components/structures/FilePanel.js @@ -68,9 +68,8 @@ const FilePanel = React.createClass({ "room": { "timeline": { "contains_url": true, - "not_types": [ - "m.room.avatar", - "m.sticker", + "types": [ + "m.room.message", ], }, }, From 9251c80783a553f09262409a09fa1be166cc280c Mon Sep 17 00:00:00 2001 From: Osoitz Date: Sun, 17 Jun 2018 08:34:39 +0000 Subject: [PATCH 149/283] Translated using Weblate (Basque) Currently translated at 100.0% (1203 of 1203 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/ --- src/i18n/strings/eu.json | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index 720f6a3235..594d826a6c 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -1187,5 +1187,19 @@ "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Ahaztu bidali ditudan mezu guztiak kontua desaktibatzean (Abisua: Honekin etorkizuneko erabiltzaileek elkarrizketaren bertsio ez oso bat ikusiko dute)", "Can't leave Server Notices room": "Ezin zara Server Notices gelatik atera", "This room is used for important messages from the Homeserver, so you cannot leave it.": "Gela hau mezu hasiera zerbitzariaren garrantzitsuak bidaltzeko erabiltzen da, eta ezin zara atera.", - "Try the app first": "Probatu aplikazioa aurretik" + "Try the app first": "Probatu aplikazioa aurretik", + "Encrypting": "Zifratzen", + "Encrypted, not sent": "Zifratua, bidali gabe", + "Share Link to User": "Partekatu esteka erabiltzailearekin", + "Share room": "Partekatu gela", + "Share Room": "Partekatu gela", + "Link to most recent message": "Esteka azken mezura", + "Share User": "Partekatu erabiltzailea", + "Share Community": "Partekatu komunitatea", + "Share Room Message": "Partekatu gelako mezua", + "Link to selected message": "Esteka hautatutako mezura", + "COPY": "KOPIATU", + "Share Message": "Partekatu mezua", + "No Audio Outputs detected": "Ez da audio irteerarik antzeman", + "Audio Output": "Audio irteera" } From 21bbf5dd9b888ec8ba23fe3c270de35c1776dd70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Kozio=C5=82?= Date: Sun, 17 Jun 2018 12:22:35 +0000 Subject: [PATCH 150/283] Translated using Weblate (Polish) Currently translated at 79.7% (959 of 1203 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/ --- src/i18n/strings/pl.json | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json index d0b71cdb8d..63e4cd3529 100644 --- a/src/i18n/strings/pl.json +++ b/src/i18n/strings/pl.json @@ -920,5 +920,42 @@ "Collapse panel": "Ukryj panel", "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!": "Z Twoją obecną przeglądarką, wygląd oraz wrażenia z używania aplikacji mogą być niepoprawne, a niektóre funkcje wcale nie działać. Kontynuuj jeśli chcesz spróbować, jednak trudno będzie pomóc w przypadku błędów, które mogą nastąpić!", "Checking for an update...": "Sprawdzanie aktualizacji...", - "There are advanced notifications which are not shown here": "Masz zaawansowane powiadomienia, nie pokazane tutaj" + "There are advanced notifications which are not shown here": "Masz zaawansowane powiadomienia, nie pokazane tutaj", + "e.g. %(exampleValue)s": "np. %(exampleValue)s", + "Always show encryption icons": "Zawsze wyświetlaj ikony szyfrowania", + "Send analytics data": "Wysyłaj dane analityczne", + "%(duration)ss": "%(duration)ss", + "%(duration)sm": "%(duration)sm", + "%(duration)sh": "%(duration)sg", + "%(duration)sd": "%(duration)sd", + "%(user)s is a %(userRole)s": "%(user)s ma rolę %(userRole)s", + "Members only (since the point in time of selecting this option)": "Tylko członkowie (od momentu włączenia tej opcji)", + "Members only (since they were invited)": "Tylko członkowie (od kiedy zostali zaproszeni)", + "Members only (since they joined)": "Tylko członkowie (od kiedy dołączyli)", + "Copied!": "Skopiowano!", + "Failed to copy": "Kopiowanie nieudane", + "Message removed by %(userId)s": "Wiadomość usunięta przez %(userId)s", + "Message removed": "Wiadomość usunięta", + "An email has been sent to %(emailAddress)s": "Email został wysłany do %(emailAddress)s", + "A text message has been sent to %(msisdn)s": "Wysłano wiadomość tekstową do %(msisdn)s", + "Code": "Kod", + "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Pomóż nam ulepszyć Riot.im wysyłając anonimowe dane analityczne. Spowoduje to użycie pliku cookie (zobacz naszą Politykę plików cookie).", + "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Pomóż nam ulepszyć Riot.im wysyłając anonimowe dane analityczne. Spowoduje to użycie pliku cookie.", + "Yes, I want to help!": "Tak, chcę pomóc!", + "Warning: This widget might use cookies.": "Uwaga: Ten widżet może używać ciasteczek.", + "Delete Widget": "Usuń widżet", + "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Usunięcie widżetu usuwa go dla wszystkich użytkowników w tym pokoju. Czy na pewno chcesz usunąć ten widżet?", + "Communities": "Społeczności", + "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s", + "collapse": "Zwiń", + "expand": "Rozwiń", + "Custom of %(powerLevel)s": "Poziom niestandardowy %(powerLevel)s", + "In reply to ": "W odpowiedzi do ", + "Matrix ID": "Matrix ID", + "email address": "adres e-mail", + "example": "przykład", + "Advanced options": "Opcje zaawansowane", + "To continue, please enter your password:": "Aby kontynuować, proszę wprowadzić swoje hasło:", + "password": "hasło", + "Refresh": "Odśwież" } From a7f82365a85fc0b4ef64e1e7afef11b92286c07b Mon Sep 17 00:00:00 2001 From: Krombel Date: Mon, 18 Jun 2018 10:50:41 +0000 Subject: [PATCH 151/283] Translated using Weblate (German) Currently translated at 99.1% (1193 of 1203 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index ba31308e3a..a4ecc140a0 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -1186,5 +1186,10 @@ "This room is used for important messages from the Homeserver, so you cannot leave it.": "Du kannst diesen Raum nicht verlassen, da dieser Raum für wichtige Nachrichten vom Heimserver verwendet wird.", "Terms and Conditions": "Geschäftsbedingungen", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Um den %(homeserverDomain)s -Heimserver weiter zu verwenden, musst du die Geschäftsbedingungen sichten und ihnen zustimmen.", - "Review terms and conditions": "Geschäftsbedingungen anzeigen" + "Review terms and conditions": "Geschäftsbedingungen anzeigen", + "Encrypting": "Verschlüssele", + "Encrypted, not sent": "Verschlüsselt, nicht gesendet", + "Share Link to User": "Sende Link an Benutzer", + "Share room": "Teile Raum", + "Share Room": "Teile Raum" } From 1a236499b1f33df966635b3bb6f4bfd8ee41f5a7 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 18 Jun 2018 11:54:06 +0100 Subject: [PATCH 152/283] fix import Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/rooms/RoomTile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js index bb9e0a8d3b..776bd5cd70 100644 --- a/src/components/views/rooms/RoomTile.js +++ b/src/components/views/rooms/RoomTile.js @@ -24,7 +24,7 @@ import dis from '../../../dispatcher'; import MatrixClientPeg from '../../../MatrixClientPeg'; import DMRoomMap from '../../../utils/DMRoomMap'; import sdk from '../../../index'; -import ContextualMenu from '../../structures/ContextualMenu'; +import {createMenu} from '../../structures/ContextualMenu'; import * as RoomNotifs from '../../../RoomNotifs'; import * as FormattingUtils from '../../../utils/FormattingUtils'; import AccessibleButton from '../elements/AccessibleButton'; @@ -217,7 +217,7 @@ module.exports = React.createClass({ y = y - (chevronOffset + 8); // where 8 is half the height of the chevron const self = this; - ContextualMenu.createMenu(RoomTileContextMenu, { + createMenu(RoomTileContextMenu, { chevronOffset: chevronOffset, left: x, top: y, From 15892a8c6a46a5d01fad9f80ef07a1db8d26755d Mon Sep 17 00:00:00 2001 From: Krombel Date: Mon, 18 Jun 2018 10:54:30 +0000 Subject: [PATCH 153/283] Translated using Weblate (German) Currently translated at 100.0% (1203 of 1203 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/ --- src/i18n/strings/de_DE.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index a4ecc140a0..ef34cb78fe 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -1191,5 +1191,15 @@ "Encrypted, not sent": "Verschlüsselt, nicht gesendet", "Share Link to User": "Sende Link an Benutzer", "Share room": "Teile Raum", - "Share Room": "Teile Raum" + "Share Room": "Teile Raum", + "Link to most recent message": "Link zur aktuellsten Nachricht", + "Share User": "Teile Benutzer", + "Share Community": "Teile Community", + "Share Room Message": "Teile Raumnachricht", + "Link to selected message": "Link zur ausgewählten Nachricht", + "COPY": "KOPIEREN", + "Share Message": "Teile Nachricht", + "No Audio Outputs detected": "Keine Ton-Ausgabe erkannt", + "Audio Output": "Ton-Ausgabe", + "Try the app first": "App erst ausprobieren" } From e0d36b18c92ec42f8827dbae88bbdc5baf0c144d Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 18 Jun 2018 12:05:57 +0100 Subject: [PATCH 154/283] make RoomTile context menu appear where you right clicked instead Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/rooms/RoomTile.js | 71 +++++++++++++++----------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js index 776bd5cd70..ee7f8a76c7 100644 --- a/src/components/views/rooms/RoomTile.js +++ b/src/components/views/rooms/RoomTile.js @@ -182,9 +182,30 @@ module.exports = React.createClass({ this.badgeOnMouseLeave(); }, + _showContextMenu: function(x, y, chevronOffset) { + const RoomTileContextMenu = sdk.getComponent('context_menus.RoomTileContextMenu'); + + createMenu(RoomTileContextMenu, { + chevronOffset, + left: x, + top: y, + room: this.props.room, + onFinished: () => { + this.setState({ menuDisplayed: false }); + this.props.refreshSubList(); + }, + }); + this.setState({ menuDisplayed: true }); + }, + onContextMenu: function(e) { - this.onBadgeClicked(e); + // Prevent the RoomTile onClick event firing as well e.preventDefault(); + // Only allow non-guests to access the context menu + if (MatrixClientPeg.get().isGuest()) return; + + const chevronOffset = 12; + this._showContextMenu(e.clientX, e.clientY - (chevronOffset + 8), chevronOffset); }, badgeOnMouseEnter: function() { @@ -200,37 +221,25 @@ module.exports = React.createClass({ }, onBadgeClicked: function(e) { - // Only allow none guests to access the context menu - if (!MatrixClientPeg.get().isGuest()) { - // If the badge is clicked, then no longer show tooltip - if (this.props.collapsed) { - this.setState({ hover: false }); - } - - const RoomTileContextMenu = sdk.getComponent('context_menus.RoomTileContextMenu'); - const elementRect = this.refs.badge.getBoundingClientRect(); - - // The window X and Y offsets are to adjust position when zoomed in to page - const x = elementRect.right + window.pageXOffset + 3; - const chevronOffset = 12; - let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset); - y = y - (chevronOffset + 8); // where 8 is half the height of the chevron - - const self = this; - createMenu(RoomTileContextMenu, { - chevronOffset: chevronOffset, - left: x, - top: y, - room: this.props.room, - onFinished: function() { - self.setState({ menuDisplayed: false }); - self.props.refreshSubList(); - }, - }); - this.setState({ menuDisplayed: true }); - } // Prevent the RoomTile onClick event firing as well e.stopPropagation(); + // Only allow non-guests to access the context menu + if (MatrixClientPeg.get().isGuest()) return; + + // If the badge is clicked, then no longer show tooltip + if (this.props.collapsed) { + this.setState({ hover: false }); + } + + const elementRect = e.target.getBoundingClientRect(); + + // The window X and Y offsets are to adjust position when zoomed in to page + const x = elementRect.right + window.pageXOffset + 3; + const chevronOffset = 12; + let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset); + y = y - (chevronOffset + 8); // where 8 is half the height of the chevron + + this._showContextMenu(x, y, chevronOffset); }, render: function() { @@ -279,7 +288,7 @@ module.exports = React.createClass({ badgeContent = '\u200B'; } - const badge =
    { badgeContent }
    ; + const badge =
    { badgeContent }
    ; const EmojiText = sdk.getComponent('elements.EmojiText'); let label; From f88a2fd8fcffbe6bf2d8fdf954591c97113dd4b4 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 18 Jun 2018 12:16:33 +0100 Subject: [PATCH 155/283] make GroupInviteTile context menu appear where you right clicked instead Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../views/groups/GroupInviteTile.js | 69 +++++++++++-------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js index fff9aafac1..25dba130f9 100644 --- a/src/components/views/groups/GroupInviteTile.js +++ b/src/components/views/groups/GroupInviteTile.js @@ -1,5 +1,6 @@ /* Copyright 2017, 2018 New Vector Ltd +Copyright 2018 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. @@ -20,8 +21,9 @@ import { MatrixClient } from 'matrix-js-sdk'; import sdk from '../../../index'; import dis from '../../../dispatcher'; import AccessibleButton from '../elements/AccessibleButton'; -import * as ContextualMenu from "../../structures/ContextualMenu"; import classNames from 'classnames'; +import MatrixClientPeg from "../../../MatrixClientPeg"; +import {createMenu} from "../../structures/ContextualMenu"; export default React.createClass({ displayName: 'GroupInviteTile', @@ -66,34 +68,11 @@ export default React.createClass({ }); }, - onContextMenu: function(e) { - this.onBadgeClicked(e); - e.preventDefault(); - }, + _showContextMenu: function(x, y, chevronOffset) { + const GroupInviteTileContextMenu = sdk.getComponent('context_menus.GroupInviteTileContextMenu'); - onBadgeClicked: function(e) { - // Prevent the RoomTile onClick event firing as well - e.stopPropagation(); - - // Only allow none guests to access the context menu - if (this.context.matrixClient.isGuest()) return; - - // If the badge is clicked, then no longer show tooltip - if (this.props.collapsed) { - this.setState({ hover: false }); - } - - const RoomTileContextMenu = sdk.getComponent('context_menus.GroupInviteTileContextMenu'); - const elementRect = this.refs.badge.getBoundingClientRect(); - - // The window X and Y offsets are to adjust position when zoomed in to page - const x = elementRect.right + window.pageXOffset + 3; - const chevronOffset = 12; - let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset); - y = y - (chevronOffset + 8); // where 8 is half the height of the chevron - - ContextualMenu.createMenu(RoomTileContextMenu, { - chevronOffset: chevronOffset, + createMenu(GroupInviteTileContextMenu, { + chevronOffset, left: x, top: y, group: this.props.group, @@ -104,6 +83,38 @@ export default React.createClass({ this.setState({ menuDisplayed: true }); }, + onContextMenu: function(e) { + // Prevent the RoomTile onClick event firing as well + e.preventDefault(); + // Only allow non-guests to access the context menu + if (MatrixClientPeg.get().isGuest()) return; + + const chevronOffset = 12; + this._showContextMenu(e.clientX, e.clientY - (chevronOffset + 8), chevronOffset); + }, + + onBadgeClicked: function(e) { + // Prevent the RoomTile onClick event firing as well + e.stopPropagation(); + // Only allow non-guests to access the context menu + if (MatrixClientPeg.get().isGuest()) return; + + // If the badge is clicked, then no longer show tooltip + if (this.props.collapsed) { + this.setState({ hover: false }); + } + + const elementRect = e.target.getBoundingClientRect(); + + // The window X and Y offsets are to adjust position when zoomed in to page + const x = elementRect.right + window.pageXOffset + 3; + const chevronOffset = 12; + let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset); + y = y - (chevronOffset + 8); // where 8 is half the height of the chevron + + this._showContextMenu(x, y, chevronOffset); + }, + render: function() { const BaseAvatar = sdk.getComponent('avatars.BaseAvatar'); const EmojiText = sdk.getComponent('elements.EmojiText'); @@ -130,7 +141,7 @@ export default React.createClass({ }); const badgeContent = badgeEllipsis ? '\u00B7\u00B7\u00B7' : '!'; - const badge =
    { badgeContent }
    ; + const badge =
    { badgeContent }
    ; let tooltip; if (this.props.collapsed && this.state.hover) { From 1ae51a83328362581d2df74b10469d7ebba60866 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 18 Jun 2018 13:48:23 +0100 Subject: [PATCH 156/283] use changed argument in js-sdk Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/ContentMessages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ContentMessages.js b/src/ContentMessages.js index 1d61b6de6a..fd21977108 100644 --- a/src/ContentMessages.js +++ b/src/ContentMessages.js @@ -243,7 +243,7 @@ function uploadFile(matrixClient, roomId, file, progressHandler) { const blob = new Blob([encryptResult.data]); return matrixClient.uploadContent(blob, { progressHandler: progressHandler, - omitFilename: true, + includeFilename: false, }).then(function(url) { // If the attachment is encrypted then bundle the URL along // with the information needed to decrypt the attachment and From 276c7a9c4d3ab43c2c443d6b7e5b2c3b46ad37d7 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 18 Jun 2018 15:24:34 +0100 Subject: [PATCH 157/283] Fix blank sticker picker Let the battle of z-indexes commence https://github.com/matrix-org/matrix-react-sdk/pull/1948/files#diff-8bc8827809a72c7548846c443d19f00aR29 --- src/components/views/elements/PersistedElement.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js index c4bac27b4e..8115a36eeb 100644 --- a/src/components/views/elements/PersistedElement.js +++ b/src/components/views/elements/PersistedElement.js @@ -36,7 +36,7 @@ function getOrCreateContainer() { } // Greater than that of the ContextualMenu -const PE_Z_INDEX = 3000; +const PE_Z_INDEX = 5000; /* * Class of component that renders its children in a separate ReactDOM virtual tree From e1e60cb1474a519846eb417f6f379d4edf9f9d62 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 18 Jun 2018 16:00:42 +0100 Subject: [PATCH 158/283] delint CallHandler --- .eslintignore.errorfiles | 1 - src/CallHandler.js | 132 +++++++++++++++++++++------------------ 2 files changed, 72 insertions(+), 61 deletions(-) diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles index 42818244b3..e5eb9d70c8 100644 --- a/.eslintignore.errorfiles +++ b/.eslintignore.errorfiles @@ -4,7 +4,6 @@ src/autocomplete/AutocompleteProvider.js src/autocomplete/Autocompleter.js src/autocomplete/EmojiProvider.js src/autocomplete/UserProvider.js -src/CallHandler.js src/component-index.js src/components/structures/BottomLeftMenu.js src/components/structures/CompatibilityPage.js diff --git a/src/CallHandler.js b/src/CallHandler.js index da764ec4b6..55a05798af 100644 --- a/src/CallHandler.js +++ b/src/CallHandler.js @@ -124,7 +124,7 @@ function _setCallListeners(call) { description: _t( "There are unknown devices in this room: "+ "if you proceed without verifying them, it will be "+ - "possible for someone to eavesdrop on your call." + "possible for someone to eavesdrop on your call.", ), button: _t('Review Devices'), onFinished: function(confirmed) { @@ -247,50 +247,52 @@ function _onAction(payload) { switch (payload.action) { case 'place_call': - if (module.exports.getAnyActiveCall()) { - const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); - Modal.createTrackedDialog('Call Handler', 'Existing Call', ErrorDialog, { - title: _t('Existing Call'), - description: _t('You are already in a call.'), - }); - return; // don't allow >1 call to be placed. - } + { + if (module.exports.getAnyActiveCall()) { + const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); + Modal.createTrackedDialog('Call Handler', 'Existing Call', ErrorDialog, { + title: _t('Existing Call'), + description: _t('You are already in a call.'), + }); + return; // don't allow >1 call to be placed. + } - // if the runtime env doesn't do VoIP, whine. - if (!MatrixClientPeg.get().supportsVoip()) { - const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); - Modal.createTrackedDialog('Call Handler', 'VoIP is unsupported', ErrorDialog, { - title: _t('VoIP is unsupported'), - description: _t('You cannot place VoIP calls in this browser.'), - }); - return; - } + // if the runtime env doesn't do VoIP, whine. + if (!MatrixClientPeg.get().supportsVoip()) { + const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); + Modal.createTrackedDialog('Call Handler', 'VoIP is unsupported', ErrorDialog, { + title: _t('VoIP is unsupported'), + description: _t('You cannot place VoIP calls in this browser.'), + }); + return; + } - var room = MatrixClientPeg.get().getRoom(payload.room_id); - if (!room) { - console.error("Room %s does not exist.", payload.room_id); - return; - } + const room = MatrixClientPeg.get().getRoom(payload.room_id); + if (!room) { + console.error("Room %s does not exist.", payload.room_id); + return; + } - var members = room.getJoinedMembers(); - if (members.length <= 1) { - const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); - Modal.createTrackedDialog('Call Handler', 'Cannot place call with self', ErrorDialog, { - description: _t('You cannot place a call with yourself.'), - }); - return; - } else if (members.length === 2) { - console.log("Place %s call in %s", payload.type, payload.room_id); - const call = Matrix.createNewMatrixCall(MatrixClientPeg.get(), payload.room_id); - placeCall(call); - } else { // > 2 - dis.dispatch({ - action: "place_conference_call", - room_id: payload.room_id, - type: payload.type, - remote_element: payload.remote_element, - local_element: payload.local_element, - }); + const members = room.getJoinedMembers(); + if (members.length <= 1) { + const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); + Modal.createTrackedDialog('Call Handler', 'Cannot place call with self', ErrorDialog, { + description: _t('You cannot place a call with yourself.'), + }); + return; + } else if (members.length === 2) { + console.log("Place %s call in %s", payload.type, payload.room_id); + const call = Matrix.createNewMatrixCall(MatrixClientPeg.get(), payload.room_id); + placeCall(call); + } else { // > 2 + dis.dispatch({ + action: "place_conference_call", + room_id: payload.room_id, + type: payload.type, + remote_element: payload.remote_element, + local_element: payload.local_element, + }); + } } break; case 'place_conference_call': @@ -338,10 +340,18 @@ function _onAction(payload) { }, function(err) { const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); console.error("Conference call failed: " + err); - Modal.createTrackedDialog('Call Handler', 'Failed to set up conference call', ErrorDialog, { - title: _t('Failed to set up conference call'), - description: _t('Conference call failed.') + ' ' + ((err && err.message) ? err.message : ''), - }); + Modal.createTrackedDialog( + 'Call Handler', + 'Failed to set up conference call', + ErrorDialog, + { + title: _t('Failed to set up conference call'), + description: ( + _t('Conference call failed.') + + ' ' + ((err && err.message) ? err.message : '') + ), + }, + ); }); } }, @@ -350,22 +360,24 @@ function _onAction(payload) { } break; case 'incoming_call': - if (module.exports.getAnyActiveCall()) { - // ignore multiple incoming calls. in future, we may want a line-1/line-2 setup. - // we avoid rejecting with "busy" in case the user wants to answer it on a different device. - // in future we could signal a "local busy" as a warning to the caller. - // see https://github.com/vector-im/vector-web/issues/1964 - return; - } + { + if (module.exports.getAnyActiveCall()) { + // ignore multiple incoming calls. in future, we may want a line-1/line-2 setup. + // we avoid rejecting with "busy" in case the user wants to answer it on a different device. + // in future we could signal a "local busy" as a warning to the caller. + // see https://github.com/vector-im/vector-web/issues/1964 + return; + } - // if the runtime env doesn't do VoIP, stop here. - if (!MatrixClientPeg.get().supportsVoip()) { - return; - } + // if the runtime env doesn't do VoIP, stop here. + if (!MatrixClientPeg.get().supportsVoip()) { + return; + } - var call = payload.call; - _setCallListeners(call); - _setCallState(call, call.roomId, "ringing"); + const call = payload.call; + _setCallListeners(call); + _setCallState(call, call.roomId, "ringing"); + } break; case 'hangup': if (!calls[payload.room_id]) { From 03bec1b51519956b3e72d495ad6740e900a0f133 Mon Sep 17 00:00:00 2001 From: Miguel Branco Date: Mon, 18 Jun 2018 13:59:04 +0000 Subject: [PATCH 159/283] Translated using Weblate (Galician) Currently translated at 98.5% (1185 of 1203 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/ --- src/i18n/strings/gl.json | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index aaf84f717d..665ed03cba 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -1164,5 +1164,24 @@ "Refresh": "Actualizar", "We encountered an error trying to restore your previous session.": "Atopamos un fallo intentando restablecer a súa sesión anterior.", "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Limpando o almacenamento do navegador podería resolver o problema, pero desconectarao e non poderá ler o historial cifrado da conversa.", - "Collapse Reply Thread": "Comprimir o fío de respostas" + "Collapse Reply Thread": "Comprimir o fío de respostas", + "e.g. %(exampleValue)s": "p.ex.%(exampleValue)s", + "Send analytics data": "Enviar datos de análises", + "Enable widget screenshots on supported widgets": "Activar as capturas de widgets para aqueles que as permiten", + "Encrypting": "Cifrando", + "Encrypted, not sent": "Cifrado, sen enviar", + "Share Link to User": "Compartir a ligazón co usuario", + "Share room": "Compartir sala", + "To notify everyone in the room, you must be a": "Para avisar a todos os da sala ten que ser", + "Muted Users": "Usuarios silenciados", + "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Mellore Riot.im enviando os datos anónimos de uso. Iso suporá o emprego dunha cookie (véxase a nosa Política de Cookies).", + "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Mellore Riot.im enviando o uso de datos anónimo. Iso usará unha cookie.", + "Yes, I want to help!": "Si, quero axuda", + "Warning: This widget might use cookies.": "Aviso: este widget podería usar algunha cookie.", + "Reload widget": "Volver a cargar o widget", + "Failed to indicate account erasure": "Non se deu indicado a eliminación de conta", + "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Iso fará que a súa deixe de ter uso de xeito permanente. Non poderá acceder e ninguén vai a poder volver a rexistrar esa mesma ID de usuario. Suporá que saía de todas as salas de conversas nas que estaba e eliminará os detalles da súa conta do servidores de identificación.Isto non se poderá desfacer", + "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Desactivando a súa conta non supón que por defecto esquezamos as súas mensaxes enviadas. Se quere que nos esquezamos das súas mensaxes, prema na caixa de embaixo.", + "To continue, please enter your password:": "Para continuar introduza o seu contrasinal:", + "password": "contrasinal" } From 55a6a4dd8fcaadc2e0fab0b42c389bcab4328ba4 Mon Sep 17 00:00:00 2001 From: Miguel Branco Date: Mon, 18 Jun 2018 15:28:27 +0000 Subject: [PATCH 160/283] Translated using Weblate (Galician) Currently translated at 100.0% (1203 of 1203 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/ --- src/i18n/strings/gl.json | 548 ++++++++++++++++++++------------------- 1 file changed, 283 insertions(+), 265 deletions(-) diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index 665ed03cba..41f98676b6 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -1,31 +1,31 @@ { - "This email address is already in use": "Este enderezo de correo xa está a ser utilizado", - "This phone number is already in use": "Este número de teléfono xa está a ser utilizado", + "This email address is already in use": "Xa se está a usar este correo", + "This phone number is already in use": "Xa se está a usar este teléfono", "Failed to verify email address: make sure you clicked the link in the email": "Fallo na verificación do enderezo de correo: asegúrese de ter picado na ligazón do correo", "The remote side failed to pick up": "O interlocutor non respondeu", - "Unable to capture screen": "Non se puido pillar a pantalla", - "Existing Call": "Chamada existente", + "Unable to capture screen": "Non se puido capturar a pantalla", + "Existing Call": "Rexistro de chamadas", "You are already in a call.": "Xa está nunha chamada.", - "VoIP is unsupported": "VoIP non admitida", - "You cannot place VoIP calls in this browser.": "Non pode establecer chamadas VoIP en este navegador.", - "You cannot place a call with yourself.": "Non pode chamarse a vostede mesma.", - "Conference calls are not supported in this client": "Non pode establecer chamadas de Reunión en este cliente", - "Conference calls are not supported in encrypted rooms": "Nas salas cifradas non se pode establecer Chamadas de Reunión", + "VoIP is unsupported": "Sen soporte para VoIP", + "You cannot place VoIP calls in this browser.": "Non pode establecer chamadas VoIP neste navegador.", + "You cannot place a call with yourself.": "Non pode facer unha chamada a si mesmo.", + "Conference calls are not supported in this client": "Non pode establecer chamadas de reunión neste cliente", + "Conference calls are not supported in encrypted rooms": "Nas salas cifradas non se pode establecer chamadas de reunión", "Warning!": "Aviso!", - "Conference calling is in development and may not be reliable.": "As chamadas de Reunión poderían non ser totalmente estables xa que están en desenvolvemento.", + "Conference calling is in development and may not be reliable.": "As chamadas de reunión poderían non ser totalmente estables xa que están en desenvolvemento.", "Failed to set up conference call": "Fallo ao establecer a chamada de reunión", "Conference call failed.": "Fallo na chamada de reunión.", "Call Failed": "Fallou a chamada", - "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hai dispositivos descoñecidos en esta sala: si sigue adiante sen verificalos, pode ser posible que alguén bote un ollo a súa chamada.", + "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hai dispositivos descoñecidos en esta sala: se segue adiante sen verificalos, pode ser posible que alguén bote un ollo a súa chamada.", "Review Devices": "Revisar dispositivos", "Call Anyway": "Chamar igualmente", - "Answer Anyway": "Respostar igualmente", + "Answer Anyway": "Responder igualmente", "Call": "Chamar", - "Answer": "Respostar", - "Call Timeout": "Finou a chamada", - "The file '%(fileName)s' failed to upload": "O ficheiro '%(fileName)s' non se puido subir", - "The file '%(fileName)s' exceeds this home server's size limit for uploads": "O ficheiro '%(fileName)s' excede o límite establecido polo servidor para subidas", - "Upload Failed": "Fallou a subida", + "Answer": "Resposta", + "Call Timeout": "Tempo de resposta de chamada", + "The file '%(fileName)s' failed to upload": "Non se puido subir o ficheiro '%(fileName)s'", + "The file '%(fileName)s' exceeds this home server's size limit for uploads": "O ficheiro '%(fileName)s' excede o límite de tamaño establecido para este servidor", + "Upload Failed": "Fallou o envío", "Sun": "Dom", "Mon": "Lun", "Tue": "Mar", @@ -50,66 +50,66 @@ "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s", "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(time)s", "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s", - "Who would you like to add to this community?": "A quén lle gustaría engadir a esta comunidade?", - "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Aviso: calquer persoa que vostede engada a unha comunidade será públicamente visible para calquera que coñeza o ID da comunidade", - "Invite new community members": "Convidar a novos membros da comunidade", + "Who would you like to add to this community?": "A quen quere engadir a esta comunidade?", + "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Aviso: calquera persoa que engada a unha comunidade estará publicamente visible para calquera que coñeza a ID da comunidade", + "Invite new community members": "Convidará comunidade a novos participantes ", "Name or matrix ID": "Nome ou ID matrix", - "Invite to Community": "Convide a comunidade", - "Which rooms would you like to add to this community?": "Qué salas desexaría engadir a esta comunidade?", - "Show these rooms to non-members on the community page and room list?": "Mostrar estas salas a non-membros na páxina da comunidade e lista de salas?", - "Add rooms to the community": "Engadir salas a comunidade", + "Invite to Community": "Convidar á comunidade", + "Which rooms would you like to add to this community?": "Que salas desexaría engadir a esta comunidade?", + "Show these rooms to non-members on the community page and room list?": "Quere que estas salas se lle mostren a outros membros de fóra da comunidade na lista de salas?", + "Add rooms to the community": "Engadir salas á comunidade", "Room name or alias": "Nome da sala ou alcume", - "Add to community": "Engadir a comunidade", - "Failed to invite the following users to %(groupId)s:": "Fallo ao convidar as seguintes usuarias a %(groupId)s:", - "Failed to invite users to community": "Fallou o convite de usuarias a comunidade", - "Failed to invite users to %(groupId)s": "Fallou o convite de usuarias a %(groupId)s", + "Add to community": "Engadir á comunidade", + "Failed to invite the following users to %(groupId)s:": "Fallo ao convidar os seguintes usuarios a %(groupId)s:", + "Failed to invite users to community": "Houbo un fallo convidando usuarios á comunidade", + "Failed to invite users to %(groupId)s": "Houbo un fallo convidando usuarios a %(groupId)s", "Failed to add the following rooms to %(groupId)s:": "Fallo ao engadir as seguintes salas a %(groupId)s:", - "Riot does not have permission to send you notifications - please check your browser settings": "Riot non ten permiso para enviarlle notificacións - por favor comprobe os axustes do navegador", - "Riot was not given permission to send notifications - please try again": "Riot non ten permiso para enviar notificacións - inténteo de novo", - "Unable to enable Notifications": "Non se puideron habilitar as notificacións", + "Riot does not have permission to send you notifications - please check your browser settings": "Riot non ten permiso para enviarlle notificacións: comprobe os axustes do navegador", + "Riot was not given permission to send notifications - please try again": "Riot non ten permiso para enviar notificacións: inténteo de novo", + "Unable to enable Notifications": "Non se puideron activar as notificacións", "This email address was not found": "Non se atopou este enderezo de correo", - "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "O seu enderezo de correo semella non estar asociado a un ID Matrix en este servidor.", - "Default": "Por omisión", + "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "O seu enderezo de correo semella non estar asociado a un ID Matrix neste servidor.", + "Default": "Por defecto", "Restricted": "Restrinxido", "Moderator": "Moderador", "Admin": "Administrador", "Start a chat": "Iniciar unha conversa", - "Who would you like to communicate with?": "Con quén desexa comunicarse?", + "Who would you like to communicate with?": "Con quen desexa comunicarse?", "Email, name or matrix ID": "Correo, nome ou ID matrix", "Start Chat": "Iniciar conversa", - "Invite new room members": "Convidar a sala a novos membros", - "Who would you like to add to this room?": "A quén desexaría engadir a esta sala?", + "Invite new room members": "Convidar a novos participantes", + "Who would you like to add to this room?": "A quen desexaría engadir a esta sala?", "Send Invites": "Enviar convites", "Failed to invite user": "Fallo ao convidar usuaria", "Operation failed": "Fallou a operación", "Failed to invite": "Fallou o convite", - "Failed to invite the following users to the %(roomName)s room:": "Non se puideron convidar as seguintes usuarias a sala %(roomName)s:", + "Failed to invite the following users to the %(roomName)s room:": "Houbo un fallo convidando os seguintes usuarios á sala %(roomName)s:", "You need to be logged in.": "Precisa estar conectada.", - "You need to be able to invite users to do that.": "Vostede precisa estar autorizada a convidar usuarias para facer iso.", - "Unable to create widget.": "Non se puido crear o widget.", + "You need to be able to invite users to do that.": "Precisa autorización para convidar a outros usuarias para poder facer iso.", + "Unable to create widget.": "Non se puido crear o trebello.", "Failed to send request.": "Fallo ao enviar a petición.", "This room is not recognised.": "Non se recoñece esta sala.", "Power level must be positive integer.": "O nivel de poder ten que ser un enteiro positivo.", - "You are not in this room.": "Vostede non está en esta sala.", - "You do not have permission to do that in this room.": "Non ten permiso para facer eso en esta sala.", + "You are not in this room.": "Non está nesta sala.", + "You do not have permission to do that in this room.": "Non ten permiso para facer iso nesta sala.", "Missing room_id in request": "Falta o room_id na petición", "Must be viewing a room": "Debería estar vendo unha sala", "Room %(roomId)s not visible": "A sala %(roomId)s non é visible", - "Missing user_id in request": "Falata o user_id na petición", + "Missing user_id in request": "Falta o user_id na petición", "Usage": "Uso", "/ddg is not a command": "/ddg non é unha orde", "To use it, just wait for autocomplete results to load and tab through them.": "Para utilizala, agarde que carguen os resultados de autocompletado e escolla entre eles.", "Unrecognised room alias:": "Alcumes de sala non recoñecidos:", "Ignored user": "Usuaria ignorada", "You are now ignoring %(userId)s": "Agora está a ignorar %(userId)s", - "Unignored user": "Usuarias non ignorada", + "Unignored user": "Usuarios non ignorados", "You are no longer ignoring %(userId)s": "Xa non está a ignorar a %(userId)s", "Unknown (user, device) pair:": "Parella descoñecida (dispositivo, usuaria):", "Device already verified!": "Dispositivo xa verificado!", - "WARNING: Device already verified, but keys do NOT MATCH!": "AVISO: o dispositivo xa está verificado, que as chaves NON CONCORDAN!", - "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AVISO: FALLOU A VERIFICACIÓN DE CHAVES! A chave de firma para %(userId)s e dispositivo %(deviceId)s é \"%(fprint)s\" que non concorda coa chave proporcionada \"%(fingerprint)s\". Esto podería significar que as súas comunicacións están a ser interceptadas!", + "WARNING: Device already verified, but keys do NOT MATCH!": "Aviso: o dispositivo xa está verificado só que as chaves NON CONCORDAN!", + "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AVISO: FALLOU A VERIFICACIÓN DE CHAVES! A chave de firma para o %(userId)s e dispositivo %(deviceId)s é \"%(fprint)s\" que non concorda coa chave proporcionada \"%(fingerprint)s\". Isto podería significar que as súas comunicacións están a ser interceptadas!", "Verified key": "Chave verificada", - "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "A chave de firma que proporcionou concorda coa chave de firma que recibeu do dispositivo %(deviceId)s de %(userId)s. Dispositivo marcado como verificado.", + "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "A chave de firma que proporcionou concorda coa chave de firma que recibiu do dispositivo %(deviceId)s de %(userId)s. Dispositivo marcado como verificado.", "Unrecognised command:": "Orde non recoñecida:", "Reason": "Razón", "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceptou o convite para %(displayName)s.", @@ -123,7 +123,7 @@ "%(senderName)s changed their profile picture.": "%(senderName)s cambiou a súa imaxe de perfil.", "%(senderName)s set a profile picture.": "%(senderName)s estableceu a imaxe de perfil.", "VoIP conference started.": "Comezou a conferencia VoIP.", - "%(targetName)s joined the room.": "%(targetName)s uneuse a sala.", + "%(targetName)s joined the room.": "%(targetName)s uniuse a sala.", "VoIP conference finished.": "Rematou a conferencia VoIP.", "%(targetName)s rejected the invitation.": "%(targetName)s rexeitou a invitación.", "%(targetName)s left the room.": "%(targetName)s deixou a sala.", @@ -143,25 +143,25 @@ "%(senderName)s ended the call.": "%(senderName)s rematou a chamada.", "%(senderName)s placed a %(callType)s call.": "%(senderName)s estableceu unha chamada %(callType)s.", "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou un convite a %(targetDisplayName)s para unirse a sala.", - "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s fixo o historial da sala visible para toda a membresía, desde o punto en que foron convidadas.", - "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s estableceu o historial futuro visible a toda a membresía, desde o punto en que se uniron.", - "%(senderName)s made future room history visible to all room members.": "%(senderName)s fixo visible para toda a membresía o historial futuro da sala.", + "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s fixo o historial da sala visible para todos os participantes, desde o punto en que foron convidadas.", + "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s estableceu o historial futuro visible a todos os participantes, desde o punto en que se uniron.", + "%(senderName)s made future room history visible to all room members.": "%(senderName)s fixo visible para todos participantes o historial futuro da sala.", "%(senderName)s made future room history visible to anyone.": "%(senderName)s fixo visible para calquera o historial futuro da sala.", "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s fixo visible o historial futuro da sala para descoñecidos (%(visibility)s).", - "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s activou o cifrado extremo-a-extremo (algoritmo %(algorithm)s).", + "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s activou o cifrado de par-a-par (algoritmo %(algorithm)s).", "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s desde %(fromPowerLevel)s a %(toPowerLevel)s", "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s cambiou o nivel de autoridade a %(powerLevelDiffText)s.", "%(senderName)s changed the pinned messages for the room.": "%(senderName)s cambiou as mensaxes fixadas para a sala.", - "%(widgetName)s widget modified by %(senderName)s": "O engadido %(widgetName)s modificado por %(senderName)s", - "%(widgetName)s widget added by %(senderName)s": "O %(widgetName)s engadido por %(senderName)s", + "%(widgetName)s widget modified by %(senderName)s": "O trebello %(widgetName)s modificado por %(senderName)s", + "%(widgetName)s widget added by %(senderName)s": "O trebello %(widgetName)s engadido por %(senderName)s", "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s eliminado por %(senderName)s", "%(displayName)s is typing": "%(displayName)s está a escribir", "%(names)s and %(count)s others are typing|other": "%(names)s e %(count)s outras están a escribir", "%(names)s and %(count)s others are typing|one": "%(names)s e outra está a escribir", "%(names)s and %(lastPerson)s are typing": "%(names)s e %(lastPerson)s están a escribir", - "Failure to create room": "Fallo ao crear a sala", + "Failure to create room": "Fallou a creación da sala", "Server may be unavailable, overloaded, or you hit a bug.": "O servidor podería non estar dispoñible, con sobrecarga ou ter un fallo.", - "Send anyway": "Enviar de todos xeitos", + "Send anyway": "Enviar de todos os xeitos", "Send": "Enviar", "Unnamed Room": "Sala sen nome", "Your browser does not support the required cryptography extensions": "O seu navegador non soporta as extensións de criptografía necesarias", @@ -170,7 +170,7 @@ "Failed to join room": "Non se puido unir a sala", "Message Pinning": "Fixando mensaxe", "Tag Panel": "Panel de etiquetas", - "Disable Emoji suggestions while typing": "Deshabilitar a suxestión de Emoji mentras escribe", + "Disable Emoji suggestions while typing": "Desactivar a suxestión de Emoji mentres escribe", "Use compact timeline layout": "Utilizar a disposición compacta da liña temporal", "Hide removed messages": "Ocultar mensaxes eliminadas", "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensaxes de unión/saída (convites/expulsións/bloqueos non afectados)", @@ -178,19 +178,19 @@ "Hide display name changes": "Ocultar cambios no nome público", "Hide read receipts": "Ocultar avisos de recepción", "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar marcas de tempo con formato 12 horas (ex. 2:30pm)", - "Always show message timestamps": "Mostar sempre marcas de tempo", + "Always show message timestamps": "Mostrar sempre marcas de tempo", "Autoplay GIFs and videos": "Reprodución automática de GIFs e vídeos", - "Enable automatic language detection for syntax highlighting": "Habilitar a detección automática de idioma para o resalte da sintaxe", + "Enable automatic language detection for syntax highlighting": "Activar a detección automática de idioma para o resalte da sintaxe", "Hide avatars in user and room mentions": "Ocultar avatares nas mencións de usuarios e salas", - "Disable big emoji in chat": "Deshabilitar emojis grandes nas conversas", + "Disable big emoji in chat": "Desactivar emojis grandes nas conversas", "Don't send typing notifications": "Non enviar notificacións de escritura", "Automatically replace plain text Emoji": "Substituír automaticamente Emoji en texto plano", - "Disable Peer-to-Peer for 1:1 calls": "Deshabilitar Peer-to-Peer para chamadas 1:1", - "Never send encrypted messages to unverified devices from this device": "Non enviar mensaxes cifradas a dispositivos non verificados desde este dispositivo", - "Never send encrypted messages to unverified devices in this room from this device": "Non enviar mensaxes cifradas a dispositivos non verificados en esta sala desde este dispositivo", - "Enable inline URL previews by default": "Habilitar por omisión vistas previas en liña de URL", - "Enable URL previews for this room (only affects you)": "Habilitar vista previa de URL en esta sala (só lle afecta a vostede)", - "Enable URL previews by default for participants in this room": "Habilitar vista previa de URL por omisión para as participantes en esta sala", + "Disable Peer-to-Peer for 1:1 calls": "Desactivar Peer-to-Peer para chamadas 1:1", + "Never send encrypted messages to unverified devices from this device": "Nunca enviar mensaxes cifradas aos dispositivos que non estean verificados neste dispositivo", + "Never send encrypted messages to unverified devices in this room from this device": "Nunca enviar mensaxes cifradas aos dispositivos que non estean verificados nesta sala desde este dispositivo", + "Enable inline URL previews by default": "Activar por defecto as vistas previas en liña de URL", + "Enable URL previews for this room (only affects you)": "Activar avista previa de URL nesta sala (só lle afecta a vostede)", + "Enable URL previews by default for participants in this room": "Activar a vista previa de URL por defecto para as participantes nesta sala", "Room Colour": "Cor da sala", "Active call (%(roomName)s)": "Chamada activa (%(roomName)s)", "unknown caller": "interlocutora descoñecida", @@ -211,8 +211,8 @@ "Upload new:": "Subir nova:", "No display name": "Sen nome público", "New passwords don't match": "Os contrasinais novos non coinciden", - "Passwords can't be empty": "Os contranais non poden estar baldeiros", - "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Ao cambiar o contrasinal restablecerá todas as chaves de cifrado extremo-a-extremo en todos os dispositivos, facendo ilexible o historial da conversa a menos que primeiro exporte as chaves da sala e posteriormente as importe. No futuro melloraremos esto.", + "Passwords can't be empty": "Os contrasinais non poden estar baleiros", + "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Ao cambiar o contrasinal restablecerá todas as chaves de cifrado extremo-a-extremo en todos os dispositivos, facendo ilexible o historial da conversa a menos que primeiro exporte as chaves da sala e posteriormente as importe. No futuro melloraremos isto.", "Continue": "Continuar", "Export E2E room keys": "Exportar chaves E2E da sala", "Do you want to set an email address?": "Quere establecer un enderezo de correo electrónico?", @@ -231,14 +231,14 @@ "Last seen": "Visto por última vez", "Select devices": "Escolla dispositivos", "Failed to set display name": "Fallo ao establecer o nome público", - "Disable Notifications": "Deshabilitar notificacións", - "Enable Notifications": "Habilitar notificacións", + "Disable Notifications": "Desactivar notificacións", + "Enable Notifications": "Activar ass notificacións", "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s", "Message Replies": "Respostas a mensaxe", "Mirror local video feed": "Copiar fonte de vídeo local", - "Cannot add any more widgets": "Non pode engadir máis widgets", - "The maximum permitted number of widgets have already been added to this room.": "Xa se engadeu o número máximo de widgets a esta sala.", - "Add a widget": "Engadir widget", + "Cannot add any more widgets": "Non pode engadir máis trebellos", + "The maximum permitted number of widgets have already been added to this room.": "Xa se lle engadiron o número máximo de trebellos a esta sala.", + "Add a widget": "Engadir un trebello", "Drop File Here": "Solte aquí o ficheiro", "Drop file here to upload": "Solte aquí o ficheiro para subilo", " (unsupported)": " (non soportado)", @@ -246,7 +246,7 @@ "Ongoing conference call%(supportedText)s.": "Chamada de conferencia en curso%(supportedText)s.", "%(senderName)s sent an image": "%(senderName)s enviou unha imaxe", "%(senderName)s sent a video": "%(senderName)s enviou un vídeo", - "%(senderName)s uploaded a file": "%(senderName)s subeu un ficheiro", + "%(senderName)s uploaded a file": "%(senderName)s subiu un ficheiro", "Options": "Axustes", "Undecryptable": "Non descifrable", "Encrypted by a verified device": "Cifrado por un dispositivo verificado", @@ -271,7 +271,7 @@ "Failed to toggle moderator status": "Fallo ao mudar a estado de moderador", "Failed to change power level": "Fallo ao cambiar o nivel de permisos", "Are you sure?": "Está segura?", - "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Non poderá desfacer este cambio xa que está promovendo a usaria a ter o mesmo nivel de permisos que vostede.", + "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Non poderá desfacer este cambio xa que lle estará promocionando e outorgándolle a outra persoa os mesmos permisos que os seus.", "No devices with registered encryption keys": "Sen dispositivos con chaves de cifrado rexistradas", "Devices": "Dispositivos", "Unignore": "Non ignorar", @@ -290,7 +290,7 @@ "and %(count)s others...|other": "e %(count)s outras...", "and %(count)s others...|one": "e outra máis...", "Invited": "Convidada", - "Filter room members": "Filtrar membros da conversa", + "Filter room members": "Filtrar os participantes da conversa", "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (permiso %(powerLevelNumber)s)", "Attachment": "Anexo", "Upload Files": "Subir ficheiros", @@ -306,9 +306,9 @@ "Send a reply (unencrypted)…": "Enviar unha resposta (non cifrada)…", "Send an encrypted message…": "Enviar unha mensaxe cifrada…", "Send a message (unencrypted)…": "Enviar unha mensaxe (non cifrada)…", - "You do not have permission to post to this room": "Non ten permiso para comentar en esta sala", - "Turn Markdown on": "Habilitar Markdown", - "Turn Markdown off": "Deshabilitar Markdown", + "You do not have permission to post to this room": "Non ten permiso para comentar nesta sala", + "Turn Markdown on": "Activar Markdown", + "Turn Markdown off": "Desactivar Markdown", "Hide Text Formatting Toolbar": "Agochar barra de formato de texto", "Server error": "Fallo no servidor", "Server unavailable, overloaded, or something else went wrong.": "Servidor non dispoñible, sobrecargado, ou outra cousa puido fallar.", @@ -321,8 +321,8 @@ "quote": "cita", "bullet": "lista", "numbullet": "lista numerada", - "Markdown is disabled": "Markdown deshabilitado", - "Markdown is enabled": "Markdown habilitado", + "Markdown is disabled": "Markdown desactivado", + "Markdown is enabled": "Markdown activado", "Unpin Message": "Desfixar mensaxe", "Jump to message": "Ir a mensaxe", "No pinned messages.": "Sen mensaxes fixadas.", @@ -340,7 +340,7 @@ "Idle": "En pausa", "Offline": "Fóra de liña", "Unknown": "Descoñecido", - "Replying": "Respostando", + "Replying": "Respondendo", "Seen by %(userName)s at %(dateTime)s": "Visto por %(userName)s as %(dateTime)s", "No rooms to show": "Sen salas que mostrar", "Unnamed room": "Sala sen nome", @@ -357,11 +357,11 @@ "Forget room": "Esquecer sala", "Search": "Busca", "Show panel": "Mostra panel", - "Drop here to favourite": "Solte aqui para favorito", + "Drop here to favourite": "Solte aquí para favorito", "Drop here to tag direct chat": "Solte aquí para etiquetar chat directo", "Drop here to restore": "Solte aquí para restablecer", "Drop here to tag %(section)s": "Solte aquí para etiquetar %(section)s", - "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Non poderá desfacer este cambio xa que está a diminuír a súa autoridade, si vostede é a única usuaria con autorización na sala será imposible voltar a obter privilexios.", + "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Non poderá desfacer este cambio xa que está a diminuír a súa autoridade, se é a única persoa con autorización na sala será imposible volver a obter privilexios.", "Drop here to demote": "Arrastre aquí para degradar", "Press to start a chat with someone": "Pulse para iniciar a conversa con alguén", "You're not in any rooms yet! Press to make a room or to browse the directory": "Aínda non está en ningunha sala! Pulse para crear unha sala ou para buscar no directorio", @@ -377,75 +377,75 @@ "You have been invited to join this room by %(inviterName)s": "Foi convidada por %(inviterName)s a unirse a esta sala", "Would you like to accept or decline this invitation?": "Quere aceptar ou rexeitar este convite?", "Reason: %(reasonText)s": "Razón: %(reasonText)s", - "Rejoin": "Voltar a unirse", + "Rejoin": "Volver a unirse", "You have been kicked from %(roomName)s by %(userName)s.": "Foi expulsada de %(roomName)s por %(userName)s.", - "You have been kicked from this room by %(userName)s.": "Foi expulsada de esta sala por %(userName)s.", + "You have been kicked from this room by %(userName)s.": "Foi expulsada desta sala por %(userName)s.", "You have been banned from %(roomName)s by %(userName)s.": "Non se lle permite acceder a %(roomName)s por %(userName)s.", "You have been banned from this room by %(userName)s.": "Non se lle permite o acceso a esta sala por %(userName)s.", "This room": "Esta sala", "%(roomName)s does not exist.": "%(roomName)s non existe.", - "%(roomName)s is not accessible at this time.": "%(roomName)s non está accesible en este momento.", + "%(roomName)s is not accessible at this time.": "%(roomName)s non está accesible neste momento.", "You are trying to access %(roomName)s.": "Está intentando acceder a %(roomName)s.", "You are trying to access a room.": "Está intentando acceder a unha sala.", "Click here to join the discussion!": "Pulse aquí para unirse a conversa!", - "This is a preview of this room. Room interactions have been disabled": "Esta é unha vista previa de esta sala. Desactiváronse as interaccións coa sala", + "This is a preview of this room. Room interactions have been disabled": "Esta é unha vista previa desta sala. Desactiváronse as interaccións coa sala", "To change the room's avatar, you must be a": "Para cambiar o avatar da sala, debe ser", "To change the room's name, you must be a": "Para cambiar o nome da sala, debe ser", "To change the room's main address, you must be a": "Para cambiar o enderezo principal da sala, debe ser", "To change the room's history visibility, you must be a": "Para cambiar a visibilidade do histórico da sala, debe ser", "To change the permissions in the room, you must be a": "Para cambiar os permisos na sala, debe ser", "To change the topic, you must be a": "Para cambiar o asunto, debe ser", - "To modify widgets in the room, you must be a": "Para modificar os widgets da sala, debe ser", + "To modify widgets in the room, you must be a": "Para modificar os trebellos da sala, debe ser", "Failed to unban": "Fallou eliminar a prohibición", "Banned by %(displayName)s": "Non aceptado por %(displayName)s", "Privacy warning": "Aviso de intimidade", - "Changes to who can read history will only apply to future messages in this room": "Os cambios sobre quen pode ler o histórico serán de aplicación a futuras mensaxes en esta sala", + "Changes to who can read history will only apply to future messages in this room": "Os cambios sobre quen pode ler o histórico serán de aplicación para as futuras mensaxes nesta sala", "The visibility of existing history will be unchanged": "A visibilidade do histórico existente non cambiará", "unknown error code": "código de fallo descoñecido", "Failed to forget room %(errCode)s": "Fallo ao esquecer sala %(errCode)s", - "End-to-end encryption is in beta and may not be reliable": "O cifrado de extremo-a-extremo está en beta e podería non ser fiable", + "End-to-end encryption is in beta and may not be reliable": "O cifrado de par-a-par está en beta e podería non ser fiable", "You should not yet trust it to secure data": "Polo de agora non debería confiarlle datos seguros", "Devices will not yet be able to decrypt history from before they joined the room": "Os dispositivos non poderán descifrar o histórico anterior a que se uniron a sala", - "Once encryption is enabled for a room it cannot be turned off again (for now)": "Unha vez habilitado o cifrado para unha sala non se poderá desactivar (por agora)", + "Once encryption is enabled for a room it cannot be turned off again (for now)": "Unha vez activou o cifrado para unha sala non se poderá desactivar (por agora)", "Encrypted messages will not be visible on clients that do not yet implement encryption": "As mensaxes cifradas non será visibles en clientes que non aínda non teñan implementado o cifrado", - "Enable encryption": "Habilitar cifrado", - "(warning: cannot be disabled again!)": "(aviso: non se pode deshabilitar!)", - "Encryption is enabled in this room": "O cifrado está habilitado en esta sala", - "Encryption is not enabled in this room": "O cifrado non se habilitou para esta sala", + "Enable encryption": "Activar o cifrado", + "(warning: cannot be disabled again!)": "(aviso: non se pode desactivar!)", + "Encryption is enabled in this room": "O cifrado está activado nesta sala", + "Encryption is not enabled in this room": "Non se activou o cifrado nesta sala", "Privileged Users": "Usuarios con privilexios", - "No users have specific privileges in this room": "Non hai usuarias con privilexios específicos en esta sala", - "Banned users": "Usuarias non permitidas", + "No users have specific privileges in this room": "Non hai usuarios con privilexios específicos nesta sala", + "Banned users": "Usuarios excluídos", "This room is not accessible by remote Matrix servers": "Esta sala non é accesible por servidores Matrix remotos", "Leave room": "Deixar a sala", "Favourite": "Favorita", "Tagged as: ": "Etiquetada como: ", "To link to a room it must have an address.": "Para ligar a unha sala deberá ter un enderezo.", - "Guests cannot join this room even if explicitly invited.": "As convidadas non se poden unir a esta sala incluso se foro explicitamente convidadas.", + "Guests cannot join this room even if explicitly invited.": "Os convidados non se poden unir a esta sala inda que fosen convidados explicitamente.", "Click here to fix": "Pulse aquí para solución", - "Who can access this room?": "Quén pode acceder a esta sala?", + "Who can access this room?": "Quen pode acceder a esta sala?", "Only people who have been invited": "Só persoas que foron convidadas", "Anyone who knows the room's link, apart from guests": "Calquera que coñeza o enderezo da sala, aparte das convidadas", "Anyone who knows the room's link, including guests": "Calquera que coñeza a ligazón a sala, incluíndo as convidadas", "Publish this room to the public in %(domain)s's room directory?": "Publicar esta sala no directorio público de salas de %(domain)s?", - "Who can read history?": "Quén pode ler o histórico?", + "Who can read history?": "Quen pode ler o histórico?", "Anyone": "Calquera", "Members only (since the point in time of selecting this option)": "Só membros (desde o momento en que se selecciona esta opción)", "Members only (since they were invited)": "Só membros (desde que foron convidados)", "Members only (since they joined)": "Só membros (desde que se uniron)", "Permissions": "Permisos", - "The default role for new room members is": "Por omisión o rol na sala para novos membros é", + "The default role for new room members is": "O rol por defecto na sala para novos participantes é", "To send messages, you must be a": "Para enviar mensaxes, deberá ser", - "To invite users into the room, you must be a": "Para convidar a usuarias a esta sala, debe ser", + "To invite users into the room, you must be a": "Para convidar a usuarios a esta sala, debe ser", "To configure the room, you must be a": "Para configurar a sala, debe ser", - "To kick users, you must be a": "Para expulsar usuarias, debe ser", - "To ban users, you must be a": "Para prohibir usuarias, debe ser", - "To remove other users' messages, you must be a": "Para eliminar mensaxes de outras usuarias, debe ser", + "To kick users, you must be a": "Para expulsar usuarios, debe ser", + "To ban users, you must be a": "Para prohibir usuarios, debe ser", + "To remove other users' messages, you must be a": "Para eliminar mensaxes doutras usuarios, debe ser", "To send events of type , you must be a": "Para enviar eventos de tipo , debe ser", "Advanced": "Avanzado", - "This room's internal ID is": "O ID interno de esta sala é", + "This room's internal ID is": "O ID interno desta sala é", "Add a topic": "Engadir asunto", "Cancel": "Cancelar", - "Scroll to unread messages": "Desplace ate mensaxes non lidas", + "Scroll to unread messages": "Desprazarse ate mensaxes non lidas", "Jump to first unread message.": "Ir a primeira mensaxe non lida.", "Close": "Pechar", "Invalid alias format": "Formato de alias non válido", @@ -463,10 +463,10 @@ "Invalid community ID": "ID da comunidade non válido", "'%(groupId)s' is not a valid community ID": "'%(groupId)s' non é un ID de comunidade válido", "New community ID (e.g. +foo:%(localDomain)s)": "Novo ID da comunidade (ex. +foo:%(localDomain)s)", - "You have enabled URL previews by default.": "Vostede habilitou a vista previa de URL por omisión.", - "You have disabled URL previews by default.": "Vostede desactivou a vista previa de URL por omisión.", - "URL previews are enabled by default for participants in this room.": "As vistas previas de URL están habilitadas por omisión para os participantes de esta sala.", - "URL previews are disabled by default for participants in this room.": "As vistas previas de URL están desactivadas por omisión para os participantes de esta sala.", + "You have enabled URL previews by default.": "Activou a vista previa de URL por defecto.", + "You have disabled URL previews by default.": "Desactivou a vista previa de URL por defecto.", + "URL previews are enabled by default for participants in this room.": "As vistas previas de URL están activas por defecto para os participantes desta sala.", + "URL previews are disabled by default for participants in this room.": "As vistas previas de URL están desactivadas por defecto para os participantes desta sala.", "URL Previews": "Vista previa de URL", "Error decrypting audio": "Fallo ao descifrar audio", "Error decrypting attachment": "Fallo descifrando o anexo", @@ -486,17 +486,17 @@ "Message removed by %(userId)s": "Mensaxe eliminada por %(userId)s", "Message removed": "Mensaxe eliminada", "Robot check is currently unavailable on desktop - please use a web browser": "Comprobación por Robot non está dispoñible en escritorio - por favor utilice un navegador web", - "This Home Server would like to make sure you are not a robot": "Este Servidor quere asegurarse de que vostede non é un robot", + "This Home Server would like to make sure you are not a robot": "Este servidor quere asegurarse de que vostede non é un robot", "Sign in with CAS": "Conectarse con CAS", "Custom Server Options": "Opcións personalizadas do servidor", "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Pode utilizar as opcións personalizadas do servidor para conectarse a outros servidores Matrix indicando un URL de servidor de inicio diferente.", - "This allows you to use this app with an existing Matrix account on a different home server.": "Así pode utilizar este aplicativo con unha conta Matrix existente en un servidor de incio diferente.", - "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Tamén pode establecer un servidor de identidade personalizado pero esto normalmente dificulta a interacción con usuarias basándose non enderezo de correo.", + "This allows you to use this app with an existing Matrix account on a different home server.": "Así pode utilizar este aplicativo con unha conta Matrix existente en un servidor de inicio diferente.", + "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Tamén pode establecer un servidor de identidade personalizado pero isto normalmente dificulta a interacción con usuarios baseándose non enderezo de correo.", "Dismiss": "Rexeitar", "To continue, please enter your password.": "Para continuar, por favor introduza o seu contrasinal.", "Password:": "Contrasinal:", "An email has been sent to %(emailAddress)s": "Enviouse un correo a %(emailAddress)s", - "Please check your email to continue registration.": "Por favor comprobe o seu correo para continuar co rexistro.", + "Please check your email to continue registration.": "Comprobe o seu correo para continuar co rexistro.", "Token incorrect": "Testemuño incorrecto", "A text message has been sent to %(msisdn)s": "Enviouse unha mensaxe de texto a %(msisdn)s", "Please enter the code it contains:": "Por favor introduza o código que contén:", @@ -510,22 +510,22 @@ "Sign in with": "Conectarse con", "Email address": "Enderezo de correo", "Sign in": "Conectar", - "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Si non indica un enderezo de correo non poderá restablecer o contrasinal, está segura?", + "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Se non indica un enderezo de correo non poderá restablecer o contrasinal, está seguro?", "Email address (optional)": "Enderezo de correo (opcional)", "You are registering with %(SelectedTeamName)s": "Estase a rexistrar con %(SelectedTeamName)s", "Mobile phone number (optional)": "Número de teléfono móbil (opcional)", - "Register": "Rexistar", - "Default server": "Servidor por omisión", + "Register": "Rexistrar", + "Default server": "Servidor por defecto", "Custom server": "Servidor personalizado", "Home server URL": "URL do servidor de inicio", "Identity server URL": "URL do servidor de identidade", - "What does this mean?": "Qué significa esto?", + "What does this mean?": "Que significa isto?", "Remove from community": "Eliminar da comunidade", "Disinvite this user from community?": "Retirar o convite a comunidade a esta usuaria?", "Remove this user from community?": "Quitar a esta usuaria da comunidade?", "Failed to withdraw invitation": "Fallo ao retirar o convite", "Failed to remove user from community": "Fallo ao quitar a usuaria da comunidade", - "Filter community members": "Filtrar membros da comunidade", + "Filter community members": "Filtrar participantes na comunidade", "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Está segura de que quere eliminar '%(roomName)s' de %(groupId)s?", "Removing a room from the community will also remove it from the community page.": "Eliminar unha sala da comunidade tamén a quitará da páxina da comunidade.", "Remove": "Eliminar", @@ -535,18 +535,18 @@ "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "A visibilidade de '%(roomName)s' en %(groupId)s non se puido actualizar.", "Visibility in Room List": "Visibilidade na Lista de Salas", "Visible to everyone": "Visible para todo o mundo", - "Only visible to community members": "Só visible para membros da comunidade", + "Only visible to community members": "Só visible para os participantes da comunidade", "Filter community rooms": "Filtrar salas da comunidade", "Something went wrong when trying to get your communities.": "Algo fallou ao intentar obter as súas comunidades.", "You're not currently a member of any communities.": "Ate o momento non é membro de ningunha comunidade.", "Unknown Address": "Enderezo descoñecido", - "NOTE: Apps are not end-to-end encrypted": "NOTA: As Apps non están cifradas de extremo-a-extremo", - "Do you want to load widget from URL:": "Quere cargar o widget da URL:", + "NOTE: Apps are not end-to-end encrypted": "NOTA: As Apps non están cifradas de par-a-par", + "Do you want to load widget from URL:": "Quere cargar o trebello da URL:", "Allow": "Permitir", - "Delete Widget": "Eliminar Widget", - "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Quitando un widget eliminao para todas as usuarias de esta sala. Está segura de querer eliminar este widget?", - "Delete widget": "Eliminar widget", - "Revoke widget access": "Retirar acceso ao widget", + "Delete Widget": "Eliminar trebello", + "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Quitando un trebello elimínao para todas os usuarios desta sala. Está seguro de querer eliminar este trebello?", + "Delete widget": "Eliminar trebello", + "Revoke widget access": "Retirar acceso ao trebello", "Minimize apps": "Minimizar apps", "Edit": "Editar", "Create new room": "Crear unha nova sala", @@ -565,25 +565,25 @@ "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s uníronse %(count)s veces", "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s uníronse", "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s uniuse %(count)s veces", - "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s uníuse", + "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s uniuse", "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s saíron %(count)s veces", "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s saíron", - "%(oneUser)sleft %(count)s times|other": "%(oneUser)s saiu %(count)s veces", - "%(oneUser)sleft %(count)s times|one": "%(oneUser)s saiu", + "%(oneUser)sleft %(count)s times|other": "%(oneUser)s saíu %(count)s veces", + "%(oneUser)sleft %(count)s times|one": "%(oneUser)s saio", "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s uníronse e saíron %(count)s veces", "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s uníronse e saíron", - "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s uniuse e saiu %(count)s veces", - "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s uníuse e saiu", - "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s saíron e voltaron %(count)s veces", - "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s saíron e voltaron", - "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s saiu e voltou %(count)s veces", - "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s saiu e voltou", + "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s uniuse e saio %(count)s veces", + "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s uniuse e saíu", + "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s saíron e volveron %(count)s veces", + "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s saíron e votaron", + "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s saíu e volveu %(count)s veces", + "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s saíu e volveu", "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s rexeitaron convites %(count)s veces", "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s rexeitaron os seus convites", "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s rexeitou o seu convite %(count)s veces", "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s rexeitou o seu convite", "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "retiróuselle o convite a %(severalUsers)s %(count)s veces", - "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "retirouselle o convite a %(severalUsers)s", + "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "retiróuselle o convite a %(severalUsers)s", "%(oneUser)shad their invitation withdrawn %(count)s times|other": "retiróuselle o convite a %(oneUser)s %(count)s veces", "%(oneUser)shad their invitation withdrawn %(count)s times|one": "retiróuselle o convite a %(oneUser)s", "were invited %(count)s times|other": "foron convidados %(count)s veces", @@ -594,9 +594,9 @@ "were banned %(count)s times|one": "foron prohibidas", "was banned %(count)s times|other": "foi prohibida %(count)s veces", "was banned %(count)s times|one": "foi prohibida", - "were unbanned %(count)s times|other": "retirouselle a prohibición %(count)s veces", - "were unbanned %(count)s times|one": "retirouselle a prohibición", - "was unbanned %(count)s times|other": "retirouselle a prohibición %(count)s veces", + "were unbanned %(count)s times|other": "retiróuselle a prohibición %(count)s veces", + "were unbanned %(count)s times|one": "retrouseille a prohibición", + "was unbanned %(count)s times|other": "retrouseille a prohibición %(count)s veces", "was unbanned %(count)s times|one": "retiróuselle a prohibición", "were kicked %(count)s times|other": "foron expulsadas %(count)s veces", "were kicked %(count)s times|one": "foron expulsadas", @@ -626,7 +626,7 @@ "Matrix Room ID": "ID sala Matrix", "email address": "enderezo de correo", "Try using one of the following valid address types: %(validTypesList)s.": "Intentar utilizar algún dos seguintes tipos de enderezo válidos: %(validTypesList)s.", - "You have entered an invalid address.": "Introduxo un enderezo non válido.", + "You have entered an invalid address.": "Introduciu un enderezo non válido.", "Create a new chat or reuse an existing one": "Crear un novo chat ou reutilizar un xa existente", "Start new chat": "Iniciar un novo chat", "You already have existing direct chats with this user:": "Xa ten unha conversa directa con esta usuaria:", @@ -634,10 +634,10 @@ "Click on the button below to start chatting!": "Pulse non botón inferior para iniciar a conversar!", "Start Chatting": "Iniciar a conversa", "Confirm Removal": "Confirme a retirada", - "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Está certa de que quere quitar (eliminar) este evento? Sepa que si elimina un nome de sala ou cambia o asunto, podería desfacer o cambio.", + "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Está certa de que quere quitar (eliminar) este evento? Saiba que si elimina un nome de sala ou cambia o asunto, podería desfacer o cambio.", "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Os ID de comunidade só poden conter caracteres a-z, 0-9, or '=_-./'", "Community IDs cannot not be empty.": "O ID de comunidade non pode quedar baldeiro.", - "Something went wrong whilst creating your community": "Algo fallou mentras se creaba a súa comunidade", + "Something went wrong whilst creating your community": "Algo fallou mentres se creaba a súa comunidade", "Create Community": "Crear comunidade", "Community Name": "Nome da comunidade", "Example": "Exemplo", @@ -647,37 +647,37 @@ "Create Room": "Crear sala", "Room name (optional)": "Nome da sala (opcional)", "Advanced options": "Axustes avanzados", - "Block users on other matrix homeservers from joining this room": "Evitar que usuarias de outros servidores matrix se unan a esta sala", + "Block users on other matrix homeservers from joining this room": "Evitar que usuarios doutros servidores matrix se unan a esta sala", "This setting cannot be changed later!": "Esta preferencia non se pode cambiar máis tarde!", "Unknown error": "Fallo descoñecido", "Incorrect password": "Contrasinal incorrecto", "Deactivate Account": "Desactivar conta", "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Non se pode determinar si o enderezo ao que foi enviado este convite coincide con un dos asociados a súa conta.", - "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "Para verificar que se pode confiar en este dispositivo, contacte co seu dono utilizando algún outro medio (ex. en persoa ou chamada de teléfono) e pregúntelle si a chave que ven nos Axustes de Usuaria do se dispositivo coincide coa chave inferior:", + "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "Para verificar que se pode confiar neste dispositivo, contacte co seu dono utilizando algún outro medio (ex. en persoa ou chamada de teléfono) e pregúntelle se a clave que ven nos axustes de usuario do se dispositivo coincide coa clave inferior:", "Device name": "Nome do dispositivo", "Device key": "Chave do dispositivo", - "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Si concorda, pulse o botón verificar. Si non, entón alguén está interceptando este dispositivo e probablemente vostede desexe pulsar o botón lista negra.", + "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Se concorda, pulse o botón verificar. Si non, entón alguén está interceptando este dispositivo e probablemente vostede desexe pulsar o botón lista negra.", "In future this verification process will be more sophisticated.": "No futuro este proceso de verificación será máis sofisticado.", "Verify device": "Verificar dispositivo", "I verify that the keys match": "Certifico que coinciden as chaves", "An error has occurred.": "Algo fallou.", "OK": "OK", - "You added a new device '%(displayName)s', which is requesting encryption keys.": "Engadeu un novo dispositivo '%(displayName)s', que está a solicitar as chaves de cifrado.", + "You added a new device '%(displayName)s', which is requesting encryption keys.": "Engadiu un novo dispositivo '%(displayName)s', que está a solicitar as chaves de cifrado.", "Your unverified device '%(displayName)s' is requesting encryption keys.": "O seu dispositivo non verificado '%(displayName)s' está solicitando chaves de cifrado.", "Start verification": "Iniciar verificación", - "Share without verifying": "Compartir sin verificar", + "Share without verifying": "Compartir sen verificar", "Ignore request": "Ignorar petición", "Loading device info...": "Cargando información do dispositivo...", "Encryption key request": "Petición de chave de cifrado", "Unable to restore session": "Non se puido restaurar a sesión", - "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Si anteriormente utilizou unha versión máis recente de Riot, a súa sesión podería non ser compatible con esta versión. Peche esta ventá e volte a versión máis recente.", - "Invalid Email Address": "Enderezo de email non válido", - "This doesn't appear to be a valid email address": "Este non semella ser un enderezo de email válido", + "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Si anteriormente utilizou unha versión máis recente de Riot, a súa sesión podería non ser compatible con esta versión. Peche esta ventá e volva a versión máis recente.", + "Invalid Email Address": "Enderezo de correo non válido", + "This doesn't appear to be a valid email address": "Este non semella ser un enderezo de correo válido", "Verification Pending": "Verificación pendente", - "Please check your email and click on the link it contains. Once this is done, click continue.": "Por favor comprobe o seu email e pulse na ligazón que contén. Unha vez feito, pulse continuar.", - "Unable to add email address": "Non se puido engadir enderezo de email", - "Unable to verify email address.": "Non se puido verificar enderezo de email.", - "This will allow you to reset your password and receive notifications.": "Esto permitiralle restablecer o seu contrasinal e recibir notificacións.", + "Please check your email and click on the link it contains. Once this is done, click continue.": "Comprobe o seu correo electrónico e pulse na ligazón que contén. Unha vez feito iso prema continuar.", + "Unable to add email address": "Non se puido engadir enderezo de correo", + "Unable to verify email address.": "Non se puido verificar enderezo de correo electrónico.", + "This will allow you to reset your password and receive notifications.": "Isto permitiralle restablecer o seu contrasinal e recibir notificacións.", "Skip": "Saltar", "User names may only contain letters, numbers, dots, hyphens and underscores.": "Os nomes de usuaria só poden conter letras, números, puntos e guión alto e baixo.", "Username not available": "Nome de usuaria non dispoñible", @@ -686,8 +686,8 @@ "Username available": "Nome de usuaria dispoñible", "To get started, please pick a username!": "Para comezar, escolla un nome de usuaria!", "This will be your account name on the homeserver, or you can pick a different server.": "Este será o nome da súa conta no servidor, ou pode escoller un servidor diferente.", - "If you already have a Matrix account you can log in instead.": "Si xa ten unha conta Matrix entón pode conectarse.", - "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "En este momento está por na lista negra os dispositivos non verificados; para enviar mensaxes a eses dispositivos debe verificalos.", + "If you already have a Matrix account you can log in instead.": "Se xa ten unha conta Matrix entón pode conectarse.", + "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Neste momento está por na lista negra os dispositivos non verificados; para enviar mensaxes a eses dispositivos debe verificalos.", "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Recomendámoslle que vaia ao proceso de verificación para cada dispositivo para confirmar que pertencen ao seu dono lexítimos, pero se o prefire pode enviar a mensaxe sen ter verificado.", "Room contains unknown devices": "A sala contén dispositivos descoñecidos", "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contén dispositivos que vostede non vira antes.", @@ -699,22 +699,22 @@ "Name": "Nome", "Topic": "Asunto", "Make this room private": "Facer que esta sala sexa privada", - "Share message history with new users": "Compartir o histórico de mensaxes coas novas usuarias", - "Encrypt room": "Cifrar sala", + "Share message history with new users": "Compartir o histórico de mensaxes cos novos usuarios", + "Encrypt room": "Cifrar a sala", "You must register to use this functionality": "Debe rexistrarse para utilizar esta función", "You must join the room to see its files": "Debe unirse a sala para ver os seus ficheiros", - "There are no visible files in this room": "Non hai ficheiros visibles en esta sala", + "There are no visible files in this room": "Non hai ficheiros visibles nesta sala", "

    HTML for your community's page

    \n

    \n Use the long description to introduce new members to the community, or distribute\n some important links\n

    \n

    \n You can even use 'img' tags\n

    \n": "

    HTML para a páxina da súa comunidade

    \n

    \n Utilice a descrición longa para presentar novos membros a comunidade, ou publicar algunha ligazón importante\n \n

    \n

    \n Tamén pode utilizar etiquetas 'img'\n

    \n", "Add rooms to the community summary": "Engadir salas ao resumo da comunidade", - "Which rooms would you like to add to this summary?": "Qué salas desexa engadir a este resumo?", + "Which rooms would you like to add to this summary?": "Que salas desexa engadir a este resumo?", "Add to summary": "Engadir ao resumo", "Failed to add the following rooms to the summary of %(groupId)s:": "Algo fallou ao engadir estas salas ao resumo de %(groupId)s:", "Add a Room": "Engadir unha sala", "Failed to remove the room from the summary of %(groupId)s": "Algo fallou ao quitar a sala do resumo de %(groupId)s", "The room '%(roomName)s' could not be removed from the summary.": "A sala '%(roomName)s' non se puido eliminar do resumo.", - "Add users to the community summary": "Engadir usuarias ao resumo da comunidade", - "Who would you like to add to this summary?": "A quén desexa engadir a este resumo?", - "Failed to add the following users to the summary of %(groupId)s:": "Algo fallou ao engadir as seguintes usuarias ao resumo de %(groupId)s:", + "Add users to the community summary": "Engadir usuarios ao resumo da comunidade", + "Who would you like to add to this summary?": "A quen desexa engadir a este resumo?", + "Failed to add the following users to the summary of %(groupId)s:": "Algo fallou ao engadir aos seguintes usuarios ao resumo de %(groupId)s:", "Add a User": "Engadir unha usuaria", "Failed to remove a user from the summary of %(groupId)s": "Algo fallou ao eliminar a usuaria do resumo de %(groupId)s", "The user '%(displayName)s' could not be removed from the summary.": "A usuaria '%(displayName)s' non se puido eliminar do resumo.", @@ -726,14 +726,14 @@ "Leave %(groupName)s?": "Deixar %(groupName)s?", "Leave": "Saír", "Community Settings": "Axustes da comunidade", - "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Estas salas son mostradas aos membros da comunidade na páxina da comunidade. Os membros da comunidade poden unirse as salas pulsando en elas.", + "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Estas salas móstranselle aos membros da comunidade na páxina da comunidade.Os participantes da comunidade poden unirse ás salas premendo nelas.", "Add rooms to this community": "Engadir salas a esta comunidade", "Featured Rooms:": "Salas destacadas:", - "Featured Users:": "Usuarias destacadas:", + "Featured Users:": "Usuarios destacados:", "%(inviter)s has invited you to join this community": "%(inviter)s convidouna a unirse a esta comunidade", "You are an administrator of this community": "Vostede administra esta comunidade", - "You are a member of this community": "Vostede é membro de esta comunidade", - "Your community hasn't got a Long Description, a HTML page to show to community members.
    Click here to open settings and give it one!": "A súa comunidade non ten unha Descrición Longa, unha páxina HTML para mostrar aos membros.
    Pulse aquí para abrir os axustes e publicar unha!", + "You are a member of this community": "É membro desta comunidade", + "Your community hasn't got a Long Description, a HTML page to show to community members.
    Click here to open settings and give it one!": "A súa comunidade non ten unha descrición longa, ou unha páxina HTML que lle mostrar aos seus participantes.
    Pulse aquí para abrir os axustes e publicar unha!", "Long Description (HTML)": "Descrición longa (HTML)", "Description": "Descrición", "Community %(groupId)s not found": "Non se atopou a comunidade %(groupId)s", @@ -749,13 +749,13 @@ "Old cryptography data detected": "Detectouse o uso de criptografía sobre datos antigos", "Logout": "Desconectar", "Your Communities": "As súas Comunidades", - "Error whilst fetching joined communities": "Fallo mentras se obtiñas as comunidades unidas", + "Error whilst fetching joined communities": "Fallo mentres se obtiñas as comunidades unidas", "Create a new community": "Crear unha nova comunidade", - "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crear unha comunidade para agrupar usuarias e salas! Poña unha páxina de inicio personalizada para destacar o seu lugar no universo Matrix.", + "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crear unha comunidade para agrupar usuaria/os e salas! Poña unha páxina de inicio personalizada para destacar o seu lugar no universo Matrix.", "Join an existing community": "Unirse a unha comunidade existente", "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Para unirse a unha comunidade existente deberá coñecer o identificador de esa comunidade; terá un aspecto como +exemplo:matrix.org.", "You have no visible notifications": "Non ten notificacións visibles", - "Scroll to bottom of page": "Desplácese ate o final da páxina", + "Scroll to bottom of page": "Desprácese ate o final da páxina", "Message not sent due to unknown devices being present": "Non se enviou a mensaxe porque hai dispositivos non coñecidos", "Show devices, send anyway or cancel.": "Mostrar dispositivos, enviar igualmente ou cancelar.", "%(count)s of your messages have not been sent.|other": "Algunha das súas mensaxes non foron enviadas.", @@ -764,7 +764,7 @@ "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "Reenviar mensaxe ou cancelar mensaxe agora.", "Warning": "Aviso", "Connectivity to the server has been lost.": "Perdeuse a conexión ao servidor.", - "Sent messages will be stored until your connection has returned.": "As mensaxes enviadas gardaránse ate que retome a conexión.", + "Sent messages will be stored until your connection has returned.": "As mensaxes enviadas gardaranse ate que retome a conexión.", "%(count)s new messages|other": "%(count)s novas mensaxes", "%(count)s new messages|one": "%(count)s nova mensaxe", "Active call": "Chamada activa", @@ -785,19 +785,19 @@ "Click to mute video": "Pulse para acalar video", "Click to unmute audio": "Pulse para escoitar audio", "Click to mute audio": "Pulse para acalar audio", - "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Intentouse cargar un punto concreto do historial de esta sala, pero vostede non ten permiso para ver a mensaxe en cuestión.", - "Tried to load a specific point in this room's timeline, but was unable to find it.": "Intentouse cargar un punto específico do historial de esta sala, pero non se puido atopar.", + "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Intentouse cargar un punto concreto do historial desta sala, pero non ten permiso para ver a mensaxe en cuestión.", + "Tried to load a specific point in this room's timeline, but was unable to find it.": "Intentouse cargar un punto específico do historial desta sala, pero non se puido atopar.", "Failed to load timeline position": "Fallo ao cargar posición da liña temporal", "Uploading %(filename)s and %(count)s others|other": "Subindo %(filename)s e %(count)s máis", "Uploading %(filename)s and %(count)s others|zero": "Subindo %(filename)s", "Uploading %(filename)s and %(count)s others|one": "Subindo %(filename)s e %(count)s máis", "Light theme": "Decorado claro", - "Dark theme": "Decorado oscuro", + "Dark theme": "Decorado escuro", "Status.im theme": "Decorado Status.im", "Can't load user settings": "Non se puideron cargar os axustes de usuaria", "Server may be unavailable or overloaded": "O servidor podería non está dispoñible ou sobrecargado", "Sign out": "Desconectar", - "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "Por seguridade, ao desconectarse borrará todas as chaves de cifrado extremo-a-extremo en este navegador. Si quere poder descifrar o historial da conversa en futuras sesións en Riot, por favor exporte as chaves da sala e gárdeas en lugar seguro.", + "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "Por seguridade, ao desconectarse borrará todas as chaves de cifrado par-a-par ste navegador. Se quere poder descifrar o historial da conversa en futuras sesións en Riot, por favor exporte as chaves da sala e gárdeas en lugar seguro.", "Failed to change password. Is your password correct?": "Fallo ao cambiar o contrasinal. É correcto o contrasinal?", "Success": "Parabéns", "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "O seu contrasinal cambiouse correctamente. Non recibirá notificacións tipo push en outros dispositivos ate que se conecte novamente en eles", @@ -807,17 +807,17 @@ "Refer a friend to Riot:": "Convide a un amigo a Riot:", "Interface Language": "Idioma da Interface", "User Interface": "Interface de usuaria", - "Autocomplete Delay (ms):": "Retraso no autocompletado (ms):", + "Autocomplete Delay (ms):": "Atraso no autocompletado (ms):", "": "", "Import E2E room keys": "Importar chaves E2E da sala", "Cryptography": "Criptografía", "Device ID:": "ID de dispositivo:", "Device key:": "Chave do dispositivo:", - "Ignored Users": "Usuarias ignoradas", + "Ignored Users": "Usuarios ignorados", "Analytics": "Analytics", "Riot collects anonymous analytics to allow us to improve the application.": "Riot recolle información analítica anónima para permitirnos mellorar o aplicativo.", "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "A intimidade impórtanos, así que non recollemos información personal ou identificable nos datos dos nosos análises.", - "Learn more about how we use analytics.": "Saber máis sobre cómo utilizamos analytics.", + "Learn more about how we use analytics.": "Saber máis sobre como utilizamos analytics.", "Labs": "Labs", "These are experimental features that may break in unexpected ways": "Estas son características experimentais que poderían dar lugar a fallos non agardados", "Use with caution": "Utilice con precaución", @@ -828,24 +828,24 @@ "Check for update": "Comprobar actualización", "Reject all %(invitedRooms)s invites": "Rexeitar todos os %(invitedRooms)s convites", "Bulk Options": "Opcións en bloque", - "Desktop specific": "Específicas de escritorio", - "Start automatically after system login": "Iniciar automáticamente despóis de iniciar sesión", + "Desktop specific": "Configuracións de escritorio", + "Start automatically after system login": "Iniciar automaticamente despois de iniciar sesión", "No media permissions": "Sen permisos de medios", "You may need to manually permit Riot to access your microphone/webcam": "Igual ten que permitir manualmente a Riot acceder ao seus micrófono e cámara", "Missing Media Permissions, click here to request.": "Faltan permisos de medios, pulse aquí para solicitalos.", "No Microphones detected": "Non se detectaron micrófonos", "No Webcams detected": "Non se detectaron cámaras", - "Default Device": "Dispositivo por omisión", + "Default Device": "Dispositivo por defecto", "Microphone": "Micrófono", "Camera": "Cámara", "VoIP": "VoIP", - "Email": "Correo-e", - "Add email address": "Engadir enderezo correo-e", + "Email": "Correo electrónico", + "Add email address": "Engadir enderezo correo electrónico", "Notifications": "Notificacións", "Profile": "Perfil", "Display name": "Nome mostrado", "Account": "Conta", - "To return to your account in future you need to set a password": "Estableza un contrasinal para voltar a súa conta con posterioridade", + "To return to your account in future you need to set a password": "Estableza un contrasinal para volver a súa conta con posterioridade", "Logged in as:": "Conectada como:", "Access Token:": "Testemuño de acceso:", "click to reveal": "pulse para revelar", @@ -854,31 +854,31 @@ "matrix-react-sdk version:": "versión matrix-react-sdk:", "riot-web version:": "versión riot-web:", "olm version:": "versión olm:", - "Failed to send email": "Fallo ao enviar correo-e", - "The email address linked to your account must be entered.": "Debe introducir o correo-e ligado a súa conta.", + "Failed to send email": "Fallo ao enviar correo electrónico", + "The email address linked to your account must be entered.": "Debe introducir o correo electrónico ligado a súa conta.", "A new password must be entered.": "Debe introducir un novo contrasinal.", "New passwords must match each other.": "Os novos contrasinais deben ser coincidentes.", - "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Detectáronse datos de una versión anterior de Riot. Esto causará un mal funcionamento da criptografía extremo-a-extremo na versión antiga. As mensaxes cifradas extremo-a-extremo intercambiadas mentras utilizaba a versión anterior poderían non ser descifrables en esta versión. Esto tamén podería causar que mensaxes intercambiadas con esta versión tampouco funcionasen. Si ten problemas, desconéctese e conéctese de novo. Para manter o historial de mensaxes, exporte e reimporte as súas chaves.", - "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "O restablecemento do contrasinal restablecerá tamén as chaves de cifrado extremo-a-extremo en todos os dispositivos, facendo o historial de chat cifrado non lexible, a menos que primeiro exporte as chaves da sala e as reimporte posteriormente. No futuro melloraremos esto.", - "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Enviouse un email a %(emailAddress)s. Unha vez siga a ligazón que contén, pulse abaixo.", - "I have verified my email address": "Validei o meu enderezo de correo-e", + "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Detectáronse datos de una versión anterior de Riot. Isto causará un mal funcionamento da criptografía extremo-a-extremo na versión antiga. As mensaxes cifradas extremo-a-extremo intercambiadas mentres utilizaba a versión anterior poderían non ser descifrables en esta versión. Isto tamén podería causar que mensaxes intercambiadas con esta versión tampouco funcionasen. Se ten problemas, desconéctese e conéctese de novo. Para manter o historial de mensaxes, exporte e reimporte as súas chaves.", + "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "O restablecemento do contrasinal restablecerá tamén as chaves de cifrado extremo-a-extremo en todos os dispositivos, facendo o historial de chat cifrado non lexible, a menos que primeiro exporte as chaves da sala e as reimporte posteriormente. No futuro melloraremos isto.", + "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Enviouse un correo a %(emailAddress)s. Unha vez siga a ligazón que contén, pulse abaixo.", + "I have verified my email address": "Validei o meu enderezo de correo electrónico", "Your password has been reset": "Restableceuse o seu contrasinal", "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Foi desconectado de todos os seus dispositivos e xa non recibirá notificacións push. Para reactivar as notificacións, conéctese de novo en cada dispositivo", - "Return to login screen": "Voltar a pantalla de conexión", + "Return to login screen": "Volver a pantalla de conexión", "To reset your password, enter the email address linked to your account": "Para restablecer o seu contrasinal, introduza o enderezo de correo electrónico ligado a súa conta", "New password": "Novo contrasinal", "Confirm your new password": "Confirme o seu novo contrasinal", - "Send Reset Email": "Enviar correo-e de restablecemento", + "Send Reset Email": "Enviar correo electrónico de restablecemento", "Create an account": "Crear unha conta", - "This Home Server does not support login using email address.": "Este servidor non soporta a conexión utilizando un enderezo de correo-e.", + "This Home Server does not support login using email address.": "Este servidor non soporta a conexión utilizando un enderezo de correo electrónico.", "Incorrect username and/or password.": "Nome de usuaria ou contrasinal non válidos.", "Please note you are logging into the %(hs)s server, not matrix.org.": "Teña en conta que se está a conectar ao servidor %(hs)s, non a matrix.org.", - "Guest access is disabled on this Home Server.": "O acceso de convidados está deshabilitado en este servidor de inicio.", + "Guest access is disabled on this Home Server.": "O acceso de convidados está desactivado neste servidor de inicio.", "The phone number entered looks invalid": "O número de teléfono introducido non semella ser válido", "This homeserver doesn't offer any login flows which are supported by this client.": "Este servidor non ofrece ningún sistema de conexión que soporte este cliente.", "Error: Problem communicating with the given homeserver.": "Fallo: problema ao comunicarse con servidor proporcionado.", "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Non se pode conectar ao servidor vía HTTP cando na barra de enderezos do navegador está HTTPS. Utilice HTTPS ou active scripts non seguros.", - "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Non se conectou ao servidor - por favor comprobe a conexión, asegúrese de o certificado SSL do servidor é de confianza, e que ningún engadido do navegador está bloqueando as peticións.", + "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Non se conectou ao servidor - por favor comprobe a conexión, asegúrese de que ocertificado SSL do servidor sexa de confianza, e que ningún engadido do navegador estea bloqueando as peticións.", "Sign in to get started": "Conéctese para iniciar", "Failed to fetch avatar URL": "Fallo ao obter o URL do avatar", "Set a display name:": "Establecer nome público:", @@ -887,7 +887,7 @@ "Missing password.": "Falta contrasinal.", "Passwords don't match.": "Non coinciden os contrasinais.", "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Contrasinal demasiado curto (min %(MIN_PASSWORD_LENGTH)s).", - "This doesn't look like a valid email address.": "Non semella ser un enderezo de correo-e válido.", + "This doesn't look like a valid email address.": "Non semella ser un enderezo de correo electrónico válido.", "This doesn't look like a valid phone number.": "Non semella ser un número de teléfono válido.", "You need to enter a user name.": "É preciso que introduza un nome de usuaria.", "An unknown error occurred.": "Aconteceu un erro descoñecido.", @@ -910,8 +910,8 @@ "Results from DuckDuckGo": "Resultados desde DuckDuckGo", "Emoji": "Emoji", "Notify the whole room": "Notificar a toda a sala", - "Room Notification": "Notificación da Sala", - "Users": "Usuarias", + "Room Notification": "Notificación da sala", + "Users": "Usuarios", "unknown device": "dispositivo descoñecido", "NOT verified": "Non validado", "verified": "validado", @@ -931,28 +931,28 @@ "Passphrases must match": "As frases de paso deben coincidir", "Passphrase must not be empty": "A frase de paso non pode quedar baldeira", "Export room keys": "Exportar chaves da sala", - "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Este proceso permítelle exportar a un ficheiro local as chaves para as mensaxes que recibeu en salas cifradas. Posteriormente permitiralle importar as chaves en outro cliente Matrix no futuro, así o cliente poderá descifrar esas mensaxes.", - "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "O ficheiro exportado permitiralle a calquera que poida lelo descifrar e cifrar mensaxes que vostede ve, así que debería ter coidado e gardalo de xeito seguro. Para axudarlle, debe introducir unha frase de paso aquí abaixo que será utilizada para cifrar os datos exportados. Só será posible importar os datos utilizando a misma frase de paso.", + "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Este proceso permítelle exportar a un ficheiro local as chaves para as mensaxes que recibiu en salas cifradas. Posteriormente permitiralle importar as chaves en outro cliente Matrix no futuro, así o cliente poderá descifrar esas mensaxes.", + "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "O ficheiro exportado permitiralle a calquera que poida lelo descifrar e cifrar mensaxes que vostede ve, así que debería ter coidado e gardalo de xeito seguro. Para axudarlle, debe introducir unha frase de paso aquí abaixo que será utilizada para cifrar os datos exportados. Só será posible importar os datos utilizando a mesma frase de paso.", "Enter passphrase": "Introduza a frase de paso", "Confirm passphrase": "Confirme a frase de paso", "Export": "Exportar", "Import room keys": "Importar chaves de sala", - "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Este proceso permítelle importar chaves de cifrado que vostede exportou de outro cliente Matrix. Así poderá descifrar calquer mensaxe que o outro cliente puidese cifrar.", + "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Este proceso permítelle importar chaves de cifrado que vostede exportou de outro cliente Matrix. Así poderá descifrar calquera mensaxe que o outro cliente puidese cifrar.", "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "O ficheiro exportado estará protexido con unha frase de paso. Debe introducir aquí esa frase de paso para descifrar o ficheiro.", "File to import": "Ficheiro a importar", "Import": "Importar", "The information being sent to us to help make Riot.im better includes:": "A información enviada a Riot.im para axudarnos a mellorar inclúe:", - "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Si esta páxina inclúe información identificable como ID de grupo, usuario ou sala, estes datos son eliminados antes de ser enviados ao servidor.", + "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Se esta páxina inclúe información identificable como ID de grupo, usuario ou sala, estes datos son eliminados antes de ser enviados ao servidor.", "The platform you're on": "A plataforma na que está", "The version of Riot.im": "A versión de Riot.im", - "Whether or not you're logged in (we don't record your user name)": "Si está ou non conectada (non gardamos o nome de usuaria)", + "Whether or not you're logged in (we don't record your user name)": "Se está ou non conectado/a (non gardamos os nomes de usuarios)", "Your language of choice": "A súa preferencia de idioma", - "Which officially provided instance you are using, if any": "Qué instancia oficial está a utilizar, si algunha", - "Whether or not you're using the Richtext mode of the Rich Text Editor": "Si utiliza o modo Richtext ou non do Editor Rich Text", + "Which officially provided instance you are using, if any": "Se a houbese, que instancia oficial está a utilizar", + "Whether or not you're using the Richtext mode of the Rich Text Editor": "Se utiliza o modo Richtext ou non do editor de texto enriquecido", "Your homeserver's URL": "O URL do seu servidor de inicio", "Your identity server's URL": "O URL da súa identidade no servidor", "In reply to ": "En resposta a ", - "This room is not public. You will not be able to rejoin without an invite.": "Esta sala non é pública. Non poderá voltar a ela sin un convite.", + "This room is not public. You will not be able to rejoin without an invite.": "Esta sala non é pública. Non poderá volver a ela sen un convite.", "This room is not showing flair for any communities": "Esta sala non mostra popularidade para as comunidades", "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s cambiou o seu nome mostrado a %(displayName)s.", "Clear filter": "Quitar filtro", @@ -960,57 +960,57 @@ "Failed to remove tag %(tagName)s from room": "Fallo ao eliminar a etiqueta %(tagName)s da sala", "Failed to add tag %(tagName)s to room": "Fallo ao engadir a etiqueta %(tagName)s a sala", "Failed to lookup current room": "Fallo ao bloquear a sala actual", - "Disable Community Filter Panel": "Deshabilitar o panel de filtro de comunidades", + "Disable Community Filter Panel": "Desactivar o panel de filtro de comunidades", "Your key share request has been sent - please check your other devices for key share requests.": "Enviouse a solicitude de compartir chave - por favor comprobe as peticións de compartir chaves nos seus outros dispositivos.", - "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "As peticións de compartir chaves envíanse de xeito automático aos seus outros dispositivos. Si rexeita o obvia estas peticións nos outros dispositivos, pulse aquí para solicitar novamente as chaves para esta sesión.", - "If your other devices do not have the key for this message you will not be able to decrypt them.": "Si os seus outros dispositivos non teñen as chaves para est mensaxe non poderán descifrala.", + "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "As peticións de compartir chaves envíanse de xeito automático aos seus outros dispositivos. Se rexeita o obvia estas peticións nos outros dispositivos, pulse aquí para solicitar novamente as chaves para esta sesión.", + "If your other devices do not have the key for this message you will not be able to decrypt them.": "Se os seus outros dispositivos non teñen as chaves para este mensaxe non poderán descifrala.", "Key request sent.": "Petición de chave enviada.", - "Re-request encryption keys from your other devices.": "Voltar a pedir chaves de cifrado desde os outros dispositivos.", + "Re-request encryption keys from your other devices.": "Volver a pedir chaves de cifrado desde os outros dispositivos.", "%(user)s is a %(userRole)s": "%(user)s é %(userRole)s", "Flair": "Aura", "Showing flair for these communities:": "Mostrar o aura para estas comunidades:", - "Flair will appear if enabled in room settings": "O Aura aparecerá si está habilitada nas preferencias da sala", + "Flair will appear if enabled in room settings": "O Aura aparecerá si está activado nas preferencias da sala", "Flair will not appear": "O Aura non aparecerá", "Display your community flair in rooms configured to show it.": "Mostrar o aura da súa comunidade en salas configuradas para mostralo.", "Did you know: you can use communities to filter your Riot.im experience!": "Sabía que pode utilizar as comunidades para mellorar a súa experiencia con Riot.im!", - "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Para establecer un filtro, arrastre un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Pode pulsar nun avatar no panel de filtrado en calquer moemento para ver só salas e xente asociada a esa comunidade.", + "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Para establecer un filtro, arrastre un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Pode pulsar nun avatar no panel de filtrado en calquera momento para ver só salas e xente asociada a esa comunidade.", "Deops user with given id": "Degradar usuaria co id dado", "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Visto por %(displayName)s(%(userName)s en %(dateTime)s", "Code": "Código", "Unable to join community": "Non se puido unir a comunidade", "Unable to leave community": "Non se puido deixar a comunidade", - "Changes made to your community name and avatar might not be seen by other users for up to 30 minutes.": "Os cambios realizados a súa comunidade name e avatarname and avatar might not be seen by other users for up to 30 minutes.": "Os cambios realizados a súa comunidade name e avatar poida que non os vexan outros usuarios ate dentro de 30 minutos.", "Join this community": "Únase a esta comunidade", "Leave this community": "Deixar esta comunidade", "Debug Logs Submission": "Envío de rexistro de depuración", - "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Si enviou un reporte de fallo a través de GitHub, os informes poden axudarnos a examinar o problema. Os informes de fallo conteñen datos do uso do aplicativo incluíndo o seu nome de usuaria, os IDs ou alcumes das salas e grupos que visitou e os nomes de usuaria de outras personas. Non conteñen mensaxes.", + "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Si enviou un reporte de fallo a través de GitHub, os informes poden axudarnos a examinar o problema. Os informes de fallo conteñen datos do uso do aplicativo incluíndo o seu nome de usuaria, os IDs ou alcumes das salas e grupos que visitou e os nomes de usuaria de outras persoas. Non conteñen mensaxes.", "Submit debug logs": "Enviar informes de depuración", - "Opens the Developer Tools dialog": "Abre o cadro de Ferramentas de Desenvolvedoras", - "Stickerpack": "Peganitas", - "You don't currently have any stickerpacks enabled": "Non ten paquetes de pegatinas habilitados", - "Add a stickerpack": "Engadir un paquete de pegatinas", - "Hide Stickers": "Agochar pegatinas", - "Show Stickers": "Mostrar pegatinas", - "Who can join this community?": "Quén pode unirse a esta comunidade?", + "Opens the Developer Tools dialog": "Abre o cadro de Ferramentas de desenvolvemento", + "Stickerpack": "Iconas", + "You don't currently have any stickerpacks enabled": "Non ten paquetes de iconas activados", + "Add a stickerpack": "Engadir un paquete de iconas", + "Hide Stickers": "Agochar iconas", + "Show Stickers": "Mostrar iconas", + "Who can join this community?": "Quen pode unirse a esta comunidade?", "Everyone": "Todo o mundo", "Fetching third party location failed": "Fallo ao obter a localización de terceiros", "A new version of Riot is available.": "Está dispoñible unha nova versión de Riot.", "Couldn't load home page": "Non se cargou a páxina de inicio", "Send Account Data": "Enviar datos da conta", - "All notifications are currently disabled for all targets.": "Todas as notificacións están deshabilitadas para todos os destinos.", + "All notifications are currently disabled for all targets.": "Todas as notificacións están desactivadas para todos os destinos.", "Uploading report": "Informe da subida", "Sunday": "Domingo", - "Notification targets": "Obxetivos das notificacións", + "Notification targets": "Obxectivos das notificacións", "Today": "Hoxe", "Failed to get protocol list from Home Server": "Fallo ao obter a lista de protocolo desde o servidor", "You are not receiving desktop notifications": "Non está a recibir notificacións de escritorio", "Friday": "Venres", "Update": "Actualizar", - "What's New": "Qué hai de novo", + "What's New": "Que hai de novo", "Add an email address above to configure email notifications": "Engada un enderezo de correo electrónico para configurar as notificacións", "Expand panel": "Expandir panel", "On": "On", - "%(count)s Members|other": "%(count)s Membros", + "%(count)s Members|other": "%(count)s participantes", "Filter room names": "Filtrar nomes de sala", "Changelog": "Rexistro de cambios", "Waiting for response from server": "Agardando pola resposta do servidor", @@ -1018,14 +1018,14 @@ "Advanced notification settings": "Axustes avanzados de notificación", "Failed to send logs: ": "Fallo ao enviar os informes: ", "delete the alias.": "borrar alcume.", - "To return to your account in future you need to set a password": "Para voltar a súa conta no futuro debe establecer un contrasinal>/u>", + "To return to your account in future you need to set a password": "Para volver a súa conta no futuro debe establecer un contrasinal>/u>", "Forget": "Esquecer", "#example": "#exemplo", "Hide panel": "Agochar panel", "You cannot delete this image. (%(code)s)": "Non pode eliminar esta imaxe. (%(code)s)", "Cancel Sending": "Cancelar o envío", "This Room": "Esta sala", - "The Home Server may be too old to support third party networks": "O servidor de inicio podería ser demasiando antigo como para aceptar redes de terceiros", + "The Home Server may be too old to support third party networks": "O servidor de inicio podería ser demasiado antigo como para aceptar redes de terceiros", "Noisy": "Ruidoso", "Error saving email notification preferences": "Fallo ao cargar os axustes de notificacións", "Messages containing my display name": "Mensaxes que conteñen o meu nome público", @@ -1035,25 +1035,25 @@ "Failed to update keywords": "Fallo ao actualizar as palabras chave", "Notes:": "Notas:", "remove %(name)s from the directory.": "eliminar %(name)s do directorio.", - "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificacións das reglas de seguimento das seguintes palabras que non se mostrarán aquí:", + "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificacións das regras de seguimento das seguintes palabras que non se mostrarán aquí:", "Safari and Opera work too.": "Safari e Opera tamén funcionan.", "Please set a password!": "Por favor estableza un contrasinal!", "You have successfully set a password!": "Mudou con éxito o seu contrasinal!", - "An error occurred whilst saving your email notification preferences.": "Algo fallou mentras se gardaban as súas preferencias de notificaicón.", + "An error occurred whilst saving your email notification preferences.": "Algo fallou mentres se gardaban as súas preferencias de notificación.", "Explore Room State": "Explorar estado da sala", "Search for a room": "Buscar unha sala", "Source URL": "URL fonte", "Messages sent by bot": "Mensaxes enviadas por bot", "Filter results": "Filtrar resultados", - "Members": "Membresía", + "Members": "Participantes", "No update available.": "Sen actualizacións.", - "Resend": "Voltar a enviar", + "Resend": "Volver a enviar", "Files": "Ficheiros", "Collecting app version information": "Obtendo información sobre a versión da app", "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Eliminar o alcume da sala %(alias)s e borrar %(name)s do directorio?", - "This will allow you to return to your account after signing out, and sign in on other devices.": "Esto permitiralle voltar a súa conta tras desconectarse, e conectarse en outros dispositivos.", + "This will allow you to return to your account after signing out, and sign in on other devices.": "Isto permitiralle volver a súa conta tras desconectarse, e conectarse en outros dispositivos.", "Keywords": "Palabras chave", - "Enable notifications for this account": "Habilitar notificacións para esta conta", + "Enable notifications for this account": "Activar notificacións para esta conta", "Directory": "Directorio", "Invite to this community": "Convidar a esta comunidade", "Failed to get public room list": "Fallo ao obter a lista de salas públicas", @@ -1063,22 +1063,22 @@ "Enter keywords separated by a comma:": "Introduza palabras chave separadas por vírgulas:", "Search…": "Buscar…", "Remove %(name)s from the directory?": "Eliminar %(name)s do directorio?", - "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot utiliza características avanzadas do navegador, algunhas das cales non están dispoñibles ou son experimentales no seu navegador actual.", + "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot utiliza características avanzadas do navegador, algunhas das cales non están dispoñibles ou son experimentais no seu navegador actual.", "Developer Tools": "Ferramentas para desenvolver", "Preparing to send logs": "Preparándose para enviar informe", - "Enable desktop notifications": "Habilitar notificacións de escritorio", - "Remember, you can always set an email address in user settings if you change your mind.": "Lembre, sempre poderá poñer un enderezo de correo nos axustes de usuario si cambia de idea.", + "Enable desktop notifications": "Activar as notificacións de escritorio", + "Remember, you can always set an email address in user settings if you change your mind.": "Lembre que sempre poderá poñer un enderezo de correo nos axustes de usuario se cambiase de idea.", "Explore Account Data": "Explorar datos da conta", "All messages (noisy)": "Todas as mensaxes (alto)", "Saturday": "Sábado", - "I understand the risks and wish to continue": "Entendos os riscos e desexo continuar", + "I understand the risks and wish to continue": "Entendo os riscos e desexo continuar", "Direct Chat": "Chat directo", "The server may be unavailable or overloaded": "O servidor podería non estar dispoñible ou sobrecargado", "Reject": "Rexeitar", "Failed to set Direct Message status of room": "Fallo ao establecer o estado Mensaxe Directa da sala", "Monday": "Luns", "Remove from Directory": "Eliminar do directorio", - "Enable them now": "Habilitalas agora", + "Enable them now": "Activalos agora", "Messages containing my user name": "Mensaxes que conteñen o meu nome de usuaria", "Toolbox": "Ferramentas", "Collecting logs": "Obtendo rexistros", @@ -1097,10 +1097,10 @@ "Downloading update...": "Descargando actualización...", "You have successfully set a password and an email address!": "Estableceu correctamente un contrasinal e enderezo de correo!", "Failed to send custom event.": "Fallo ao enviar evento personalizado.", - "What's new?": "Qué hai de novo?", - "Notify me for anything else": "Notificarme todo o demáis", + "What's new?": "Que hai de novo?", + "Notify me for anything else": "Notificarme todo o demais", "When I'm invited to a room": "Cando son convidado a unha sala", - "Can't update user notification settings": "Non se poden actualizar os axutes de notificación", + "Can't update user notification settings": "Non se poden actualizar os axustes de notificación", "Notify for all other messages/rooms": "Notificar para todas as outras mensaxes/salas", "Unable to look up room ID from server": "Non se puido atopar o ID da sala do servidor", "Couldn't find a matching Matrix room": "Non coincide con ningunha sala de Matrix", @@ -1112,8 +1112,8 @@ "Back": "Atrás", "Reply": "Resposta", "Show message in desktop notification": "Mostrar mensaxe nas notificacións de escritorio", - "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Os informes de depuración conteñen datos de utilización do aplicativo como o seu nome de usuaria, os IDs ou alcumes de salas e grupos que vostede visitou e os nomes de usuaria de outras usuarias. Non conteñen mensaxes.", - "Unhide Preview": "Desagochar a vista previsa", + "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Os informes de depuración conteñen datos de utilización do aplicativo como o seu nome de usuario, os IDs ou alcumes de salas e grupos que vostede visitou e os nomes de usuarios doutras usuarias. Non conteñen mensaxes.", + "Unhide Preview": "Desagochar a vista previa", "Unable to join network": "Non se puido conectar a rede", "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Pode que os configurase nun cliente diferente de Riot. Non pode establecelos desde Riot pero aínda así aplicaranse", "Sorry, your browser is not able to run Riot.": "Desculpe, o seu navegador non pode executar Riot.", @@ -1123,40 +1123,40 @@ "Error encountered (%(errorDetail)s).": "Houbo un erro (%(errorDetail)s).", "Login": "Conectar", "Low Priority": "Baixa prioridade", - "Unable to fetch notification target list": "Non se puido procesar a lista de obxetivo de notificacións", + "Unable to fetch notification target list": "Non se puido procesar a lista de obxectivo de notificacións", "Set Password": "Establecer contrasinal", - "Enable audible notifications in web client": "Habilitar notificacións audibles no cliente web", + "Enable audible notifications in web client": "Activar as notificacións audibles no cliente web", "Off": "Off", - "Riot does not know how to join a room on this network": "Riot non sabe cómo conectar con unha sala en esta rede", + "Riot does not know how to join a room on this network": "Riot non sabe como conectar cunha sala nesta rede", "Mentions only": "Só mencións", - "You can now return to your account after signing out, and sign in on other devices.": "Pode voltar a súa contra tras desconectarse, e conectarse en outros dispositivos.", - "Enable email notifications": "Habilitar notificacións de correo", + "You can now return to your account after signing out, and sign in on other devices.": "Pode volver a súa contra tras desconectarse, e conectarse en outros dispositivos.", + "Enable email notifications": "Activar notificacións de correo", "Event Type": "Tipo de evento", "Download this file": "Descargue este ficheiro", "Pin Message": "Fixar mensaxe", "Failed to change settings": "Fallo ao cambiar os axustes", "View Community": "Ver Comunidade", - "%(count)s Members|one": "%(count)s Membro", + "%(count)s Members|one": "%(count)s participante", "Event sent!": "Evento enviado!", "View Source": "Ver fonte", "Event Content": "Contido do evento", "Thank you!": "Grazas!", "Collapse panel": "Agochar panel", - "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!": "Co seu navegador actual a apareciencia e uso do aplicativo poderían estar totalmente falseadas, e algunhas características poderían non funcionar. Se quere pode continuar, pero debe ser consciente de que poden haber fallos!", + "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!": "Co seu navegador actual a aparencia e uso do aplicativo poderían estar totalmente falseadas, e algunhas características poderían non funcionar. Se quere pode continuar, pero debe ser consciente de que poden haber fallos!", "Checking for an update...": "Comprobando as actualizacións...", "There are advanced notifications which are not shown here": "Existen notificacións avanzadas que non se mostran aquí", - "Every page you use in the app": "Cada páxina que vostede utiliza no aplicativo", - "e.g. ": "ex. ", - "Your User Agent": "User Agent", + "Every page you use in the app": "Cada páxina que use na aplicación", + "e.g. ": "p.ex. ", + "Your User Agent": "Axente de usuario", "Your device resolution": "Resolución do dispositivo", - "Missing roomId.": "Falta o id da sala.", + "Missing roomId.": "Falta o ID da sala.", "Always show encryption icons": "Mostra sempre iconas de cifrado", - "At this time it is not possible to reply with a file so this will be sent without being a reply.": "En este intre non é posible respostar con un ficheiro así que este será enviado sin ser considerado resposta.", - "Unable to reply": "Non puido respostar", - "At this time it is not possible to reply with an emote.": "En este intre non é posible respostar con un emote.", - "Popout widget": "Widget emerxente", + "At this time it is not possible to reply with a file so this will be sent without being a reply.": "Neste intre non é posible responder con un ficheiro así que este será enviado sen ser considerado resposta.", + "Unable to reply": "Non puido responder", + "At this time it is not possible to reply with an emote.": "Neste intre non é posible responder con un emote.", + "Popout widget": "trebello emerxente", "Picture": "Imaxe", - "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Non se cargou o evento ao que respostaba, ou non existe ou non ten permiso para velo.", + "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Non se cargou o evento ao que respondía, ou non existe ou non ten permiso para velo.", "Riot bugs are tracked on GitHub: create a GitHub issue.": "Os fallos de Riot séguense en GitHub: crear un informe en GitHub.", "Log out and remove encryption keys?": "Desconectar e eliminar as chaves de cifrado?", "Send Logs": "Enviar informes", @@ -1165,9 +1165,9 @@ "We encountered an error trying to restore your previous session.": "Atopamos un fallo intentando restablecer a súa sesión anterior.", "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Limpando o almacenamento do navegador podería resolver o problema, pero desconectarao e non poderá ler o historial cifrado da conversa.", "Collapse Reply Thread": "Comprimir o fío de respostas", - "e.g. %(exampleValue)s": "p.ex.%(exampleValue)s", + "e.g. %(exampleValue)s": "p.ex. %(exampleValue)s", "Send analytics data": "Enviar datos de análises", - "Enable widget screenshots on supported widgets": "Activar as capturas de widgets para aqueles que as permiten", + "Enable widget screenshots on supported widgets": "Activar as capturas de trebellos para aqueles que as permiten", "Encrypting": "Cifrando", "Encrypted, not sent": "Cifrado, sen enviar", "Share Link to User": "Compartir a ligazón co usuario", @@ -1177,11 +1177,29 @@ "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Mellore Riot.im enviando os datos anónimos de uso. Iso suporá o emprego dunha cookie (véxase a nosa Política de Cookies).", "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Mellore Riot.im enviando o uso de datos anónimo. Iso usará unha cookie.", "Yes, I want to help!": "Si, quero axuda", - "Warning: This widget might use cookies.": "Aviso: este widget podería usar algunha cookie.", - "Reload widget": "Volver a cargar o widget", + "Warning: This widget might use cookies.": "Aviso: este trebello podería usar algunha cookie.", + "Reload widget": "Volver a cargar o trebello", "Failed to indicate account erasure": "Non se deu indicado a eliminación de conta", "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Iso fará que a súa deixe de ter uso de xeito permanente. Non poderá acceder e ninguén vai a poder volver a rexistrar esa mesma ID de usuario. Suporá que saía de todas as salas de conversas nas que estaba e eliminará os detalles da súa conta do servidores de identificación.Isto non se poderá desfacer", "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Desactivando a súa conta non supón que por defecto esquezamos as súas mensaxes enviadas. Se quere que nos esquezamos das súas mensaxes, prema na caixa de embaixo.", "To continue, please enter your password:": "Para continuar introduza o seu contrasinal:", - "password": "contrasinal" + "password": "contrasinal", + "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "A visibilidade das mensaxes en Matrix é parecida ás dos correos electrónicos. Que esquezamos as súas mensaxes significa que as súas mensaxes non se van a compartir con ningún novo membro ou usuario que non estea rexistrado. Mais aqueles usuarios que xa tiveron acceso a estas mensaxes si que seguirán tendo acceso as súas propias copias desas mensaxes.", + "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Esquezan todas as mensaxes que eu enviara no momento en que elimine a miña conta. (Aviso: iso suporá que os seguintes participantes só verán unha versión incompleta das conversas.)", + "Share Room": "Compartir sala", + "Link to most recent message": "Ligazón ás mensaxes máis recentes", + "Share User": "Compartir usuario", + "Share Community": "Compartir comunidade", + "Share Room Message": "Compartir unha mensaxe da sala", + "Link to selected message": "Ligazón á mensaxe escollida", + "COPY": "Copiar", + "Share Message": "Compartir mensaxe", + "Can't leave Server Notices room": "Non se pode saír da sala de información do servidor", + "This room is used for important messages from the Homeserver, so you cannot leave it.": "Esta sala emprégase para mensaxes importantes do servidor da sala, as que non pode saír dela.", + "Terms and Conditions": "Termos e condicións", + "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Para continuar usando o servidor %(homeserverDomain)s ten que revisar primeiro os seus termos e condicións e logo aceptalos.", + "Review terms and conditions": "Revise os termos e condicións", + "No Audio Outputs detected": "Non se detectou unha saída de audio", + "Audio Output": "Saída de audio", + "Try the app first": "Probe a aplicación primeiro" } From a8520335ef8d79b6e60c4f149765dcd70d5dd818 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 18 Jun 2018 17:37:55 +0100 Subject: [PATCH 161/283] once command has a space, strict match instead of fuzzy match Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/autocomplete/CommandProvider.js | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js index b162f2f92a..38ad5efeb9 100644 --- a/src/autocomplete/CommandProvider.js +++ b/src/autocomplete/CommandProvider.js @@ -128,8 +128,26 @@ export default class CommandProvider extends AutocompleteProvider { const {command, range} = this.getCurrentCommand(query, selection); if (!command) return []; - // if the query is just `/` (and the user hit TAB or waits), show them all COMMANDS otherwise FuzzyMatch them - const matches = query === '/' ? COMMANDS : this.matcher.match(command[1]); + let matches; + if (command[0] !== command[1]) { + // The input looks like a command with arguments, perform exact match + const match = COMMANDS.find((o) => o.command === command[1]); + if (match) { + matches = [match]; + } + } + + // If we don't yet have matches + if (!matches) { + if (query === '/') { + // If they have just entered `/` show everything + matches = COMMANDS; + } else { + // otherwise fuzzy match against all of the fields + matches = this.matcher.match(command[1]); + } + } + return matches.map((result) => { return { // If the command is the same as the one they entered, we don't want to discard their arguments From bea52eccf836ce8e31413e66dcb18bece316122f Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Mon, 18 Jun 2018 17:40:48 +0100 Subject: [PATCH 162/283] Remove unused import, constant --- src/components/views/rooms/MessageComposerInput.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js index 97e8780f0f..57d433e55c 100644 --- a/src/components/views/rooms/MessageComposerInput.js +++ b/src/components/views/rooms/MessageComposerInput.js @@ -45,8 +45,7 @@ import Markdown from '../../../Markdown'; import ComposerHistoryManager from '../../../ComposerHistoryManager'; import MessageComposerStore from '../../../stores/MessageComposerStore'; -import {MATRIXTO_URL_PATTERN, MATRIXTO_MD_LINK_PATTERN} from '../../../linkify-matrix'; -const REGEX_MATRIXTO = new RegExp(MATRIXTO_URL_PATTERN); +import {MATRIXTO_MD_LINK_PATTERN} from '../../../linkify-matrix'; const REGEX_MATRIXTO_MARKDOWN_GLOBAL = new RegExp(MATRIXTO_MD_LINK_PATTERN, 'g'); import {asciiRegexp, shortnameToUnicode, emojioneList, asciiList, mapUnicodeToShort} from 'emojione'; From d6f0f775611209d5c06a6558e8e0f70a9c624424 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Mon, 18 Jun 2018 17:45:47 +0100 Subject: [PATCH 163/283] Fix MATRIXTO_URL_PATTERN RegExp groups Fixes https://github.com/vector-im/riot-web/issues/6900 Fixes https://github.com/vector-im/riot-web/issues/6899 --- src/linkify-matrix.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js index 328cb98888..d72319948a 100644 --- a/src/linkify-matrix.js +++ b/src/linkify-matrix.js @@ -169,7 +169,7 @@ matrixLinkify.VECTOR_URL_PATTERN = "^(?:https?:\/\/)?(?:" + "(?:www\\.)?(?:riot|vector)\\.im/(?:app|beta|staging|develop)/" + ")(#.*)"; -matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/([#@!+].*)"; +matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/(([#@!+]).*)"; matrixLinkify.MATRIXTO_MD_LINK_PATTERN = '\\[([^\\]]*)\\]\\((?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/([#@!+][^\\)]*)\\)'; matrixLinkify.MATRIXTO_BASE_URL= baseUrl; From 0383937e0dfb3185cfe5dd1e480a9b36ca48e937 Mon Sep 17 00:00:00 2001 From: Miguel Branco Date: Mon, 18 Jun 2018 15:32:05 +0000 Subject: [PATCH 164/283] Translated using Weblate (Galician) Currently translated at 100.0% (1203 of 1203 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/ --- src/i18n/strings/gl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index 41f98676b6..572da43dcf 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -52,7 +52,7 @@ "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s", "Who would you like to add to this community?": "A quen quere engadir a esta comunidade?", "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Aviso: calquera persoa que engada a unha comunidade estará publicamente visible para calquera que coñeza a ID da comunidade", - "Invite new community members": "Convidará comunidade a novos participantes ", + "Invite new community members": "Convidará comunidade a novos participantes", "Name or matrix ID": "Nome ou ID matrix", "Invite to Community": "Convidar á comunidade", "Which rooms would you like to add to this community?": "Que salas desexaría engadir a esta comunidade?", From 015d4332351bc543e7f08676425968c48b96c26f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 18 Jun 2018 18:14:48 +0100 Subject: [PATCH 165/283] fix a way to get stuck in set password/email flow Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/UserSettings.js | 1 - .../views/dialogs/SetPasswordDialog.js | 7 ++----- src/components/views/globals/PasswordNagBar.js | 16 ++-------------- src/components/views/settings/ChangePassword.js | 7 +++++-- 4 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js index 2622d7bd89..6397e73434 100644 --- a/src/components/structures/UserSettings.js +++ b/src/components/structures/UserSettings.js @@ -429,7 +429,6 @@ module.exports = React.createClass({ "push notifications on other devices until you log back in to them", ) + ".", }); - dis.dispatch({action: 'password_changed'}); }, _onAddEmailEditFinished: function(value, shouldSubmit) { diff --git a/src/components/views/dialogs/SetPasswordDialog.js b/src/components/views/dialogs/SetPasswordDialog.js index 31c4ad7a3f..42c35ad187 100644 --- a/src/components/views/dialogs/SetPasswordDialog.js +++ b/src/components/views/dialogs/SetPasswordDialog.js @@ -1,5 +1,6 @@ /* Copyright 2017 Vector Creations Ltd +Copyright 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -79,15 +80,11 @@ export default React.createClass({ Modal.createDialog(WarmFuzzy, { didSetEmail: res.didSetEmail, onFinished: () => { - this._onContinueClicked(); + this.props.onFinished(); }, }); }, - _onContinueClicked: function() { - this.props.onFinished(true); - }, - _onPasswordChangeError: function(err) { let errMsg = err.error || ""; if (err.httpStatus === 403) { diff --git a/src/components/views/globals/PasswordNagBar.js b/src/components/views/globals/PasswordNagBar.js index 93f4fe06e5..4233363b95 100644 --- a/src/components/views/globals/PasswordNagBar.js +++ b/src/components/views/globals/PasswordNagBar.js @@ -1,5 +1,6 @@ /* Copyright 2017 Vector Creations Ltd +Copyright 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,28 +15,15 @@ See the License for the specific language governing permissions and limitations under the License. */ -'use strict'; - import React from 'react'; import sdk from '../../../index'; import Modal from '../../../Modal'; -import dis from '../../../dispatcher'; import { _t } from '../../../languageHandler'; export default React.createClass({ onUpdateClicked: function() { const SetPasswordDialog = sdk.getComponent('dialogs.SetPasswordDialog'); - Modal.createTrackedDialog('Set Password Dialog', 'Password Nag Bar', SetPasswordDialog, { - onFinished: (passwordChanged) => { - if (!passwordChanged) { - return; - } - // Notify SessionStore that the user's password was changed - dis.dispatch({ - action: 'password_changed', - }); - }, - }); + Modal.createTrackedDialog('Set Password Dialog', 'Password Nag Bar', SetPasswordDialog); }, render: function() { diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js index 9cac25e6cc..b2ffe531b5 100644 --- a/src/components/views/settings/ChangePassword.js +++ b/src/components/views/settings/ChangePassword.js @@ -1,5 +1,6 @@ /* Copyright 2015, 2016 OpenMarket Ltd +Copyright 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,14 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -'use strict'; - const React = require('react'); import PropTypes from 'prop-types'; const MatrixClientPeg = require("../../../MatrixClientPeg"); const Modal = require("../../../Modal"); const sdk = require("../../../index"); +import dis from "../../../dispatcher"; import Promise from 'bluebird'; import AccessibleButton from '../elements/AccessibleButton'; import { _t } from '../../../languageHandler'; @@ -143,6 +143,9 @@ module.exports = React.createClass({ }); cli.setPassword(authDict, newPassword).then(() => { + // Notify SessionStore that the user's password was changed + dis.dispatch({action: 'password_changed'}); + if (this.props.shouldAskForEmail) { return this._optionallySetEmail().then((confirmed) => { this.props.onFinished({ From 3449a60d3272a736b809d45f318ecb6d0f49cbdb Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 18 Jun 2018 18:17:10 +0100 Subject: [PATCH 166/283] fix onBlur breaking the SetEmail field (setting it back empty :() Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/SetEmailDialog.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/views/dialogs/SetEmailDialog.js b/src/components/views/dialogs/SetEmailDialog.js index d80574804f..e643ddbc34 100644 --- a/src/components/views/dialogs/SetEmailDialog.js +++ b/src/components/views/dialogs/SetEmailDialog.js @@ -1,5 +1,6 @@ /* Copyright 2017 Vector Creations Ltd +Copyright 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -36,7 +37,7 @@ export default React.createClass({ getInitialState: function() { return { - emailAddress: null, + emailAddress: '', emailBusy: false, }; }, @@ -127,6 +128,7 @@ export default React.createClass({ const EditableText = sdk.getComponent('elements.EditableText'); const emailInput = this.state.emailBusy ? : Date: Mon, 18 Jun 2018 18:21:16 +0100 Subject: [PATCH 167/283] delint EditableText Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/elements/EditableText.js | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/src/components/views/elements/EditableText.js b/src/components/views/elements/EditableText.js index ce1817c272..1f49bcddae 100644 --- a/src/components/views/elements/EditableText.js +++ b/src/components/views/elements/EditableText.js @@ -1,5 +1,6 @@ /* Copyright 2015, 2016 OpenMarket Ltd +Copyright 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,15 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. */ -'use strict'; - -const React = require('react'); +import React from 'react'; import PropTypes from 'prop-types'; -const KEY_TAB = 9; -const KEY_SHIFT = 16; -const KEY_WINDOWS = 91; - module.exports = React.createClass({ displayName: 'EditableText', @@ -66,9 +61,7 @@ module.exports = React.createClass({ }, componentWillReceiveProps: function(nextProps) { - if (nextProps.initialValue !== this.props.initialValue || - nextProps.initialValue !== this.value - ) { + if (nextProps.initialValue !== this.props.initialValue || nextProps.initialValue !== this.value) { this.value = nextProps.initialValue; if (this.refs.editable_div) { this.showPlaceholder(!this.value); @@ -139,7 +132,7 @@ module.exports = React.createClass({ this.showPlaceholder(false); } - if (ev.key == "Enter") { + if (ev.key === "Enter") { ev.stopPropagation(); ev.preventDefault(); } @@ -156,9 +149,9 @@ module.exports = React.createClass({ this.value = ev.target.textContent; } - if (ev.key == "Enter") { + if (ev.key === "Enter") { this.onFinish(ev); - } else if (ev.key == "Escape") { + } else if (ev.key === "Escape") { this.cancelEdit(); } @@ -193,7 +186,7 @@ module.exports = React.createClass({ const submit = (ev.key === "Enter") || shouldSubmit; this.setState({ phase: this.Phases.Display, - }, function() { + }, () => { if (this.value !== this.props.initialValue) { self.onValueChanged(submit); } @@ -204,23 +197,35 @@ module.exports = React.createClass({ const sel = window.getSelection(); sel.removeAllRanges(); - if (this.props.blurToCancel) {this.cancelEdit();} else {this.onFinish(ev, this.props.blurToSubmit);} + if (this.props.blurToCancel) { + this.cancelEdit(); + } else { + this.onFinish(ev, this.props.blurToSubmit); + } this.showPlaceholder(!this.value); }, render: function() { - let editable_el; + const {className, editable, initialValue, label, labelClassName} = this.props; + let editableEl; - if (!this.props.editable || (this.state.phase == this.Phases.Display && (this.props.label || this.props.labelClassName) && !this.value)) { + if (!editable || (this.state.phase === this.Phases.Display && (label || labelClassName) && !this.value)) { // show the label - editable_el =
    { this.props.label || this.props.initialValue }
    ; + editableEl =
    + { label || initialValue } +
    ; } else { // show the content editable div, but manually manage its contents as react and contentEditable don't play nice together - editable_el =
    ; + editableEl =
    ; } - return editable_el; + return editableEl; }, }); From 5bf3e5b00a5ce2c0bec94c4d0b396aa6463464ba Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 18 Jun 2018 19:31:40 +0100 Subject: [PATCH 168/283] consolidate the two locations commands are defined, as it was a MESS Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/SlashCommands.js | 768 +++++++++--------- src/autocomplete/CommandProvider.js | 98 +-- .../views/rooms/MessageComposerInput.js | 4 +- 3 files changed, 413 insertions(+), 457 deletions(-) diff --git a/src/SlashCommands.js b/src/SlashCommands.js index d45e45e84c..3743fbb98c 100644 --- a/src/SlashCommands.js +++ b/src/SlashCommands.js @@ -14,28 +14,31 @@ See the License for the specific language governing permissions and limitations under the License. */ -import MatrixClientPeg from "./MatrixClientPeg"; -import dis from "./dispatcher"; -import Tinter from "./Tinter"; + +import React from 'react'; +import MatrixClientPeg from './MatrixClientPeg'; +import dis from './dispatcher'; +import Tinter from './Tinter'; import sdk from './index'; -import { _t } from './languageHandler'; +import {_t, _td} from './languageHandler'; import Modal from './Modal'; -import SettingsStore, {SettingLevel} from "./settings/SettingsStore"; +import SettingsStore, {SettingLevel} from './settings/SettingsStore'; class Command { - constructor(name, paramArgs, runFn) { - this.name = name; - this.paramArgs = paramArgs; + constructor({name, args='', description, runFn}) { + this.command = name; + this.args = args; + this.description = description; this.runFn = runFn; } getCommand() { - return "/" + this.name; + return "/" + this.command; } getCommandWithArgs() { - return this.getCommand() + " " + this.paramArgs; + return this.getCommand() + " " + this.args; } run(roomId, args) { @@ -47,16 +50,12 @@ class Command { } } -function reject(msg) { - return { - error: msg, - }; +function reject(error) { + return {error}; } function success(promise) { - return { - promise: promise, - }; + return {promise}; } /* Disable the "unexpected this" error for these commands - all of the run @@ -65,352 +64,408 @@ function success(promise) { /* eslint-disable babel/no-invalid-this */ -const commands = { - ddg: new Command("ddg", "", function(roomId, args) { - const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog'); - // TODO Don't explain this away, actually show a search UI here. - Modal.createTrackedDialog('Slash Commands', '/ddg is not a command', ErrorDialog, { - title: _t('/ddg is not a command'), - description: _t('To use it, just wait for autocomplete results to load and tab through them.'), - }); - return success(); +export const CommandMap = { + ddg: new Command({ + name: 'ddg', + args: '', + description: _td('Searches DuckDuckGo for results'), + runFn: function(roomId, args) { + const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog'); + // TODO Don't explain this away, actually show a search UI here. + Modal.createTrackedDialog('Slash Commands', '/ddg is not a command', ErrorDialog, { + title: _t('/ddg is not a command'), + description: _t('To use it, just wait for autocomplete results to load and tab through them.'), + }); + return success(); + }, }), - // Change your nickname - nick: new Command("nick", "", function(roomId, args) { - if (args) { - return success( - MatrixClientPeg.get().setDisplayName(args), - ); - } - return reject(this.getUsage()); - }), - - // Changes the colorscheme of your current room - tint: new Command("tint", " []", function(roomId, args) { - if (args) { - const matches = args.match(/^(#([0-9a-fA-F]{3}|[0-9a-fA-F]{6}))( +(#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})))?$/); - if (matches) { - Tinter.tint(matches[1], matches[4]); - const colorScheme = {}; - colorScheme.primary_color = matches[1]; - if (matches[4]) { - colorScheme.secondary_color = matches[4]; - } else { - colorScheme.secondary_color = colorScheme.primary_color; - } - return success( - SettingsStore.setValue("roomColor", roomId, SettingLevel.ROOM_ACCOUNT, colorScheme), - ); + nick: new Command({ + name: 'nick', + args: '', + description: _td('Changes your display nickname'), + runFn: function(roomId, args) { + if (args) { + return success(MatrixClientPeg.get().setDisplayName(args)); } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, }), - // Change the room topic - topic: new Command("topic", "", function(roomId, args) { - if (args) { - return success( - MatrixClientPeg.get().setRoomTopic(roomId, args), - ); - } - return reject(this.getUsage()); - }), - - // Invite a user - invite: new Command("invite", "", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+)$/); - if (matches) { - return success( - MatrixClientPeg.get().invite(roomId, matches[1]), - ); - } - } - return reject(this.getUsage()); - }), - - // Join a room - join: new Command("join", "#alias:domain", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+)$/); - if (matches) { - let roomAlias = matches[1]; - if (roomAlias[0] !== '#') { - return reject(this.getUsage()); - } - if (!roomAlias.match(/:/)) { - roomAlias += ':' + MatrixClientPeg.get().getDomain(); - } - - dis.dispatch({ - action: 'view_room', - room_alias: roomAlias, - auto_join: true, - }); - - return success(); - } - } - return reject(this.getUsage()); - }), - - part: new Command("part", "[#alias:domain]", function(roomId, args) { - let targetRoomId; - if (args) { - const matches = args.match(/^(\S+)$/); - if (matches) { - let roomAlias = matches[1]; - if (roomAlias[0] !== '#') { - return reject(this.getUsage()); - } - if (!roomAlias.match(/:/)) { - roomAlias += ':' + MatrixClientPeg.get().getDomain(); - } - - // Try to find a room with this alias - const rooms = MatrixClientPeg.get().getRooms(); - for (let i = 0; i < rooms.length; i++) { - const aliasEvents = rooms[i].currentState.getStateEvents( - "m.room.aliases", - ); - for (let j = 0; j < aliasEvents.length; j++) { - const aliases = aliasEvents[j].getContent().aliases || []; - for (let k = 0; k < aliases.length; k++) { - if (aliases[k] === roomAlias) { - targetRoomId = rooms[i].roomId; - break; - } - } - if (targetRoomId) { break; } + tint: new Command({ + name: 'tint', + args: ' []', + description: _td('Changes colour scheme of current room'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(#([\da-fA-F]{3}|[\da-fA-F]{6}))( +(#([\da-fA-F]{3}|[\da-fA-F]{6})))?$/); + if (matches) { + Tinter.tint(matches[1], matches[4]); + const colorScheme = {}; + colorScheme.primary_color = matches[1]; + if (matches[4]) { + colorScheme.secondary_color = matches[4]; + } else { + colorScheme.secondary_color = colorScheme.primary_color; } - if (targetRoomId) { break; } - } - if (!targetRoomId) { - return reject(_t("Unrecognised room alias:") + ' ' + roomAlias); + return success( + SettingsStore.setValue('roomColor', roomId, SettingLevel.ROOM_ACCOUNT, colorScheme), + ); } } - } - if (!targetRoomId) targetRoomId = roomId; - return success( - MatrixClientPeg.get().leave(targetRoomId).then( - function() { - dis.dispatch({action: 'view_next_room'}); - }, - ), - ); + return reject(this.getUsage()); + }, }), - // Kick a user from the room with an optional reason - kick: new Command("kick", " []", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+?)( +(.*))?$/); - if (matches) { - return success( - MatrixClientPeg.get().kick(roomId, matches[1], matches[3]), - ); + topic: new Command({ + name: 'topic', + args: '', + description: _td('Sets the room topic'), + runFn: function(roomId, args) { + if (args) { + return success(MatrixClientPeg.get().setRoomTopic(roomId, args)); } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, + }), + + invite: new Command({ + name: 'invite', + args: '', + description: _td('Invites user with given id to current room'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(\S+)$/); + if (matches) { + return success(MatrixClientPeg.get().invite(roomId, matches[1])); + } + } + return reject(this.getUsage()); + }, + }), + + join: new Command({ + name: 'join', + args: '', + description: _td('Joins room with given alias'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(\S+)$/); + if (matches) { + let roomAlias = matches[1]; + if (roomAlias[0] !== '#') return reject(this.getUsage()); + + if (!roomAlias.includes(':')) { + roomAlias += ':' + MatrixClientPeg.get().getDomain(); + } + + dis.dispatch({ + action: 'view_room', + room_alias: roomAlias, + auto_join: true, + }); + + return success(); + } + } + return reject(this.getUsage()); + }, + }), + + part: new Command({ + name: 'part', + args: '[]', + description: _td('Leave room'), + runFn: function(roomId, args) { + const cli = MatrixClientPeg.get(); + + let targetRoomId; + if (args) { + const matches = args.match(/^(\S+)$/); + if (matches) { + let roomAlias = matches[1]; + if (roomAlias[0] !== '#') return reject(this.getUsage()); + + if (!roomAlias.includes(':')) { + roomAlias += ':' + cli.getDomain(); + } + + // Try to find a room with this alias + const rooms = cli.getRooms(); + for (let i = 0; i < rooms.length; i++) { + const aliasEvents = rooms[i].currentState.getStateEvents('m.room.aliases'); + for (let j = 0; j < aliasEvents.length; j++) { + const aliases = aliasEvents[j].getContent().aliases || []; + for (let k = 0; k < aliases.length; k++) { + if (aliases[k] === roomAlias) { + targetRoomId = rooms[i].roomId; + break; + } + } + if (targetRoomId) break; + } + if (targetRoomId) break; + } + if (!targetRoomId) return reject(_t('Unrecognised room alias:') + ' ' + roomAlias); + } + } + + if (!targetRoomId) targetRoomId = roomId; + return success( + cli.leave(targetRoomId).then(function() { + dis.dispatch({action: 'view_next_room'}); + }), + ); + }, + }), + + kick: new Command({ + name: 'kick', + args: ' [reason]', + description: _td('Kicks user with given id'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(\S+?)( +(.*))?$/); + if (matches) { + return success(MatrixClientPeg.get().kick(roomId, matches[1], matches[3])); + } + } + return reject(this.getUsage()); + }, }), // Ban a user from the room with an optional reason - ban: new Command("ban", " []", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+?)( +(.*))?$/); - if (matches) { - return success( - MatrixClientPeg.get().ban(roomId, matches[1], matches[3]), - ); + ban: new Command({ + name: 'ban', + args: ' [reason]', + description: _td('Bans user with given id'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(\S+?)( +(.*))?$/); + if (matches) { + return success(MatrixClientPeg.get().ban(roomId, matches[1], matches[3])); + } } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, }), - // Unban a user from the room - unban: new Command("unban", "", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+)$/); - if (matches) { - // Reset the user membership to "leave" to unban him - return success( - MatrixClientPeg.get().unban(roomId, matches[1]), - ); + // Unban a user from ythe room + unban: new Command({ + name: 'unban', + args: '', + description: _td('Unbans user with given id'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(\S+)$/); + if (matches) { + // Reset the user membership to "leave" to unban him + return success(MatrixClientPeg.get().unban(roomId, matches[1])); + } } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, }), - ignore: new Command("ignore", "", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+)$/); - if (matches) { - const userId = matches[1]; - const ignoredUsers = MatrixClientPeg.get().getIgnoredUsers(); - ignoredUsers.push(userId); // de-duped internally in the js-sdk - return success( - MatrixClientPeg.get().setIgnoredUsers(ignoredUsers).then(() => { - const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); - Modal.createTrackedDialog('Slash Commands', 'User ignored', QuestionDialog, { - title: _t("Ignored user"), - description: ( -
    -

    { _t("You are now ignoring %(userId)s", {userId: userId}) }

    -
    - ), - hasCancelButton: false, - }); - }), - ); + ignore: new Command({ + name: 'ignore', + args: '', + description: _td('Ignores a user, hiding their messages from you'), + runFn: function(roomId, args) { + if (args) { + const cli = MatrixClientPeg.get(); + + const matches = args.match(/^(\S+)$/); + if (matches) { + const userId = matches[1]; + const ignoredUsers = cli.getIgnoredUsers(); + ignoredUsers.push(userId); // de-duped internally in the js-sdk + return success( + cli.setIgnoredUsers(ignoredUsers).then(() => { + const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog'); + Modal.createTrackedDialog('Slash Commands', 'User ignored', QuestionDialog, { + title: _t('Ignored user'), + description:
    +

    { _t('You are now ignoring %(userId)s', {userId}) }

    +
    , + hasCancelButton: false, + }); + }), + ); + } } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, }), - unignore: new Command("unignore", "", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+)$/); - if (matches) { - const userId = matches[1]; - const ignoredUsers = MatrixClientPeg.get().getIgnoredUsers(); - const index = ignoredUsers.indexOf(userId); - if (index !== -1) ignoredUsers.splice(index, 1); - return success( - MatrixClientPeg.get().setIgnoredUsers(ignoredUsers).then(() => { - const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); - Modal.createTrackedDialog('Slash Commands', 'User unignored', QuestionDialog, { - title: _t("Unignored user"), - description: ( -
    -

    { _t("You are no longer ignoring %(userId)s", {userId: userId}) }

    -
    - ), - hasCancelButton: false, - }); - }), - ); + unignore: new Command({ + name: 'unignore', + args: '', + description: _td('Stops ignoring a user, showing their messages going forward'), + runFn: function(roomId, args) { + if (args) { + const cli = MatrixClientPeg.get(); + + const matches = args.match(/^(\S+)$/); + if (matches) { + const userId = matches[1]; + const ignoredUsers = cli.getIgnoredUsers(); + const index = ignoredUsers.indexOf(userId); + if (index !== -1) ignoredUsers.splice(index, 1); + return success( + cli.setIgnoredUsers(ignoredUsers).then(() => { + const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog'); + Modal.createTrackedDialog('Slash Commands', 'User unignored', QuestionDialog, { + title: _t('Unignored user'), + description:
    +

    { _t('You are no longer ignoring %(userId)s', {userId}) }

    +
    , + hasCancelButton: false, + }); + }), + ); + } } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, }), // Define the power level of a user - op: new Command("op", " []", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+?)( +(-?\d+))?$/); - let powerLevel = 50; // default power level for op - if (matches) { - const userId = matches[1]; - if (matches.length === 4 && undefined !== matches[3]) { - powerLevel = parseInt(matches[3]); - } - if (!isNaN(powerLevel)) { - const room = MatrixClientPeg.get().getRoom(roomId); - if (!room) { - return reject("Bad room ID: " + roomId); + op: new Command({ + name: 'op', + args: ' []', + description: _td('Define the power level of a user'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(\S+?)( +(-?\d+))?$/); + let powerLevel = 50; // default power level for op + if (matches) { + const userId = matches[1]; + if (matches.length === 4 && undefined !== matches[3]) { + powerLevel = parseInt(matches[3]); + } + if (!isNaN(powerLevel)) { + const cli = MatrixClientPeg.get(); + const room = cli.getRoom(roomId); + if (!room) return reject('Bad room ID: ' + roomId); + + const powerLevelEvent = room.currentState.getStateEvents('m.room.power_levels', ''); + return success(cli.setPowerLevel(roomId, userId, powerLevel, powerLevelEvent)); } - const powerLevelEvent = room.currentState.getStateEvents( - "m.room.power_levels", "", - ); - return success( - MatrixClientPeg.get().setPowerLevel( - roomId, userId, powerLevel, powerLevelEvent, - ), - ); } } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, }), // Reset the power level of a user - deop: new Command("deop", "", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+)$/); - if (matches) { - const room = MatrixClientPeg.get().getRoom(roomId); - if (!room) { - return reject("Bad room ID: " + roomId); - } + deop: new Command({ + name: 'deop', + args: '', + description: _td('Deops user with given id'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(\S+)$/); + if (matches) { + const cli = MatrixClientPeg.get(); + const room = cli.getRoom(roomId); + if (!room) return reject('Bad room ID: ' + roomId); - const powerLevelEvent = room.currentState.getStateEvents( - "m.room.power_levels", "", - ); - return success( - MatrixClientPeg.get().setPowerLevel( - roomId, args, undefined, powerLevelEvent, - ), - ); + const powerLevelEvent = room.currentState.getStateEvents('m.room.power_levels', ''); + return success(cli.setPowerLevel(roomId, args, undefined, powerLevelEvent)); + } } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, }), - // Open developer tools - devtools: new Command("devtools", "", function(roomId) { - const DevtoolsDialog = sdk.getComponent("dialogs.DevtoolsDialog"); - Modal.createDialog(DevtoolsDialog, { roomId }); - return success(); + devtools: new Command({ + name: 'devtools', + description: _td('Opens the Developer Tools dialog'), + runFn: function(roomId) { + const DevtoolsDialog = sdk.getComponent('dialogs.DevtoolsDialog'); + Modal.createDialog(DevtoolsDialog, {roomId}); + return success(); + }, }), // Verify a user, device, and pubkey tuple - verify: new Command("verify", " ", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+) +(\S+) +(\S+)$/); - if (matches) { - const userId = matches[1]; - const deviceId = matches[2]; - const fingerprint = matches[3]; + verify: new Command({ + name: 'verify', + args: ' ', + description: _td('Verifies a user, device, and pubkey tuple'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(\S+) +(\S+) +(\S+)$/); + if (matches) { + const cli = MatrixClientPeg.get(); - return success( - // Promise.resolve to handle transition from static result to promise; can be removed - // in future - Promise.resolve(MatrixClientPeg.get().getStoredDevice(userId, deviceId)).then((device) => { - if (!device) { - throw new Error(_t(`Unknown (user, device) pair:`) + ` (${userId}, ${deviceId})`); - } + const userId = matches[1]; + const deviceId = matches[2]; + const fingerprint = matches[3]; - if (device.isVerified()) { - if (device.getFingerprint() === fingerprint) { - throw new Error(_t(`Device already verified!`)); - } else { - throw new Error(_t(`WARNING: Device already verified, but keys do NOT MATCH!`)); + return success( + // Promise.resolve to handle transition from static result to promise; can be removed + // in future + Promise.resolve(cli.getStoredDevice(userId, deviceId)).then((device) => { + if (!device) { + throw new Error(_t('Unknown (user, device) pair:') + ` (${userId}, ${deviceId})`); } - } - if (device.getFingerprint() !== fingerprint) { - const fprint = device.getFingerprint(); - throw new Error( - _t('WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device' + - ' %(deviceId)s is "%(fprint)s" which does not match the provided key' + - ' "%(fingerprint)s". This could mean your communications are being intercepted!', - {deviceId: deviceId, fprint: fprint, userId: userId, fingerprint: fingerprint})); - } + if (device.isVerified()) { + if (device.getFingerprint() === fingerprint) { + throw new Error(_t('Device already verified!')); + } else { + throw new Error(_t('WARNING: Device already verified, but keys do NOT MATCH!')); + } + } - return MatrixClientPeg.get().setDeviceVerified(userId, deviceId, true); - }).then(() => { - // Tell the user we verified everything - const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); - Modal.createTrackedDialog('Slash Commands', 'Verified key', QuestionDialog, { - title: _t("Verified key"), - description: ( -
    -

    - { - _t("The signing key you provided matches the signing key you received " + - "from %(userId)s's device %(deviceId)s. Device marked as verified.", - {userId: userId, deviceId: deviceId}) - } -

    -
    - ), - hasCancelButton: false, - }); - }), - ); + if (device.getFingerprint() !== fingerprint) { + const fprint = device.getFingerprint(); + throw new Error( + _t('WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device' + + ' %(deviceId)s is "%(fprint)s" which does not match the provided key ' + + '"%(fingerprint)s". This could mean your communications are being intercepted!', + { + fprint, + userId, + deviceId, + fingerprint, + })); + } + + return cli.setDeviceVerified(userId, deviceId, true); + }).then(() => { + // Tell the user we verified everything + const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog'); + Modal.createTrackedDialog('Slash Commands', 'Verified key', QuestionDialog, { + title: _t('Verified key'), + description:
    +

    + { + _t('The signing key you provided matches the signing key you received ' + + 'from %(userId)s\'s device %(deviceId)s. Device marked as verified.', + {userId, deviceId}) + } +

    +
    , + hasCancelButton: false, + }); + }), + ); + } } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, + }), + + // Command definitions for autocompletion ONLY: + + // /me is special because its not handled by SlashCommands.js and is instead done inside the Composer classes + me: new Command({ + name: 'me', + args: '', + description: _td('Displays action'), }), }; /* eslint-enable babel/no-invalid-this */ @@ -421,50 +476,39 @@ const aliases = { j: "join", }; -module.exports = { - /** - * Process the given text for /commands and perform them. - * @param {string} roomId The room in which the command was performed. - * @param {string} input The raw text input by the user. - * @return {Object|null} An object with the property 'error' if there was an error - * processing the command, or 'promise' if a request was sent out. - * Returns null if the input didn't match a command. - */ - processInput: function(roomId, input) { - // trim any trailing whitespace, as it can confuse the parser for - // IRC-style commands - input = input.replace(/\s+$/, ""); - if (input[0] === "/" && input[1] !== "/") { - const bits = input.match(/^(\S+?)( +((.|\n)*))?$/); - let cmd; - let args; - if (bits) { - cmd = bits[1].substring(1).toLowerCase(); - args = bits[3]; - } else { - cmd = input; - } - if (cmd === "me") return null; - if (aliases[cmd]) { - cmd = aliases[cmd]; - } - if (commands[cmd]) { - return commands[cmd].run(roomId, args); - } else { - return reject(_t("Unrecognised command:") + ' ' + input); - } - } - return null; // not a command - }, +/** + * Process the given text for /commands and perform them. + * @param {string} roomId The room in which the command was performed. + * @param {string} input The raw text input by the user. + * @return {Object|null} An object with the property 'error' if there was an error + * processing the command, or 'promise' if a request was sent out. + * Returns null if the input didn't match a command. + */ +export function processCommandInput(roomId, input) { + // trim any trailing whitespace, as it can confuse the parser for + // IRC-style commands + input = input.replace(/\s+$/, ''); + if (input[0] !== '/' || input[1] === '/') return null; // not a command - getCommandList: function() { - // Return all the commands plus /me and /markdown which aren't handled like normal commands - const cmds = Object.keys(commands).sort().map(function(cmdKey) { - return commands[cmdKey]; - }); - cmds.push(new Command("me", "", function() {})); - cmds.push(new Command("markdown", "", function() {})); + const bits = input.match(/^(\S+?)( +((.|\n)*))?$/); + let cmd; + let args; + if (bits) { + cmd = bits[1].substring(1).toLowerCase(); + args = bits[3]; + } else { + cmd = input; + } - return cmds; - }, -}; + if (aliases[cmd]) { + cmd = aliases[cmd]; + } + if (CommandMap[cmd]) { + // if it has no runFn then its an ignored/nop command (autocomplete only) e.g `/me` + if (!CommandMap[cmd].runFn) return null; + + return CommandMap[cmd].run(roomId, args); + } else { + return reject(_t('Unrecognised command:') + ' ' + input); + } +} diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js index b162f2f92a..01a40be40c 100644 --- a/src/autocomplete/CommandProvider.js +++ b/src/autocomplete/CommandProvider.js @@ -18,101 +18,14 @@ limitations under the License. */ import React from 'react'; -import { _t, _td } from '../languageHandler'; +import {_t} from '../languageHandler'; import AutocompleteProvider from './AutocompleteProvider'; import FuzzyMatcher from './FuzzyMatcher'; import {TextualCompletion} from './Components'; +import {CommandMap} from '../SlashCommands'; import type {SelectionRange} from "./Autocompleter"; -// TODO merge this with the factory mechanics of SlashCommands? -// Warning: Since the description string will be translated in _t(result.description), all these strings below must be in i18n/strings/en_EN.json file -const COMMANDS = [ - { - command: '/me', - args: '', - description: _td('Displays action'), - }, - { - command: '/ban', - args: ' [reason]', - description: _td('Bans user with given id'), - }, - { - command: '/unban', - args: '', - description: _td('Unbans user with given id'), - }, - { - command: '/op', - args: ' []', - description: _td('Define the power level of a user'), - }, - { - command: '/deop', - args: '', - description: _td('Deops user with given id'), - }, - { - command: '/invite', - args: '', - description: _td('Invites user with given id to current room'), - }, - { - command: '/join', - args: '', - description: _td('Joins room with given alias'), - }, - { - command: '/part', - args: '[]', - description: _td('Leave room'), - }, - { - command: '/topic', - args: '', - description: _td('Sets the room topic'), - }, - { - command: '/kick', - args: ' [reason]', - description: _td('Kicks user with given id'), - }, - { - command: '/nick', - args: '', - description: _td('Changes your display nickname'), - }, - { - command: '/ddg', - args: '', - description: _td('Searches DuckDuckGo for results'), - }, - { - command: '/tint', - args: ' []', - description: _td('Changes colour scheme of current room'), - }, - { - command: '/verify', - args: ' ', - description: _td('Verifies a user, device, and pubkey tuple'), - }, - { - command: '/ignore', - args: '', - description: _td('Ignores a user, hiding their messages from you'), - }, - { - command: '/unignore', - args: '', - description: _td('Stops ignoring a user, showing their messages going forward'), - }, - { - command: '/devtools', - args: '', - description: _td('Opens the Developer Tools dialog'), - }, -]; +const COMMANDS = Object.values(CommandMap); const COMMAND_RE = /(^\/\w*)(?: .*)?/g; @@ -134,11 +47,10 @@ export default class CommandProvider extends AutocompleteProvider { return { // If the command is the same as the one they entered, we don't want to discard their arguments completion: result.command === command[1] ? command[0] : (result.command + ' '), - component: (), + description={_t(result.description)} />, range, }; }); diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js index 57d433e55c..81c4ff2b16 100644 --- a/src/components/views/rooms/MessageComposerInput.js +++ b/src/components/views/rooms/MessageComposerInput.js @@ -28,7 +28,7 @@ import Promise from 'bluebird'; import MatrixClientPeg from '../../../MatrixClientPeg'; import type {MatrixClient} from 'matrix-js-sdk/lib/matrix'; -import SlashCommands from '../../../SlashCommands'; +import {processCommandInput} from '../../../SlashCommands'; import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../../Keyboard'; import Modal from '../../../Modal'; import sdk from '../../../index'; @@ -721,7 +721,7 @@ export default class MessageComposerInput extends React.Component { // Some commands (/join) require pills to be replaced with their text content const commandText = this.removeMDLinks(contentState, ['#']); - const cmd = SlashCommands.processInput(this.props.room.roomId, commandText); + const cmd = processCommandInput(this.props.room.roomId, commandText); if (cmd) { if (!cmd.error) { this.historyManager.save(contentState, this.state.isRichtextEnabled ? 'html' : 'markdown'); From 9107744da73d16037f31c9203a290086e45e5c3d Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 18 Jun 2018 19:32:12 +0100 Subject: [PATCH 169/283] simplify arrow func Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/autocomplete/CommandProvider.js | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js index 01a40be40c..0e780bddd3 100644 --- a/src/autocomplete/CommandProvider.js +++ b/src/autocomplete/CommandProvider.js @@ -43,17 +43,15 @@ export default class CommandProvider extends AutocompleteProvider { // if the query is just `/` (and the user hit TAB or waits), show them all COMMANDS otherwise FuzzyMatch them const matches = query === '/' ? COMMANDS : this.matcher.match(command[1]); - return matches.map((result) => { - return { - // If the command is the same as the one they entered, we don't want to discard their arguments - completion: result.command === command[1] ? command[0] : (result.command + ' '), - component: , - range, - }; - }); + return matches.map((result) => ({ + // If the command is the same as the one they entered, we don't want to discard their arguments + completion: result.command === command[1] ? command[0] : (result.command + ' '), + component: , + range, + })); } getName() { From 85ddc0651b3dc3317c2c95dd804ca26fed2806ad Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 18 Jun 2018 19:31:40 +0100 Subject: [PATCH 170/283] consolidate the two locations commands are defined, as it was a MESS Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/SlashCommands.js | 768 +++++++++--------- src/autocomplete/CommandProvider.js | 98 +-- .../views/rooms/MessageComposerInput.js | 4 +- 3 files changed, 413 insertions(+), 457 deletions(-) diff --git a/src/SlashCommands.js b/src/SlashCommands.js index d45e45e84c..3743fbb98c 100644 --- a/src/SlashCommands.js +++ b/src/SlashCommands.js @@ -14,28 +14,31 @@ See the License for the specific language governing permissions and limitations under the License. */ -import MatrixClientPeg from "./MatrixClientPeg"; -import dis from "./dispatcher"; -import Tinter from "./Tinter"; + +import React from 'react'; +import MatrixClientPeg from './MatrixClientPeg'; +import dis from './dispatcher'; +import Tinter from './Tinter'; import sdk from './index'; -import { _t } from './languageHandler'; +import {_t, _td} from './languageHandler'; import Modal from './Modal'; -import SettingsStore, {SettingLevel} from "./settings/SettingsStore"; +import SettingsStore, {SettingLevel} from './settings/SettingsStore'; class Command { - constructor(name, paramArgs, runFn) { - this.name = name; - this.paramArgs = paramArgs; + constructor({name, args='', description, runFn}) { + this.command = name; + this.args = args; + this.description = description; this.runFn = runFn; } getCommand() { - return "/" + this.name; + return "/" + this.command; } getCommandWithArgs() { - return this.getCommand() + " " + this.paramArgs; + return this.getCommand() + " " + this.args; } run(roomId, args) { @@ -47,16 +50,12 @@ class Command { } } -function reject(msg) { - return { - error: msg, - }; +function reject(error) { + return {error}; } function success(promise) { - return { - promise: promise, - }; + return {promise}; } /* Disable the "unexpected this" error for these commands - all of the run @@ -65,352 +64,408 @@ function success(promise) { /* eslint-disable babel/no-invalid-this */ -const commands = { - ddg: new Command("ddg", "", function(roomId, args) { - const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog'); - // TODO Don't explain this away, actually show a search UI here. - Modal.createTrackedDialog('Slash Commands', '/ddg is not a command', ErrorDialog, { - title: _t('/ddg is not a command'), - description: _t('To use it, just wait for autocomplete results to load and tab through them.'), - }); - return success(); +export const CommandMap = { + ddg: new Command({ + name: 'ddg', + args: '', + description: _td('Searches DuckDuckGo for results'), + runFn: function(roomId, args) { + const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog'); + // TODO Don't explain this away, actually show a search UI here. + Modal.createTrackedDialog('Slash Commands', '/ddg is not a command', ErrorDialog, { + title: _t('/ddg is not a command'), + description: _t('To use it, just wait for autocomplete results to load and tab through them.'), + }); + return success(); + }, }), - // Change your nickname - nick: new Command("nick", "", function(roomId, args) { - if (args) { - return success( - MatrixClientPeg.get().setDisplayName(args), - ); - } - return reject(this.getUsage()); - }), - - // Changes the colorscheme of your current room - tint: new Command("tint", " []", function(roomId, args) { - if (args) { - const matches = args.match(/^(#([0-9a-fA-F]{3}|[0-9a-fA-F]{6}))( +(#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})))?$/); - if (matches) { - Tinter.tint(matches[1], matches[4]); - const colorScheme = {}; - colorScheme.primary_color = matches[1]; - if (matches[4]) { - colorScheme.secondary_color = matches[4]; - } else { - colorScheme.secondary_color = colorScheme.primary_color; - } - return success( - SettingsStore.setValue("roomColor", roomId, SettingLevel.ROOM_ACCOUNT, colorScheme), - ); + nick: new Command({ + name: 'nick', + args: '', + description: _td('Changes your display nickname'), + runFn: function(roomId, args) { + if (args) { + return success(MatrixClientPeg.get().setDisplayName(args)); } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, }), - // Change the room topic - topic: new Command("topic", "", function(roomId, args) { - if (args) { - return success( - MatrixClientPeg.get().setRoomTopic(roomId, args), - ); - } - return reject(this.getUsage()); - }), - - // Invite a user - invite: new Command("invite", "", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+)$/); - if (matches) { - return success( - MatrixClientPeg.get().invite(roomId, matches[1]), - ); - } - } - return reject(this.getUsage()); - }), - - // Join a room - join: new Command("join", "#alias:domain", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+)$/); - if (matches) { - let roomAlias = matches[1]; - if (roomAlias[0] !== '#') { - return reject(this.getUsage()); - } - if (!roomAlias.match(/:/)) { - roomAlias += ':' + MatrixClientPeg.get().getDomain(); - } - - dis.dispatch({ - action: 'view_room', - room_alias: roomAlias, - auto_join: true, - }); - - return success(); - } - } - return reject(this.getUsage()); - }), - - part: new Command("part", "[#alias:domain]", function(roomId, args) { - let targetRoomId; - if (args) { - const matches = args.match(/^(\S+)$/); - if (matches) { - let roomAlias = matches[1]; - if (roomAlias[0] !== '#') { - return reject(this.getUsage()); - } - if (!roomAlias.match(/:/)) { - roomAlias += ':' + MatrixClientPeg.get().getDomain(); - } - - // Try to find a room with this alias - const rooms = MatrixClientPeg.get().getRooms(); - for (let i = 0; i < rooms.length; i++) { - const aliasEvents = rooms[i].currentState.getStateEvents( - "m.room.aliases", - ); - for (let j = 0; j < aliasEvents.length; j++) { - const aliases = aliasEvents[j].getContent().aliases || []; - for (let k = 0; k < aliases.length; k++) { - if (aliases[k] === roomAlias) { - targetRoomId = rooms[i].roomId; - break; - } - } - if (targetRoomId) { break; } + tint: new Command({ + name: 'tint', + args: ' []', + description: _td('Changes colour scheme of current room'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(#([\da-fA-F]{3}|[\da-fA-F]{6}))( +(#([\da-fA-F]{3}|[\da-fA-F]{6})))?$/); + if (matches) { + Tinter.tint(matches[1], matches[4]); + const colorScheme = {}; + colorScheme.primary_color = matches[1]; + if (matches[4]) { + colorScheme.secondary_color = matches[4]; + } else { + colorScheme.secondary_color = colorScheme.primary_color; } - if (targetRoomId) { break; } - } - if (!targetRoomId) { - return reject(_t("Unrecognised room alias:") + ' ' + roomAlias); + return success( + SettingsStore.setValue('roomColor', roomId, SettingLevel.ROOM_ACCOUNT, colorScheme), + ); } } - } - if (!targetRoomId) targetRoomId = roomId; - return success( - MatrixClientPeg.get().leave(targetRoomId).then( - function() { - dis.dispatch({action: 'view_next_room'}); - }, - ), - ); + return reject(this.getUsage()); + }, }), - // Kick a user from the room with an optional reason - kick: new Command("kick", " []", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+?)( +(.*))?$/); - if (matches) { - return success( - MatrixClientPeg.get().kick(roomId, matches[1], matches[3]), - ); + topic: new Command({ + name: 'topic', + args: '', + description: _td('Sets the room topic'), + runFn: function(roomId, args) { + if (args) { + return success(MatrixClientPeg.get().setRoomTopic(roomId, args)); } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, + }), + + invite: new Command({ + name: 'invite', + args: '', + description: _td('Invites user with given id to current room'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(\S+)$/); + if (matches) { + return success(MatrixClientPeg.get().invite(roomId, matches[1])); + } + } + return reject(this.getUsage()); + }, + }), + + join: new Command({ + name: 'join', + args: '', + description: _td('Joins room with given alias'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(\S+)$/); + if (matches) { + let roomAlias = matches[1]; + if (roomAlias[0] !== '#') return reject(this.getUsage()); + + if (!roomAlias.includes(':')) { + roomAlias += ':' + MatrixClientPeg.get().getDomain(); + } + + dis.dispatch({ + action: 'view_room', + room_alias: roomAlias, + auto_join: true, + }); + + return success(); + } + } + return reject(this.getUsage()); + }, + }), + + part: new Command({ + name: 'part', + args: '[]', + description: _td('Leave room'), + runFn: function(roomId, args) { + const cli = MatrixClientPeg.get(); + + let targetRoomId; + if (args) { + const matches = args.match(/^(\S+)$/); + if (matches) { + let roomAlias = matches[1]; + if (roomAlias[0] !== '#') return reject(this.getUsage()); + + if (!roomAlias.includes(':')) { + roomAlias += ':' + cli.getDomain(); + } + + // Try to find a room with this alias + const rooms = cli.getRooms(); + for (let i = 0; i < rooms.length; i++) { + const aliasEvents = rooms[i].currentState.getStateEvents('m.room.aliases'); + for (let j = 0; j < aliasEvents.length; j++) { + const aliases = aliasEvents[j].getContent().aliases || []; + for (let k = 0; k < aliases.length; k++) { + if (aliases[k] === roomAlias) { + targetRoomId = rooms[i].roomId; + break; + } + } + if (targetRoomId) break; + } + if (targetRoomId) break; + } + if (!targetRoomId) return reject(_t('Unrecognised room alias:') + ' ' + roomAlias); + } + } + + if (!targetRoomId) targetRoomId = roomId; + return success( + cli.leave(targetRoomId).then(function() { + dis.dispatch({action: 'view_next_room'}); + }), + ); + }, + }), + + kick: new Command({ + name: 'kick', + args: ' [reason]', + description: _td('Kicks user with given id'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(\S+?)( +(.*))?$/); + if (matches) { + return success(MatrixClientPeg.get().kick(roomId, matches[1], matches[3])); + } + } + return reject(this.getUsage()); + }, }), // Ban a user from the room with an optional reason - ban: new Command("ban", " []", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+?)( +(.*))?$/); - if (matches) { - return success( - MatrixClientPeg.get().ban(roomId, matches[1], matches[3]), - ); + ban: new Command({ + name: 'ban', + args: ' [reason]', + description: _td('Bans user with given id'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(\S+?)( +(.*))?$/); + if (matches) { + return success(MatrixClientPeg.get().ban(roomId, matches[1], matches[3])); + } } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, }), - // Unban a user from the room - unban: new Command("unban", "", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+)$/); - if (matches) { - // Reset the user membership to "leave" to unban him - return success( - MatrixClientPeg.get().unban(roomId, matches[1]), - ); + // Unban a user from ythe room + unban: new Command({ + name: 'unban', + args: '', + description: _td('Unbans user with given id'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(\S+)$/); + if (matches) { + // Reset the user membership to "leave" to unban him + return success(MatrixClientPeg.get().unban(roomId, matches[1])); + } } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, }), - ignore: new Command("ignore", "", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+)$/); - if (matches) { - const userId = matches[1]; - const ignoredUsers = MatrixClientPeg.get().getIgnoredUsers(); - ignoredUsers.push(userId); // de-duped internally in the js-sdk - return success( - MatrixClientPeg.get().setIgnoredUsers(ignoredUsers).then(() => { - const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); - Modal.createTrackedDialog('Slash Commands', 'User ignored', QuestionDialog, { - title: _t("Ignored user"), - description: ( -
    -

    { _t("You are now ignoring %(userId)s", {userId: userId}) }

    -
    - ), - hasCancelButton: false, - }); - }), - ); + ignore: new Command({ + name: 'ignore', + args: '', + description: _td('Ignores a user, hiding their messages from you'), + runFn: function(roomId, args) { + if (args) { + const cli = MatrixClientPeg.get(); + + const matches = args.match(/^(\S+)$/); + if (matches) { + const userId = matches[1]; + const ignoredUsers = cli.getIgnoredUsers(); + ignoredUsers.push(userId); // de-duped internally in the js-sdk + return success( + cli.setIgnoredUsers(ignoredUsers).then(() => { + const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog'); + Modal.createTrackedDialog('Slash Commands', 'User ignored', QuestionDialog, { + title: _t('Ignored user'), + description:
    +

    { _t('You are now ignoring %(userId)s', {userId}) }

    +
    , + hasCancelButton: false, + }); + }), + ); + } } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, }), - unignore: new Command("unignore", "", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+)$/); - if (matches) { - const userId = matches[1]; - const ignoredUsers = MatrixClientPeg.get().getIgnoredUsers(); - const index = ignoredUsers.indexOf(userId); - if (index !== -1) ignoredUsers.splice(index, 1); - return success( - MatrixClientPeg.get().setIgnoredUsers(ignoredUsers).then(() => { - const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); - Modal.createTrackedDialog('Slash Commands', 'User unignored', QuestionDialog, { - title: _t("Unignored user"), - description: ( -
    -

    { _t("You are no longer ignoring %(userId)s", {userId: userId}) }

    -
    - ), - hasCancelButton: false, - }); - }), - ); + unignore: new Command({ + name: 'unignore', + args: '', + description: _td('Stops ignoring a user, showing their messages going forward'), + runFn: function(roomId, args) { + if (args) { + const cli = MatrixClientPeg.get(); + + const matches = args.match(/^(\S+)$/); + if (matches) { + const userId = matches[1]; + const ignoredUsers = cli.getIgnoredUsers(); + const index = ignoredUsers.indexOf(userId); + if (index !== -1) ignoredUsers.splice(index, 1); + return success( + cli.setIgnoredUsers(ignoredUsers).then(() => { + const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog'); + Modal.createTrackedDialog('Slash Commands', 'User unignored', QuestionDialog, { + title: _t('Unignored user'), + description:
    +

    { _t('You are no longer ignoring %(userId)s', {userId}) }

    +
    , + hasCancelButton: false, + }); + }), + ); + } } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, }), // Define the power level of a user - op: new Command("op", " []", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+?)( +(-?\d+))?$/); - let powerLevel = 50; // default power level for op - if (matches) { - const userId = matches[1]; - if (matches.length === 4 && undefined !== matches[3]) { - powerLevel = parseInt(matches[3]); - } - if (!isNaN(powerLevel)) { - const room = MatrixClientPeg.get().getRoom(roomId); - if (!room) { - return reject("Bad room ID: " + roomId); + op: new Command({ + name: 'op', + args: ' []', + description: _td('Define the power level of a user'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(\S+?)( +(-?\d+))?$/); + let powerLevel = 50; // default power level for op + if (matches) { + const userId = matches[1]; + if (matches.length === 4 && undefined !== matches[3]) { + powerLevel = parseInt(matches[3]); + } + if (!isNaN(powerLevel)) { + const cli = MatrixClientPeg.get(); + const room = cli.getRoom(roomId); + if (!room) return reject('Bad room ID: ' + roomId); + + const powerLevelEvent = room.currentState.getStateEvents('m.room.power_levels', ''); + return success(cli.setPowerLevel(roomId, userId, powerLevel, powerLevelEvent)); } - const powerLevelEvent = room.currentState.getStateEvents( - "m.room.power_levels", "", - ); - return success( - MatrixClientPeg.get().setPowerLevel( - roomId, userId, powerLevel, powerLevelEvent, - ), - ); } } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, }), // Reset the power level of a user - deop: new Command("deop", "", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+)$/); - if (matches) { - const room = MatrixClientPeg.get().getRoom(roomId); - if (!room) { - return reject("Bad room ID: " + roomId); - } + deop: new Command({ + name: 'deop', + args: '', + description: _td('Deops user with given id'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(\S+)$/); + if (matches) { + const cli = MatrixClientPeg.get(); + const room = cli.getRoom(roomId); + if (!room) return reject('Bad room ID: ' + roomId); - const powerLevelEvent = room.currentState.getStateEvents( - "m.room.power_levels", "", - ); - return success( - MatrixClientPeg.get().setPowerLevel( - roomId, args, undefined, powerLevelEvent, - ), - ); + const powerLevelEvent = room.currentState.getStateEvents('m.room.power_levels', ''); + return success(cli.setPowerLevel(roomId, args, undefined, powerLevelEvent)); + } } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, }), - // Open developer tools - devtools: new Command("devtools", "", function(roomId) { - const DevtoolsDialog = sdk.getComponent("dialogs.DevtoolsDialog"); - Modal.createDialog(DevtoolsDialog, { roomId }); - return success(); + devtools: new Command({ + name: 'devtools', + description: _td('Opens the Developer Tools dialog'), + runFn: function(roomId) { + const DevtoolsDialog = sdk.getComponent('dialogs.DevtoolsDialog'); + Modal.createDialog(DevtoolsDialog, {roomId}); + return success(); + }, }), // Verify a user, device, and pubkey tuple - verify: new Command("verify", " ", function(roomId, args) { - if (args) { - const matches = args.match(/^(\S+) +(\S+) +(\S+)$/); - if (matches) { - const userId = matches[1]; - const deviceId = matches[2]; - const fingerprint = matches[3]; + verify: new Command({ + name: 'verify', + args: ' ', + description: _td('Verifies a user, device, and pubkey tuple'), + runFn: function(roomId, args) { + if (args) { + const matches = args.match(/^(\S+) +(\S+) +(\S+)$/); + if (matches) { + const cli = MatrixClientPeg.get(); - return success( - // Promise.resolve to handle transition from static result to promise; can be removed - // in future - Promise.resolve(MatrixClientPeg.get().getStoredDevice(userId, deviceId)).then((device) => { - if (!device) { - throw new Error(_t(`Unknown (user, device) pair:`) + ` (${userId}, ${deviceId})`); - } + const userId = matches[1]; + const deviceId = matches[2]; + const fingerprint = matches[3]; - if (device.isVerified()) { - if (device.getFingerprint() === fingerprint) { - throw new Error(_t(`Device already verified!`)); - } else { - throw new Error(_t(`WARNING: Device already verified, but keys do NOT MATCH!`)); + return success( + // Promise.resolve to handle transition from static result to promise; can be removed + // in future + Promise.resolve(cli.getStoredDevice(userId, deviceId)).then((device) => { + if (!device) { + throw new Error(_t('Unknown (user, device) pair:') + ` (${userId}, ${deviceId})`); } - } - if (device.getFingerprint() !== fingerprint) { - const fprint = device.getFingerprint(); - throw new Error( - _t('WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device' + - ' %(deviceId)s is "%(fprint)s" which does not match the provided key' + - ' "%(fingerprint)s". This could mean your communications are being intercepted!', - {deviceId: deviceId, fprint: fprint, userId: userId, fingerprint: fingerprint})); - } + if (device.isVerified()) { + if (device.getFingerprint() === fingerprint) { + throw new Error(_t('Device already verified!')); + } else { + throw new Error(_t('WARNING: Device already verified, but keys do NOT MATCH!')); + } + } - return MatrixClientPeg.get().setDeviceVerified(userId, deviceId, true); - }).then(() => { - // Tell the user we verified everything - const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); - Modal.createTrackedDialog('Slash Commands', 'Verified key', QuestionDialog, { - title: _t("Verified key"), - description: ( -
    -

    - { - _t("The signing key you provided matches the signing key you received " + - "from %(userId)s's device %(deviceId)s. Device marked as verified.", - {userId: userId, deviceId: deviceId}) - } -

    -
    - ), - hasCancelButton: false, - }); - }), - ); + if (device.getFingerprint() !== fingerprint) { + const fprint = device.getFingerprint(); + throw new Error( + _t('WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device' + + ' %(deviceId)s is "%(fprint)s" which does not match the provided key ' + + '"%(fingerprint)s". This could mean your communications are being intercepted!', + { + fprint, + userId, + deviceId, + fingerprint, + })); + } + + return cli.setDeviceVerified(userId, deviceId, true); + }).then(() => { + // Tell the user we verified everything + const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog'); + Modal.createTrackedDialog('Slash Commands', 'Verified key', QuestionDialog, { + title: _t('Verified key'), + description:
    +

    + { + _t('The signing key you provided matches the signing key you received ' + + 'from %(userId)s\'s device %(deviceId)s. Device marked as verified.', + {userId, deviceId}) + } +

    +
    , + hasCancelButton: false, + }); + }), + ); + } } - } - return reject(this.getUsage()); + return reject(this.getUsage()); + }, + }), + + // Command definitions for autocompletion ONLY: + + // /me is special because its not handled by SlashCommands.js and is instead done inside the Composer classes + me: new Command({ + name: 'me', + args: '', + description: _td('Displays action'), }), }; /* eslint-enable babel/no-invalid-this */ @@ -421,50 +476,39 @@ const aliases = { j: "join", }; -module.exports = { - /** - * Process the given text for /commands and perform them. - * @param {string} roomId The room in which the command was performed. - * @param {string} input The raw text input by the user. - * @return {Object|null} An object with the property 'error' if there was an error - * processing the command, or 'promise' if a request was sent out. - * Returns null if the input didn't match a command. - */ - processInput: function(roomId, input) { - // trim any trailing whitespace, as it can confuse the parser for - // IRC-style commands - input = input.replace(/\s+$/, ""); - if (input[0] === "/" && input[1] !== "/") { - const bits = input.match(/^(\S+?)( +((.|\n)*))?$/); - let cmd; - let args; - if (bits) { - cmd = bits[1].substring(1).toLowerCase(); - args = bits[3]; - } else { - cmd = input; - } - if (cmd === "me") return null; - if (aliases[cmd]) { - cmd = aliases[cmd]; - } - if (commands[cmd]) { - return commands[cmd].run(roomId, args); - } else { - return reject(_t("Unrecognised command:") + ' ' + input); - } - } - return null; // not a command - }, +/** + * Process the given text for /commands and perform them. + * @param {string} roomId The room in which the command was performed. + * @param {string} input The raw text input by the user. + * @return {Object|null} An object with the property 'error' if there was an error + * processing the command, or 'promise' if a request was sent out. + * Returns null if the input didn't match a command. + */ +export function processCommandInput(roomId, input) { + // trim any trailing whitespace, as it can confuse the parser for + // IRC-style commands + input = input.replace(/\s+$/, ''); + if (input[0] !== '/' || input[1] === '/') return null; // not a command - getCommandList: function() { - // Return all the commands plus /me and /markdown which aren't handled like normal commands - const cmds = Object.keys(commands).sort().map(function(cmdKey) { - return commands[cmdKey]; - }); - cmds.push(new Command("me", "", function() {})); - cmds.push(new Command("markdown", "", function() {})); + const bits = input.match(/^(\S+?)( +((.|\n)*))?$/); + let cmd; + let args; + if (bits) { + cmd = bits[1].substring(1).toLowerCase(); + args = bits[3]; + } else { + cmd = input; + } - return cmds; - }, -}; + if (aliases[cmd]) { + cmd = aliases[cmd]; + } + if (CommandMap[cmd]) { + // if it has no runFn then its an ignored/nop command (autocomplete only) e.g `/me` + if (!CommandMap[cmd].runFn) return null; + + return CommandMap[cmd].run(roomId, args); + } else { + return reject(_t('Unrecognised command:') + ' ' + input); + } +} diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js index b162f2f92a..01a40be40c 100644 --- a/src/autocomplete/CommandProvider.js +++ b/src/autocomplete/CommandProvider.js @@ -18,101 +18,14 @@ limitations under the License. */ import React from 'react'; -import { _t, _td } from '../languageHandler'; +import {_t} from '../languageHandler'; import AutocompleteProvider from './AutocompleteProvider'; import FuzzyMatcher from './FuzzyMatcher'; import {TextualCompletion} from './Components'; +import {CommandMap} from '../SlashCommands'; import type {SelectionRange} from "./Autocompleter"; -// TODO merge this with the factory mechanics of SlashCommands? -// Warning: Since the description string will be translated in _t(result.description), all these strings below must be in i18n/strings/en_EN.json file -const COMMANDS = [ - { - command: '/me', - args: '', - description: _td('Displays action'), - }, - { - command: '/ban', - args: ' [reason]', - description: _td('Bans user with given id'), - }, - { - command: '/unban', - args: '', - description: _td('Unbans user with given id'), - }, - { - command: '/op', - args: ' []', - description: _td('Define the power level of a user'), - }, - { - command: '/deop', - args: '', - description: _td('Deops user with given id'), - }, - { - command: '/invite', - args: '', - description: _td('Invites user with given id to current room'), - }, - { - command: '/join', - args: '', - description: _td('Joins room with given alias'), - }, - { - command: '/part', - args: '[]', - description: _td('Leave room'), - }, - { - command: '/topic', - args: '', - description: _td('Sets the room topic'), - }, - { - command: '/kick', - args: ' [reason]', - description: _td('Kicks user with given id'), - }, - { - command: '/nick', - args: '', - description: _td('Changes your display nickname'), - }, - { - command: '/ddg', - args: '', - description: _td('Searches DuckDuckGo for results'), - }, - { - command: '/tint', - args: ' []', - description: _td('Changes colour scheme of current room'), - }, - { - command: '/verify', - args: ' ', - description: _td('Verifies a user, device, and pubkey tuple'), - }, - { - command: '/ignore', - args: '', - description: _td('Ignores a user, hiding their messages from you'), - }, - { - command: '/unignore', - args: '', - description: _td('Stops ignoring a user, showing their messages going forward'), - }, - { - command: '/devtools', - args: '', - description: _td('Opens the Developer Tools dialog'), - }, -]; +const COMMANDS = Object.values(CommandMap); const COMMAND_RE = /(^\/\w*)(?: .*)?/g; @@ -134,11 +47,10 @@ export default class CommandProvider extends AutocompleteProvider { return { // If the command is the same as the one they entered, we don't want to discard their arguments completion: result.command === command[1] ? command[0] : (result.command + ' '), - component: (), + description={_t(result.description)} />, range, }; }); diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js index 97e8780f0f..1987d4f4be 100644 --- a/src/components/views/rooms/MessageComposerInput.js +++ b/src/components/views/rooms/MessageComposerInput.js @@ -28,7 +28,7 @@ import Promise from 'bluebird'; import MatrixClientPeg from '../../../MatrixClientPeg'; import type {MatrixClient} from 'matrix-js-sdk/lib/matrix'; -import SlashCommands from '../../../SlashCommands'; +import {processCommandInput} from '../../../SlashCommands'; import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../../Keyboard'; import Modal from '../../../Modal'; import sdk from '../../../index'; @@ -722,7 +722,7 @@ export default class MessageComposerInput extends React.Component { // Some commands (/join) require pills to be replaced with their text content const commandText = this.removeMDLinks(contentState, ['#']); - const cmd = SlashCommands.processInput(this.props.room.roomId, commandText); + const cmd = processCommandInput(this.props.room.roomId, commandText); if (cmd) { if (!cmd.error) { this.historyManager.save(contentState, this.state.isRichtextEnabled ? 'html' : 'markdown'); From 107802fa29a8e3dce0f7058f42264c8957d0b6f0 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 18 Jun 2018 19:32:12 +0100 Subject: [PATCH 171/283] simplify arrow func Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/autocomplete/CommandProvider.js | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js index 01a40be40c..0e780bddd3 100644 --- a/src/autocomplete/CommandProvider.js +++ b/src/autocomplete/CommandProvider.js @@ -43,17 +43,15 @@ export default class CommandProvider extends AutocompleteProvider { // if the query is just `/` (and the user hit TAB or waits), show them all COMMANDS otherwise FuzzyMatch them const matches = query === '/' ? COMMANDS : this.matcher.match(command[1]); - return matches.map((result) => { - return { - // If the command is the same as the one they entered, we don't want to discard their arguments - completion: result.command === command[1] ? command[0] : (result.command + ' '), - component: , - range, - }; - }); + return matches.map((result) => ({ + // If the command is the same as the one they entered, we don't want to discard their arguments + completion: result.command === command[1] ? command[0] : (result.command + ' '), + component: , + range, + })); } getName() { From 9de6bf4f5a109e62590d3e848c22f9f9189530da Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 18 Jun 2018 17:37:55 +0100 Subject: [PATCH 172/283] once command has a space, strict match instead of fuzzy match Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit a852033) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/autocomplete/CommandProvider.js | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js index 0e780bddd3..ea271e02ff 100644 --- a/src/autocomplete/CommandProvider.js +++ b/src/autocomplete/CommandProvider.js @@ -41,8 +41,26 @@ export default class CommandProvider extends AutocompleteProvider { const {command, range} = this.getCurrentCommand(query, selection); if (!command) return []; - // if the query is just `/` (and the user hit TAB or waits), show them all COMMANDS otherwise FuzzyMatch them - const matches = query === '/' ? COMMANDS : this.matcher.match(command[1]); + let matches; + if (command[0] !== command[1]) { + // The input looks like a command with arguments, perform exact match + const match = COMMANDS.find((o) => o.command === command[1]); + if (match) { + matches = [match]; + } + } + + // If we don't yet have matches + if (!matches) { + if (query === '/') { + // If they have just entered `/` show everything + matches = COMMANDS; + } else { + // otherwise fuzzy match against all of the fields + matches = this.matcher.match(command[1]); + } + } + return matches.map((result) => ({ // If the command is the same as the one they entered, we don't want to discard their arguments completion: result.command === command[1] ? command[0] : (result.command + ' '), From 29ea4025d46968e548cf83b5e6e15caaf30dc4cf Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 18 Jun 2018 22:13:20 +0100 Subject: [PATCH 173/283] trigger TagTile context menu on right click Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/elements/TagTile.js | 43 +++++++++++++++--------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js index fb3ddee093..5bea68e814 100644 --- a/src/components/views/elements/TagTile.js +++ b/src/components/views/elements/TagTile.js @@ -1,5 +1,6 @@ /* Copyright 2017 New Vector Ltd. +Copyright 2018 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. @@ -103,14 +104,27 @@ export default React.createClass({ } }, - onContextButtonClick: function(e) { - e.preventDefault(); - e.stopPropagation(); - + _openContextMenu: function(x, y, chevronOffset) { // Hide the (...) immediately this.setState({ hover: false }); const TagTileContextMenu = sdk.getComponent('context_menus.TagTileContextMenu'); + ContextualMenu.createMenu(TagTileContextMenu, { + chevronOffset: chevronOffset, + left: x, + top: y, + tag: this.props.tag, + onFinished: () => { + this.setState({ menuDisplayed: false }); + }, + }); + this.setState({ menuDisplayed: true }); + }, + + onContextButtonClick: function(e) { + e.preventDefault(); + e.stopPropagation(); + const elementRect = e.target.getBoundingClientRect(); // The window X and Y offsets are to adjust position when zoomed in to page @@ -119,17 +133,14 @@ export default React.createClass({ let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset); y = y - (chevronOffset + 8); // where 8 is half the height of the chevron - const self = this; - ContextualMenu.createMenu(TagTileContextMenu, { - chevronOffset: chevronOffset, - left: x, - top: y, - tag: this.props.tag, - onFinished: function() { - self.setState({ menuDisplayed: false }); - }, - }); - this.setState({ menuDisplayed: true }); + this._openContextMenu(x, y, chevronOffset); + }, + + onContextMenu: function(e) { + e.preventDefault(); + + const chevronOffset = 12; + this._openContextMenu(e.clientX, e.clientY - (chevronOffset + 8), chevronOffset); }, onMouseOver: function() { @@ -164,7 +175,7 @@ export default React.createClass({
    { "\u00B7\u00B7\u00B7" }
    :
    ; - return + return
    Date: Tue, 19 Jun 2018 07:56:04 +0100 Subject: [PATCH 174/283] un-break having no displayname user settings Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../views/settings/ChangeDisplayName.js | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/components/views/settings/ChangeDisplayName.js b/src/components/views/settings/ChangeDisplayName.js index a74e223349..238fd9c2c3 100644 --- a/src/components/views/settings/ChangeDisplayName.js +++ b/src/components/views/settings/ChangeDisplayName.js @@ -1,5 +1,6 @@ /* Copyright 2015, 2016 OpenMarket Ltd +Copyright 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,21 +24,14 @@ import { _t } from '../../../languageHandler'; module.exports = React.createClass({ displayName: 'ChangeDisplayName', - _getDisplayName: function() { + _getDisplayName: async function() { const cli = MatrixClientPeg.get(); - return cli.getProfileInfo(cli.credentials.userId).then(function(result) { - let displayname = result.displayname; - if (!displayname) { - if (MatrixClientPeg.get().isGuest()) { - displayname = "Guest " + MatrixClientPeg.get().getUserIdLocalpart(); - } else { - displayname = MatrixClientPeg.get().getUserIdLocalpart(); - } - } - return displayname; - }, function(error) { + try { + const res = await cli.getProfileInfo(cli.getUserId()); + return res.displayname; + } catch (e) { throw new Error("Failed to fetch display name"); - }); + } }, _changeDisplayName: function(new_displayname) { From 9fa7cb863567db08bda30bbff6351dd5a7cbc977 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 19 Jun 2018 07:57:28 +0100 Subject: [PATCH 175/283] delint Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/settings/ChangeDisplayName.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/components/views/settings/ChangeDisplayName.js b/src/components/views/settings/ChangeDisplayName.js index 238fd9c2c3..afe1521f0f 100644 --- a/src/components/views/settings/ChangeDisplayName.js +++ b/src/components/views/settings/ChangeDisplayName.js @@ -15,10 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. */ -'use strict'; -const React = require('react'); -const sdk = require('../../../index'); -const MatrixClientPeg = require("../../../MatrixClientPeg"); +import React from 'react'; +import sdk from '../../../index'; +import MatrixClientPeg from '../../../MatrixClientPeg'; import { _t } from '../../../languageHandler'; module.exports = React.createClass({ @@ -34,10 +33,10 @@ module.exports = React.createClass({ } }, - _changeDisplayName: function(new_displayname) { + _changeDisplayName: function(newDisplayname) { const cli = MatrixClientPeg.get(); - return cli.setDisplayName(new_displayname).catch(function(e) { - throw new Error("Failed to set display name"); + return cli.setDisplayName(newDisplayname).catch(function(e) { + throw new Error("Failed to set display name", e); }); }, From fffb8379d8e2c4c9abefb242624ffd045a25672e Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 19 Jun 2018 08:37:11 +0100 Subject: [PATCH 176/283] delint MImageBody, fixes anonymous class and hyphenated style keys which made react cry Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/messages/MImageBody.js | 25 +++++++++------------ 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index 1b6bdeb588..e2ff697e55 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -1,6 +1,7 @@ /* Copyright 2015, 2016 OpenMarket Ltd Copyright 2018 New Vector Ltd +Copyright 2018 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. @@ -15,8 +16,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -'use strict'; - import React from 'react'; import PropTypes from 'prop-types'; import { MatrixClient } from 'matrix-js-sdk'; @@ -29,9 +28,7 @@ import Promise from 'bluebird'; import { _t } from '../../../languageHandler'; import SettingsStore from "../../../settings/SettingsStore"; -export default class extends React.Component { - displayName: 'MImageBody' - +export default class MImageBody extends React.Component { static propTypes = { /* the MatrixEvent to show */ mxEvent: PropTypes.object.isRequired, @@ -41,11 +38,11 @@ export default class extends React.Component { /* the maximum image height to use */ maxImageHeight: PropTypes.number, - } + }; static contextTypes = { matrixClient: PropTypes.instanceOf(MatrixClient), - } + }; constructor(props) { super(props); @@ -90,7 +87,7 @@ export default class extends React.Component { } onClick(ev) { - if (ev.button == 0 && !ev.metaKey) { + if (ev.button === 0 && !ev.metaKey) { ev.preventDefault(); const content = this.props.mxEvent.getContent(); const httpUrl = this._getContentUrl(); @@ -177,9 +174,7 @@ export default class extends React.Component { return this.state.decryptedThumbnailUrl; } return this.state.decryptedUrl; - } else if (content.info && - content.info.mimetype == "image/svg+xml" && - content.info.thumbnail_url) { + } else if (content.info && content.info.mimetype === "image/svg+xml" && content.info.thumbnail_url) { // special case to return client-generated thumbnails for SVGs, if any, // given we deliberately don't thumbnail them serverside to prevent // billion lol attacks and similar @@ -299,7 +294,7 @@ export default class extends React.Component { // which has the same width as the timeline // mx_MImageBody_thumbnail resizes img to exactly container size img = {content.body} +
    { /* Calculate aspect ratio, using %padding will size _container correctly */ } -
    +
    { showPlaceholder &&
    { placeholder } From 6200c147a6165dd2543765720b5f19c5d539de68 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 19 Jun 2018 08:41:24 +0100 Subject: [PATCH 177/283] Upload File confirmation modal steals focus, send it back to composer Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/RoomView.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index 97e575ff4e..4beafb099c 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -913,6 +913,8 @@ module.exports = React.createClass({ }, uploadFile: async function(file) { + dis.dispatch({action: 'focus_composer'}); + if (MatrixClientPeg.get().isGuest()) { dis.dispatch({action: 'view_set_mxid'}); return; From 72f50a8c61e279829c89ec9264894afd0de8d44d Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 19 Jun 2018 11:51:06 +0100 Subject: [PATCH 178/283] rewrite group permalinks in also Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/HtmlUtils.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js index 7ca404be31..4f66468373 100644 --- a/src/HtmlUtils.js +++ b/src/HtmlUtils.js @@ -216,10 +216,16 @@ const sanitizeHtmlParams = { m = attribs.href.match(linkifyMatrix.MATRIXTO_URL_PATTERN); if (m) { const entity = m[1]; - if (entity[0] === '@') { - attribs.href = '#/user/' + entity; - } else if (entity[0] === '#' || entity[0] === '!') { - attribs.href = '#/room/' + entity; + switch (entity[0]) { + case '@': + attribs.href = '#/user/' + entity; + break; + case '+': + attribs.href = '#/group/' + entity; + break; + case '#': case '!': + attribs.href = '#/room/' + entity; + break; } delete attribs.target; } From b79cd205a06fed509544e4d927aa0e01fe0a26fb Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 19 Jun 2018 11:52:48 +0100 Subject: [PATCH 179/283] Support autocompleting Communities Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/autocomplete/Autocompleter.js | 4 +- src/autocomplete/CommunityProvider.js | 122 ++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 src/autocomplete/CommunityProvider.js diff --git a/src/autocomplete/Autocompleter.js b/src/autocomplete/Autocompleter.js index 3d30363d9f..6ad90eaebe 100644 --- a/src/autocomplete/Autocompleter.js +++ b/src/autocomplete/Autocompleter.js @@ -1,6 +1,6 @@ /* Copyright 2016 Aviral Dasgupta -Copyright 2017 New Vector Ltd +Copyright 2017, 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ limitations under the License. import type {Component} from 'react'; import CommandProvider from './CommandProvider'; +import CommunityProvider from './CommunityProvider'; import DuckDuckGoProvider from './DuckDuckGoProvider'; import RoomProvider from './RoomProvider'; import UserProvider from './UserProvider'; @@ -47,6 +48,7 @@ const PROVIDERS = [ EmojiProvider, NotifProvider, CommandProvider, + CommunityProvider, DuckDuckGoProvider, ]; diff --git a/src/autocomplete/CommunityProvider.js b/src/autocomplete/CommunityProvider.js new file mode 100644 index 0000000000..db4d52fae2 --- /dev/null +++ b/src/autocomplete/CommunityProvider.js @@ -0,0 +1,122 @@ +/* +Copyright 2018 New Vector 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 React from 'react'; +import { _t } from '../languageHandler'; +import AutocompleteProvider from './AutocompleteProvider'; +import MatrixClientPeg from '../MatrixClientPeg'; +import FuzzyMatcher from './FuzzyMatcher'; +import {PillCompletion} from './Components'; +import sdk from '../index'; +import _sortBy from 'lodash/sortBy'; +import {makeGroupPermalink} from "../matrix-to"; +import type {Completion, SelectionRange} from "./Autocompleter"; +import FlairStore from "../stores/FlairStore"; + +const COMMUNITY_REGEX = /(?=\+)(\S*)/g; + +function score(query, space) { + const index = space.indexOf(query); + if (index === -1) { + return Infinity; + } else { + return index; + } +} + +export default class CommunityProvider extends AutocompleteProvider { + constructor() { + super(COMMUNITY_REGEX); + this.matcher = new FuzzyMatcher([], { + keys: ['groupId', 'name', 'shortDescription'], + }); + } + + async getCompletions(query: string, selection: SelectionRange, force?: boolean = false): Array { + const BaseAvatar = sdk.getComponent('views.avatars.BaseAvatar'); + + // Disable autocompletions when composing commands because of various issues + // (see https://github.com/vector-im/riot-web/issues/4762) + if (/^(\/join|\/leave)/.test(query)) { + return []; + } + + const cli = MatrixClientPeg.get(); + let completions = []; + const {command, range} = this.getCurrentCommand(query, selection, force); + if (command) { + const joinedGroups = cli.getGroups().filter(({myMembership}) => myMembership !== 'invite'); + + const groups = (await Promise.all(joinedGroups.map(async ({avatarUrl, groupId, name=''}) => { + try { + return FlairStore.getGroupProfileCached(cli, groupId); + } catch (e) { // if FlairStore failed, rely on js-sdk's store which lacks info + return Promise.resolve({ + name, + groupId, + avatarUrl, + shortDescription: '', // js-sdk doesn't store this + }); + } + }))); + + this.matcher.setObjects(groups); + // this.matcher.setObjects(joinedGroups); + // this.matcher.setObjects(joinedGroups.map(({groupId}) => { + // const groupProfile = GroupStore.getSummary(groupId).profile; + // if (groupProfile) { + // return { + // groupId, + // name: groupProfile.name || '', + // avatarUrl: groupProfile.avatar_url, + // }; + // } + // })).filter(Boolean); + + const matchedString = command[0]; + completions = this.matcher.match(matchedString); + completions = _sortBy(completions, [ + (c) => score(matchedString, c.groupId), + (c) => c.groupId.length, + ]).map(({avatarUrl, groupId, name}) => ({ + completion: groupId, + suffix: ' ', + href: makeGroupPermalink(groupId), + component: ( + + } title={name} description={groupId} /> + ), + range, + })) + .filter((completion) => !!completion.completion && completion.completion.length > 0) + .slice(0, 4); + } + return completions; + } + + getName() { + return '💬 ' + _t('Communities'); + } + + renderCompletions(completions: [React.Component]): ?React.Component { + return
    + { completions } +
    ; + } +} From c1e608f1a83f359f21859a84aae7247ea32b89d1 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 19 Jun 2018 11:53:17 +0100 Subject: [PATCH 180/283] show permalinks to communities as Pills Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/css/views/elements/_RichText.scss | 5 +++- src/components/views/elements/Pill.js | 37 ++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss index 474a123455..eda9f6a4de 100644 --- a/res/css/views/elements/_RichText.scss +++ b/res/css/views/elements/_RichText.scss @@ -4,6 +4,7 @@ .mx_UserPill, .mx_RoomPill, +.mx_GroupPill, .mx_AtRoomPill { border-radius: 16px; display: inline-block; @@ -13,7 +14,8 @@ } .mx_EventTile_body .mx_UserPill, -.mx_EventTile_body .mx_RoomPill { +.mx_EventTile_body .mx_RoomPill, +.mx_EventTile_body .mx_GroupPill { cursor: pointer; } @@ -43,6 +45,7 @@ .mx_UserPill .mx_BaseAvatar, .mx_RoomPill .mx_BaseAvatar, +.mx_GroupPill .mx_BaseAvatar, .mx_AtRoomPill .mx_BaseAvatar { position: relative; left: -3px; diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js index 7e5ad379de..70e1d0659a 100644 --- a/src/components/views/elements/Pill.js +++ b/src/components/views/elements/Pill.js @@ -1,5 +1,6 @@ /* Copyright 2017 Vector Creations Ltd +Copyright 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,12 +23,13 @@ import PropTypes from 'prop-types'; import MatrixClientPeg from '../../../MatrixClientPeg'; import { MATRIXTO_URL_PATTERN } from '../../../linkify-matrix'; import { getDisplayAliasForRoom } from '../../../Rooms'; +import FlairStore from "../../../stores/FlairStore"; const REGEX_MATRIXTO = new RegExp(MATRIXTO_URL_PATTERN); // For URLs of matrix.to links in the timeline which have been reformatted by // HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`) -const REGEX_LOCAL_MATRIXTO = /^#\/(?:user|room)\/(([\#\!\@\+])[^\/]*)$/; +const REGEX_LOCAL_MATRIXTO = /^#\/(?:user|room|group)\/(([#!@+])[^\/]*)$/; const Pill = React.createClass({ statics: { @@ -45,6 +47,7 @@ const Pill = React.createClass({ }, TYPE_USER_MENTION: 'TYPE_USER_MENTION', TYPE_ROOM_MENTION: 'TYPE_ROOM_MENTION', + TYPE_GROUP_MENTION: 'TYPE_GROUP_MENTION', TYPE_AT_ROOM_MENTION: 'TYPE_AT_ROOM_MENTION', // '@room' mention }, @@ -81,12 +84,14 @@ const Pill = React.createClass({ // The member related to the user pill member: null, + // The group related to the group pill + group: null, // The room related to the room pill room: null, }; }, - componentWillReceiveProps(nextProps) { + async componentWillReceiveProps(nextProps) { let regex = REGEX_MATRIXTO; if (nextProps.inMessage) { regex = REGEX_LOCAL_MATRIXTO; @@ -109,9 +114,11 @@ const Pill = React.createClass({ '@': Pill.TYPE_USER_MENTION, '#': Pill.TYPE_ROOM_MENTION, '!': Pill.TYPE_ROOM_MENTION, + '+': Pill.TYPE_GROUP_MENTION, }[prefix]; let member; + let group; let room; switch (pillType) { case Pill.TYPE_AT_ROOM_MENTION: { @@ -140,8 +147,17 @@ const Pill = React.createClass({ } } break; + case Pill.TYPE_GROUP_MENTION: { + const cli = MatrixClientPeg.get(); + + try { + group = await FlairStore.getGroupProfileCached(cli, resourceId); + } catch (e) { // if FlairStore failed, rely on js-sdk's store which lacks info + group = cli.getGroup(resourceId); + } + } } - this.setState({resourceId, pillType, member, room}); + this.setState({resourceId, pillType, member, group, room}); }, componentWillMount() { @@ -179,6 +195,7 @@ const Pill = React.createClass({ }); }, render: function() { + const BaseAvatar = sdk.getComponent('views.avatars.BaseAvatar'); const MemberAvatar = sdk.getComponent('avatars.MemberAvatar'); const RoomAvatar = sdk.getComponent('avatars.RoomAvatar'); @@ -229,6 +246,20 @@ const Pill = React.createClass({ } } break; + case Pill.TYPE_GROUP_MENTION: { + if (this.state.group) { + const {avatarUrl, groupId, name} = this.state.group; + const cli = MatrixClientPeg.get(); + + linkText = groupId; + if (this.props.shouldShowPillAvatar) { + avatar = ; + } + pillClass = 'mx_RoomPill' || 'mx_GroupPill'; + } + } + break; } const classes = classNames(pillClass, { From 287745f8c6315c7f5a8183f5e24142e249cb3379 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 19 Jun 2018 12:06:13 +0100 Subject: [PATCH 181/283] delint, remove unused imports and fix flow annotations Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/autocomplete/AutocompleteProvider.js | 14 +++++++------- src/autocomplete/Autocompleter.js | 3 ++- src/autocomplete/CommandProvider.js | 4 ++-- src/autocomplete/DuckDuckGoProvider.js | 5 +++-- src/autocomplete/EmojiProvider.js | 8 ++++---- src/autocomplete/NotifProvider.js | 3 ++- src/autocomplete/RoomProvider.js | 5 +++-- src/autocomplete/UserProvider.js | 8 ++++---- 8 files changed, 27 insertions(+), 23 deletions(-) diff --git a/src/autocomplete/AutocompleteProvider.js b/src/autocomplete/AutocompleteProvider.js index c93ae4fb2a..3fdb2998e7 100644 --- a/src/autocomplete/AutocompleteProvider.js +++ b/src/autocomplete/AutocompleteProvider.js @@ -1,7 +1,7 @@ /* Copyright 2016 Aviral Dasgupta Copyright 2017 Vector Creations Ltd -Copyright 2017 New Vector Ltd +Copyright 2017, 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ export default class AutocompleteProvider { /** * Of the matched commands in the query, returns the first that contains or is contained by the selection, or null. */ - getCurrentCommand(query: string, selection: {start: number, end: number}, force: boolean = false): ?string { + getCurrentCommand(query: string, selection: SelectionRange, force: boolean = false): ?string { let commandRegex = this.commandRegex; if (force && this.shouldForceComplete()) { @@ -51,14 +51,14 @@ export default class AutocompleteProvider { let match; while ((match = commandRegex.exec(query)) != null) { - let matchStart = match.index, - matchEnd = matchStart + match[0].length; - if (selection.start <= matchEnd && selection.end >= matchStart) { + const start = match.index; + const end = start + match[0].length; + if (selection.start <= end && selection.end >= start) { return { command: match, range: { - start: matchStart, - end: matchEnd, + start, + end, }, }; } diff --git a/src/autocomplete/Autocompleter.js b/src/autocomplete/Autocompleter.js index 6ad90eaebe..f5fec4c502 100644 --- a/src/autocomplete/Autocompleter.js +++ b/src/autocomplete/Autocompleter.js @@ -18,6 +18,7 @@ limitations under the License. // @flow import type {Component} from 'react'; +import {Room} from 'matrix-js-sdk'; import CommandProvider from './CommandProvider'; import CommunityProvider from './CommunityProvider'; import DuckDuckGoProvider from './DuckDuckGoProvider'; @@ -56,7 +57,7 @@ const PROVIDERS = [ const PROVIDER_COMPLETION_TIMEOUT = 3000; export default class Autocompleter { - constructor(room) { + constructor(room: Room) { this.room = room; this.providers = PROVIDERS.map((p) => { return new p(room); diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js index b162f2f92a..5e96e612c2 100644 --- a/src/autocomplete/CommandProvider.js +++ b/src/autocomplete/CommandProvider.js @@ -22,7 +22,7 @@ import { _t, _td } from '../languageHandler'; import AutocompleteProvider from './AutocompleteProvider'; import FuzzyMatcher from './FuzzyMatcher'; import {TextualCompletion} from './Components'; -import type {SelectionRange} from "./Autocompleter"; +import type {Completion, SelectionRange} from "./Autocompleter"; // TODO merge this with the factory mechanics of SlashCommands? // Warning: Since the description string will be translated in _t(result.description), all these strings below must be in i18n/strings/en_EN.json file @@ -124,7 +124,7 @@ export default class CommandProvider extends AutocompleteProvider { }); } - async getCompletions(query: string, selection: SelectionRange, force?: boolean) { + async getCompletions(query: string, selection: SelectionRange, force?: boolean): Array { const {command, range} = this.getCurrentCommand(query, selection); if (!command) return []; diff --git a/src/autocomplete/DuckDuckGoProvider.js b/src/autocomplete/DuckDuckGoProvider.js index 68d4915f56..e25ef16428 100644 --- a/src/autocomplete/DuckDuckGoProvider.js +++ b/src/autocomplete/DuckDuckGoProvider.js @@ -1,7 +1,7 @@ /* Copyright 2016 Aviral Dasgupta Copyright 2017 Vector Creations Ltd -Copyright 2017 New Vector Ltd +Copyright 2017, 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ import AutocompleteProvider from './AutocompleteProvider'; import 'whatwg-fetch'; import {TextualCompletion} from './Components'; +import type {SelectionRange} from "./Autocompleter"; const DDG_REGEX = /\/ddg\s+(.+)$/g; const REFERRER = 'vector'; @@ -36,7 +37,7 @@ export default class DuckDuckGoProvider extends AutocompleteProvider { + `&format=json&no_redirect=1&no_html=1&t=${encodeURIComponent(REFERRER)}`; } - async getCompletions(query: string, selection: {start: number, end: number}) { + async getCompletions(query: string, selection: SelectionRange, force?: boolean = false) { const {command, range} = this.getCurrentCommand(query, selection); if (!query || !command) { return []; diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.js index f4e576ea0f..81f6144fd3 100644 --- a/src/autocomplete/EmojiProvider.js +++ b/src/autocomplete/EmojiProvider.js @@ -1,7 +1,7 @@ /* Copyright 2016 Aviral Dasgupta Copyright 2017 Vector Creations Ltd -Copyright 2017 New Vector Ltd +Copyright 2017, 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,11 +19,11 @@ limitations under the License. import React from 'react'; import { _t } from '../languageHandler'; import AutocompleteProvider from './AutocompleteProvider'; -import {emojioneList, shortnameToImage, shortnameToUnicode, asciiRegexp, unicodeRegexp} from 'emojione'; +import {shortnameToUnicode, asciiRegexp, unicodeRegexp} from 'emojione'; import FuzzyMatcher from './FuzzyMatcher'; import sdk from '../index'; import {PillCompletion} from './Components'; -import type {SelectionRange, Completion} from './Autocompleter'; +import type {Completion, SelectionRange} from './Autocompleter'; import _uniq from 'lodash/uniq'; import _sortBy from 'lodash/sortBy'; import SettingsStore from "../settings/SettingsStore"; @@ -95,7 +95,7 @@ export default class EmojiProvider extends AutocompleteProvider { }); } - async getCompletions(query: string, selection: SelectionRange) { + async getCompletions(query: string, selection: SelectionRange, force?: boolean): Array { if (SettingsStore.getValue("MessageComposerInput.dontSuggestEmoji")) { return []; // don't give any suggestions if the user doesn't want them } diff --git a/src/autocomplete/NotifProvider.js b/src/autocomplete/NotifProvider.js index b7ac645525..842fb4fb18 100644 --- a/src/autocomplete/NotifProvider.js +++ b/src/autocomplete/NotifProvider.js @@ -20,6 +20,7 @@ import { _t } from '../languageHandler'; import MatrixClientPeg from '../MatrixClientPeg'; import {PillCompletion} from './Components'; import sdk from '../index'; +import type {Completion, SelectionRange} from "./Autocompleter"; const AT_ROOM_REGEX = /@\S*/g; @@ -29,7 +30,7 @@ export default class NotifProvider extends AutocompleteProvider { this.room = room; } - async getCompletions(query: string, selection: {start: number, end: number}, force = false) { + async getCompletions(query: string, selection: SelectionRange, force?:boolean = false): Array { const RoomAvatar = sdk.getComponent('views.avatars.RoomAvatar'); const client = MatrixClientPeg.get(); diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js index 31599703c2..c222ae95d4 100644 --- a/src/autocomplete/RoomProvider.js +++ b/src/autocomplete/RoomProvider.js @@ -1,7 +1,7 @@ /* Copyright 2016 Aviral Dasgupta Copyright 2017 Vector Creations Ltd -Copyright 2017 New Vector Ltd +Copyright 2017, 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import {getDisplayAliasForRoom} from '../Rooms'; import sdk from '../index'; import _sortBy from 'lodash/sortBy'; import {makeRoomPermalink} from "../matrix-to"; +import type {Completion, SelectionRange} from "./Autocompleter"; const ROOM_REGEX = /(?=#)(\S*)/g; @@ -46,7 +47,7 @@ export default class RoomProvider extends AutocompleteProvider { }); } - async getCompletions(query: string, selection: {start: number, end: number}, force = false) { + async getCompletions(query: string, selection: SelectionRange, force?: boolean = false): Array { const RoomAvatar = sdk.getComponent('views.avatars.RoomAvatar'); // Disable autocompletions when composing commands because of various issues diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js index ce8f1020a1..85837d5ebb 100644 --- a/src/autocomplete/UserProvider.js +++ b/src/autocomplete/UserProvider.js @@ -2,7 +2,7 @@ /* Copyright 2016 Aviral Dasgupta Copyright 2017 Vector Creations Ltd -Copyright 2017 New Vector Ltd +Copyright 2017, 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,12 +23,12 @@ import AutocompleteProvider from './AutocompleteProvider'; import {PillCompletion} from './Components'; import sdk from '../index'; import FuzzyMatcher from './FuzzyMatcher'; -import _pull from 'lodash/pull'; import _sortBy from 'lodash/sortBy'; import MatrixClientPeg from '../MatrixClientPeg'; import type {Room, RoomMember} from 'matrix-js-sdk'; import {makeUserPermalink} from "../matrix-to"; +import type {SelectionRange} from "./Autocompleter"; const USER_REGEX = /@\S*/g; @@ -36,7 +36,7 @@ export default class UserProvider extends AutocompleteProvider { users: Array = null; room: Room = null; - constructor(room) { + constructor(room: Room) { super(USER_REGEX, { keys: ['name'], }); @@ -87,7 +87,7 @@ export default class UserProvider extends AutocompleteProvider { this.users = null; } - async getCompletions(query: string, selection: {start: number, end: number}, force = false) { + async getCompletions(query: string, selection: SelectionRange, force?: boolean = false) { const MemberAvatar = sdk.getComponent('views.avatars.MemberAvatar'); // Disable autocompletions when composing commands because of various issues From 5cc15b2e0325bdf5f20f580c5666c851055ad29c Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 19 Jun 2018 19:11:22 +0100 Subject: [PATCH 182/283] add additional classes which protect the text from overflowing Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/groups/GroupInviteTile.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js index 25dba130f9..7c471cca2e 100644 --- a/src/components/views/groups/GroupInviteTile.js +++ b/src/components/views/groups/GroupInviteTile.js @@ -125,9 +125,7 @@ export default React.createClass({ const av = ; - const nameClasses = classNames({ - 'mx_RoomTile_name': true, - 'mx_RoomTile_invite': this.props.isInvite, + const nameClasses = classNames('mx_RoomTile_name mx_RoomTile_invite mx_RoomTile_badgeShown', { 'mx_RoomTile_badgeShown': this.state.badgeHover || this.state.menuDisplayed, }); From e67dae704ab7dc2ba1809a7ed5c2d35350ff96e5 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 20 Jun 2018 09:57:11 +0100 Subject: [PATCH 183/283] Take replies out of labs! --- .../views/context_menus/MessageContextMenu.js | 12 +++++------- src/components/views/elements/ReplyThread.js | 2 +- src/components/views/messages/TextualBody.js | 3 +-- src/components/views/rooms/MessageComposerInput.js | 2 +- src/settings/Settings.js | 6 ------ 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js index bdd267c4ee..59cdb61fd6 100644 --- a/src/components/views/context_menus/MessageContextMenu.js +++ b/src/components/views/context_menus/MessageContextMenu.js @@ -253,13 +253,11 @@ module.exports = React.createClass({
    ); - if (SettingsStore.isFeatureEnabled("feature_rich_quoting")) { - replyButton = ( -
    - { _t('Reply') } -
    - ); - } + replyButton = ( +
    + { _t('Reply') } +
    + ); if (this.state.canPin) { pinButton = ( diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js index 6714de81a4..f9f3f4ca97 100644 --- a/src/components/views/elements/ReplyThread.js +++ b/src/components/views/elements/ReplyThread.js @@ -160,7 +160,7 @@ export default class ReplyThread extends React.Component { } static makeThread(parentEv, onWidgetLoad, ref) { - if (!SettingsStore.isFeatureEnabled("feature_rich_quoting") || !ReplyThread.getParentEventId(parentEv)) { + if (!ReplyThread.getParentEventId(parentEv)) { return
    ; } return ; diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js index 60377a47d7..20cf2b69f4 100644 --- a/src/components/views/messages/TextualBody.js +++ b/src/components/views/messages/TextualBody.js @@ -423,8 +423,7 @@ module.exports = React.createClass({ const mxEvent = this.props.mxEvent; const content = mxEvent.getContent(); - const stripReply = SettingsStore.isFeatureEnabled("feature_rich_quoting") && - ReplyThread.getParentEventId(mxEvent); + const stripReply = ReplyThread.getParentEventId(mxEvent); let body = HtmlUtils.bodyToHtml(content, this.props.highlights, { disableBigEmoji: SettingsStore.getValue('TextualBody.disableBigEmoji'), // Part of Replies fallback support diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js index 57d433e55c..c59bee641f 100644 --- a/src/components/views/rooms/MessageComposerInput.js +++ b/src/components/views/rooms/MessageComposerInput.js @@ -1181,7 +1181,7 @@ export default class MessageComposerInput extends React.Component { return (
    - { SettingsStore.isFeatureEnabled("feature_rich_quoting") && } + this.autocomplete = e} room={this.props.room} diff --git a/src/settings/Settings.js b/src/settings/Settings.js index 039bd78d79..40bb2dd57e 100644 --- a/src/settings/Settings.js +++ b/src/settings/Settings.js @@ -76,12 +76,6 @@ export const SETTINGS = { // // level is always appended to the end. // supportedLevelsAreOrdered: false, // }, - "feature_rich_quoting": { - isFeature: true, - displayName: _td("Message Replies"), - supportedLevels: LEVELS_FEATURE, - default: false, - }, "feature_pinning": { isFeature: true, displayName: _td("Message Pinning"), From 0e8b4ac2ad472cab7ad2f40a9d5424f285c56023 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 20 Jun 2018 10:01:09 +0100 Subject: [PATCH 184/283] i18n & prunei18n --- src/i18n/strings/bg.json | 5 --- src/i18n/strings/ca.json | 5 --- src/i18n/strings/cs.json | 5 --- src/i18n/strings/da.json | 2 - src/i18n/strings/de_DE.json | 5 --- src/i18n/strings/el.json | 2 - src/i18n/strings/en_EN.json | 73 ++++++++++++++++------------------- src/i18n/strings/en_US.json | 2 - src/i18n/strings/eo.json | 5 --- src/i18n/strings/es.json | 2 - src/i18n/strings/eu.json | 5 --- src/i18n/strings/fi.json | 4 -- src/i18n/strings/fr.json | 5 --- src/i18n/strings/gl.json | 5 --- src/i18n/strings/hu.json | 5 --- src/i18n/strings/it.json | 5 --- src/i18n/strings/ko.json | 2 - src/i18n/strings/lv.json | 5 --- src/i18n/strings/nl.json | 5 --- src/i18n/strings/pl.json | 2 - src/i18n/strings/pt.json | 2 - src/i18n/strings/pt_BR.json | 5 --- src/i18n/strings/ru.json | 5 --- src/i18n/strings/sk.json | 5 --- src/i18n/strings/sq.json | 2 - src/i18n/strings/sr.json | 5 --- src/i18n/strings/sv.json | 5 --- src/i18n/strings/th.json | 1 - src/i18n/strings/tr.json | 2 - src/i18n/strings/zh_Hans.json | 5 --- src/i18n/strings/zh_Hant.json | 5 --- 31 files changed, 34 insertions(+), 157 deletions(-) diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json index 0b1305f3e8..f3c12edecb 100644 --- a/src/i18n/strings/bg.json +++ b/src/i18n/strings/bg.json @@ -136,7 +136,6 @@ "Missing room_id in request": "Липсва room_id в заявката", "Room %(roomId)s not visible": "Стая %(roomId)s не е видима", "Missing user_id in request": "Липсва user_id в заявката", - "Failed to lookup current room": "Неуспешно намиране на текущата стая", "/ddg is not a command": "/ddg не е команда", "To use it, just wait for autocomplete results to load and tab through them.": "За използване, изчакайте зареждането на списъка с предложения и изберете от него.", "Unrecognised room alias:": "Непознат псевдоним на стая:", @@ -206,7 +205,6 @@ "Failed to join room": "Неуспешно присъединяване към стаята", "Message Replies": "Отговори на съобщението", "Message Pinning": "Функция за закачане на съобщения", - "Tag Panel": "Панел с етикети", "Disable Emoji suggestions while typing": "Изключване на предложенията за емотиконите при писане", "Use compact timeline layout": "Използване на компактно оформление за списъка със съобщения", "Hide removed messages": "Скриване на премахнати съобщения", @@ -491,7 +489,6 @@ "Decrypt %(text)s": "Разшифровай %(text)s", "Download %(text)s": "Изтегли %(text)s", "(could not connect media)": "(неуспешно свързване на медийните устройства)", - "Must be viewing a room": "Трябва да извършите това в стая", "Usage": "Употреба", "Remove from community": "Премахни от общността", "Disinvite this user from community?": "Оттегляне на поканата към този потребител от общността?", @@ -520,8 +517,6 @@ "Community %(groupId)s not found": "Общност %(groupId)s не е намерена", "Create a new community": "Създаване на нова общност", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Създайте общност, за да групирате потребители и стаи! Изградете персонализирана начална страница, за да маркирате своето пространство в Matrix Вселената.", - "Join an existing community": "Присъединяване към съществуваща общност", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "За да се присъедините към вече съществуваща общност, трябва да знаете нейния идентификатор; той изглежда нещо подобно на +example:matrix.org.", "Unknown (user, device) pair:": "Непозната двойка (потребител, устройство):", "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Подписващият ключ, който сте предоставили, съвпада с подписващия ключ, който сте получили от устройството %(deviceId)s на %(userId)s. Устройството е маркирано като потвърдено.", "Hide avatars in user and room mentions": "Скриване на аватара на потребители и стаи при споменаването им", diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json index bd8452f0ba..5b3732d725 100644 --- a/src/i18n/strings/ca.json +++ b/src/i18n/strings/ca.json @@ -134,10 +134,8 @@ "You are not in this room.": "No heu entrat a aquesta sala.", "You do not have permission to do that in this room.": "No teniu el permís per realitzar aquesta acció en aquesta sala.", "Missing room_id in request": "Falta l'ID de la sala en la vostra sol·licitud", - "Must be viewing a room": "Hauríeu de veure una sala", "Room %(roomId)s not visible": "La sala %(roomId)s no és visible", "Missing user_id in request": "Falta l'ID d'usuari a la vostre sol·licitud", - "Failed to lookup current room": "No s'ha pogut buscar la sala actual", "Usage": "Ús", "/ddg is not a command": "/ddg no és un comandament", "To use it, just wait for autocomplete results to load and tab through them.": "Per utilitzar-lo, simplement espereu que es completin els resultats automàticament i seleccioneu-ne el desitjat.", @@ -213,7 +211,6 @@ "Failed to join room": "No s'ha pogut entrar a la sala", "Message Replies": "Respostes del missatge", "Message Pinning": "Fixació de missatges", - "Tag Panel": "Tauler d'etiquetes", "Disable Emoji suggestions while typing": "Desactiva els suggeriments d'Emoji mentre s'escriu", "Use compact timeline layout": "Utilitza el disseny compacte de la línia de temps", "Hide join/leave messages (invites/kicks/bans unaffected)": "Amaga els missatges d'entrada i sortida (no afecta a les invitacions, expulsions o prohibicions)", @@ -771,8 +768,6 @@ "Error whilst fetching joined communities": "S'ha produït un error en buscar comunitats unides", "Create a new community": "Crea una nova comunitat", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crea una comunitat per agrupar usuaris i sales! Creeu una pàgina d'inici personalitzada per definir el vostre espai a l'univers Matrix.", - "Join an existing community": "Uneix-te a una comunitat existent", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Per unir-se a una comunitat existent, haureu de conèixer l'identificador de la comunitat; això es veurà com +exemple:matrix.org.", "You have no visible notifications": "No teniu cap notificació visible", "Scroll to bottom of page": "Desplaça't fins a la part inferior de la pàgina", "Message not sent due to unknown devices being present": "El missatge no s'ha enviat perquè hi ha dispositius desconeguts presents", diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json index e3ce9dcf08..b7298f80ab 100644 --- a/src/i18n/strings/cs.json +++ b/src/i18n/strings/cs.json @@ -632,9 +632,7 @@ "Show these rooms to non-members on the community page and room list?": "Zobrazovat tyto místnosti na domovské stránce skupiny a v seznamu místností i pro nečleny?", "Restricted": "Omezené", "Missing room_id in request": "V zadání chybí room_id", - "Must be viewing a room": "Musí být zobrazena místnost", "Missing user_id in request": "V zadání chybí user_id", - "Failed to lookup current room": "Nepodařilo se vyhledat aktuální místnost", "(could not connect media)": "(média se nepodařilo spojit)", "%(senderName)s placed a %(callType)s call.": "%(senderName)s uskutečnil %(callType)s hovor.", "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s zpřístupnil budoucí historii místnosti neznámým (%(visibility)s).", @@ -859,8 +857,6 @@ "Error whilst fetching joined communities": "Při získávání vašich skupin se vyskytla chyba", "Create a new community": "Vytvořit novou skupinu", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Vytvořte skupinu s cílem seskupit uživatele a místnosti! Vytvořte si vlastní domovskou stránku a vymezte tak váš prostor ve světe Matrix.", - "Join an existing community": "Vstoupit do existující skupiny", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Aby jste mohli vstoupit do existující skupiny, musíte znát její identifikátor; Měl by vypadat asi takto +priklad:matrix.org.", "You have no visible notifications": "Nejsou dostupná žádná oznámení", "Connectivity to the server has been lost.": "Spojení se serverem bylo přerušené.", "Sent messages will be stored until your connection has returned.": "Odeslané zprávy zůstanou uložené, dokud se spojení znovu neobnoví.", @@ -918,7 +914,6 @@ "Claimed Ed25519 fingerprint key": "Údajný klíč s otiskem prstu Ed25519", "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Tento proces vás provede importem šifrovacích klíčů, které jste si stáhli z jiného Matrix klienta. Po úspěšném naimportování budete v tomto klientovi moci dešifrovat všechny zprávy, které jste mohli dešifrovat v původním klientovi.", "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Stažený soubor je chráněn heslem. Soubor můžete naimportovat pouze pokud zadáte odpovídající heslo.", - "Tag Panel": "Připnout panel", "Call Failed": "Hovor selhal", "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "V této místnosti jsou neznámá zařízení: Pokud budete pokračovat bez jejich ověření, někdo může Váš hovor odposlouchávat.", "Review Devices": "Ověřit zařízení", diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json index 18c30f29bc..e90de5edfc 100644 --- a/src/i18n/strings/da.json +++ b/src/i18n/strings/da.json @@ -193,10 +193,8 @@ "You are not in this room.": "Du er ikke i dette rum.", "You do not have permission to do that in this room.": "Du har ikke tilladelse til at gøre dét i dette rum.", "Missing room_id in request": "Mangler room_id i forespørgsel", - "Must be viewing a room": "Du skal være i gang med at se på rummet", "Room %(roomId)s not visible": "rum %(roomId)s ikke synligt", "Missing user_id in request": "Manglende user_id i forespørgsel", - "Failed to lookup current room": "Kunne ikke slå nuværende rum op", "Usage": "Brug", "/ddg is not a command": "/ddg er ikke en kommando", "To use it, just wait for autocomplete results to load and tab through them.": "For at bruge det skal du bare vente på autocomplete resultaterne indlæser og tab'e igennem dem.", diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index ba31308e3a..6e1fff98c0 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -249,7 +249,6 @@ "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s hat das Thema geändert in \"%(topic)s\".", "/ddg is not a command": "/ddg ist kein Kommando", "%(senderName)s ended the call.": "%(senderName)s hat den Anruf beendet.", - "Failed to lookup current room": "Fehler beim Nachschlagen des Raums", "Failed to send request.": "Anfrage konnte nicht gesendet werden.", "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s von %(fromPowerLevel)s zu %(toPowerLevel)s", "%(senderName)s invited %(targetName)s.": "%(senderName)s hat %(targetName)s eingeladen.", @@ -264,7 +263,6 @@ "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für unbekannt (%(visibility)s).", "Missing room_id in request": "Fehlende room_id in Anfrage", "Missing user_id in request": "Fehlende user_id in Anfrage", - "Must be viewing a room": "Muss einen Raum ansehen", "(not supported by this browser)": "(wird von diesem Browser nicht unterstützt)", "%(senderName)s placed a %(callType)s call.": "%(senderName)s startete einen %(callType)s-Anruf.", "Power level must be positive integer.": "Berechtigungslevel muss eine positive ganze Zahl sein.", @@ -784,8 +782,6 @@ "Failed to load %(groupId)s": "'%(groupId)s' konnte nicht geladen werden", "Error whilst fetching joined communities": "Fehler beim Laden beigetretener Communities", "Create a new community": "Neue Community erstellen", - "Join an existing community": "Einer bestehenden Community beitreten", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Um einer bereits bestehenden Community beitreten zu können, musst dir deren Community-ID bekannt sein. Diese sieht z. B. aus wie +example:matrix.org.", "Your Communities": "Deine Communities", "You're not currently a member of any communities.": "Du gehörst aktuell keiner Community an.", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Erstelle eine Community, um Benutzer und Räume miteinander zu verbinden! Erstelle zusätzlich eine eigene Homepage, um deinen individuellen Bereich im Matrix-Universum zu gestalten.", @@ -950,7 +946,6 @@ "Your homeserver's URL": "Die URL deines Homeservers", "Your identity server's URL": "Die URL deines Identitätsservers", "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s", - "Tag Panel": "Beschriftungsfeld", "Message Replies": "Antworten auf Nachrichten", "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der letze Nutzer mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.", "Community IDs cannot not be empty.": "Community-IDs können nicht leer sein.", diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index b3fecf86a2..74ff66ee13 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -424,7 +424,6 @@ "Failed to ban user": "Δεν ήταν δυνατό ο αποκλεισμός του χρήστη", "Failed to change power level": "Δεν ήταν δυνατή η αλλαγή του επιπέδου δύναμης", "Failed to fetch avatar URL": "Δεν ήταν δυνατή η ανάκτηση της διεύθυνσης εικόνας", - "Failed to lookup current room": "Δεν ήταν δυνατή η εύρεση του τρέχοντος δωματίου", "Failed to unban": "Δεν ήταν δυνατή η άρση του αποκλεισμού", "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s από %(fromPowerLevel)s σε %(toPowerLevel)s", "Guest access is disabled on this Home Server.": "Έχει απενεργοποιηθεί η πρόσβαση στους επισκέπτες σε αυτόν τον διακομιστή.", @@ -447,7 +446,6 @@ "%(senderName)s made future room history visible to unknown (%(visibility)s).": "Ο %(senderName)s έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο άγνωστο (%(visibility)s).", "Missing user_id in request": "Λείπει το user_id στο αίτημα", "Mobile phone number (optional)": "Αριθμός κινητού τηλεφώνου (προαιρετικό)", - "Must be viewing a room": "Πρέπει να βλέπετε ένα δωμάτιο", "Never send encrypted messages to unverified devices from this device": "Να μη γίνει ποτέ αποστολή κρυπτογραφημένων μηνυμάτων σε ανεπιβεβαίωτες συσκευές από αυτή τη συσκευή", "Never send encrypted messages to unverified devices in this room from this device": "Να μη γίνει ποτέ αποστολή κρυπτογραφημένων μηνυμάτων σε ανεπιβεβαίωτες συσκευές, σε αυτό το δωμάτιο, από αυτή τη συσκευή", "not set": "δεν έχει οριστεί", diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 41f67ad9d9..e96fd3b887 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -42,10 +42,6 @@ "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload", "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads", "Upload Failed": "Upload Failed", - "Failure to create room": "Failure to create room", - "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.", - "Send anyway": "Send anyway", - "Send": "Send", "Sun": "Sun", "Mon": "Mon", "Tue": "Tue", @@ -85,7 +81,6 @@ "Failed to invite users to community": "Failed to invite users to community", "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s", "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:", - "Unnamed Room": "Unnamed Room", "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings", "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again", "Unable to enable Notifications": "Unable to enable Notifications", @@ -116,10 +111,8 @@ "You are not in this room.": "You are not in this room.", "You do not have permission to do that in this room.": "You do not have permission to do that in this room.", "Missing room_id in request": "Missing room_id in request", - "Must be viewing a room": "Must be viewing a room", "Room %(roomId)s not visible": "Room %(roomId)s not visible", "Missing user_id in request": "Missing user_id in request", - "Failed to lookup current room": "Failed to lookup current room", "Usage": "Usage", "/ddg is not a command": "/ddg is not a command", "To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.", @@ -184,13 +177,17 @@ "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing", "%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing", "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing", + "Failure to create room": "Failure to create room", + "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.", + "Send anyway": "Send anyway", + "Send": "Send", + "Unnamed Room": "Unnamed Room", "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions", "Not a valid Riot keyfile": "Not a valid Riot keyfile", "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?", "Failed to join room": "Failed to join room", "Message Replies": "Message Replies", "Message Pinning": "Message Pinning", - "Tag Panel": "Tag Panel", "Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing", "Use compact timeline layout": "Use compact timeline layout", "Hide removed messages": "Hide removed messages", @@ -297,29 +294,6 @@ "Off": "Off", "On": "On", "Noisy": "Noisy", - "Invalid alias format": "Invalid alias format", - "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias", - "Invalid address format": "Invalid address format", - "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address", - "not specified": "not specified", - "not set": "not set", - "Remote addresses for this room:": "Remote addresses for this room:", - "Addresses": "Addresses", - "The main address for this room is": "The main address for this room is", - "Local addresses for this room:": "Local addresses for this room:", - "This room has no local addresses": "This room has no local addresses", - "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)", - "Invalid community ID": "Invalid community ID", - "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID", - "Flair": "Flair", - "Showing flair for these communities:": "Showing flair for these communities:", - "This room is not showing flair for any communities": "This room is not showing flair for any communities", - "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)", - "You have enabled URL previews by default.": "You have enabled URL previews by default.", - "You have disabled URL previews by default.": "You have disabled URL previews by default.", - "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.", - "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.", - "URL Previews": "URL Previews", "Cannot add any more widgets": "Cannot add any more widgets", "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.", "Add a widget": "Add a widget", @@ -419,11 +393,11 @@ "numbullet": "numbullet", "Markdown is disabled": "Markdown is disabled", "Markdown is enabled": "Markdown is enabled", + "Unpin Message": "Unpin Message", + "Jump to message": "Jump to message", "No pinned messages.": "No pinned messages.", "Loading...": "Loading...", "Pinned Messages": "Pinned Messages", - "Unpin Message": "Unpin Message", - "Jump to message": "Jump to message", "%(duration)ss": "%(duration)ss", "%(duration)sm": "%(duration)sm", "%(duration)sh": "%(duration)sh", @@ -557,6 +531,29 @@ "Scroll to unread messages": "Scroll to unread messages", "Jump to first unread message.": "Jump to first unread message.", "Close": "Close", + "Invalid alias format": "Invalid alias format", + "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias", + "Invalid address format": "Invalid address format", + "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address", + "not specified": "not specified", + "not set": "not set", + "Remote addresses for this room:": "Remote addresses for this room:", + "Addresses": "Addresses", + "The main address for this room is": "The main address for this room is", + "Local addresses for this room:": "Local addresses for this room:", + "This room has no local addresses": "This room has no local addresses", + "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)", + "Invalid community ID": "Invalid community ID", + "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID", + "Flair": "Flair", + "Showing flair for these communities:": "Showing flair for these communities:", + "This room is not showing flair for any communities": "This room is not showing flair for any communities", + "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)", + "You have enabled URL previews by default.": "You have enabled URL previews by default.", + "You have disabled URL previews by default.": "You have disabled URL previews by default.", + "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.", + "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.", + "URL Previews": "URL Previews", "Sunday": "Sunday", "Monday": "Monday", "Tuesday": "Tuesday", @@ -876,6 +873,10 @@ "Public Chat": "Public Chat", "Custom": "Custom", "Alias (optional)": "Alias (optional)", + "Reject invitation": "Reject invitation", + "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?", + "Unable to reject invite": "Unable to reject invite", + "Reject": "Reject", "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)", "Resend": "Resend", "Cancel Sending": "Cancel Sending", @@ -895,7 +896,6 @@ "Mentions only": "Mentions only", "Leave": "Leave", "Forget": "Forget", - "Reject": "Reject", "Low Priority": "Low Priority", "Direct Chat": "Direct Chat", "View Community": "View Community", @@ -930,7 +930,6 @@ "Failed to upload image": "Failed to upload image", "Failed to update community": "Failed to update community", "Unable to accept invite": "Unable to accept invite", - "Unable to reject invite": "Unable to reject invite", "Unable to join community": "Unable to join community", "Leave Community": "Leave Community", "Leave %(groupName)s?": "Leave %(groupName)s?", @@ -956,8 +955,6 @@ "Failed to load %(groupId)s": "Failed to load %(groupId)s", "Couldn't load home page": "Couldn't load home page", "Login": "Login", - "Reject invitation": "Reject invitation", - "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?", "Failed to reject invitation": "Failed to reject invitation", "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.", "Are you sure you want to leave the room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?", @@ -978,8 +975,6 @@ "Error whilst fetching joined communities": "Error whilst fetching joined communities", "Create a new community": "Create a new community", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.", - "Join an existing community": "Join an existing community", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.", "You have no visible notifications": "You have no visible notifications", "Members": "Members", "%(count)s Members|other": "%(count)s Members", diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json index dcd7366a55..6f0708f0c2 100644 --- a/src/i18n/strings/en_US.json +++ b/src/i18n/strings/en_US.json @@ -135,7 +135,6 @@ "Failed to kick": "Failed to kick", "Failed to leave room": "Failed to leave room", "Failed to load timeline position": "Failed to load timeline position", - "Failed to lookup current room": "Failed to lookup current room", "Failed to mute user": "Failed to mute user", "Failed to reject invite": "Failed to reject invite", "Failed to reject invitation": "Failed to reject invitation", @@ -227,7 +226,6 @@ "Mobile phone number": "Mobile phone number", "Mobile phone number (optional)": "Mobile phone number (optional)", "Moderator": "Moderator", - "Must be viewing a room": "Must be viewing a room", "Mute": "Mute", "Name": "Name", "Never send encrypted messages to unverified devices from this device": "Never send encrypted messages to unverified devices from this device", diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json index 5982871d8f..abcbcd636a 100644 --- a/src/i18n/strings/eo.json +++ b/src/i18n/strings/eo.json @@ -90,10 +90,8 @@ "You are not in this room.": "Vi ne estas en tiu ĉi ĉambro.", "You do not have permission to do that in this room.": "Vi ne havas permeson fari tion en tiu ĉi ĉambro.", "Missing room_id in request": "En peto mankas «room_id»", - "Must be viewing a room": "Necesas vidi ĉambron", "Room %(roomId)s not visible": "Ĉambro %(roomId)s ne videblas", "Missing user_id in request": "En peto mankas «user_id»", - "Failed to lookup current room": "Malsukcesis trovi nunan ĉambron", "Usage": "Uzo", "/ddg is not a command": "/ddg ne estas komando", "To use it, just wait for autocomplete results to load and tab through them.": "Por uzi ĝin, atendu aperon de sugestaj rezultoj, kaj tabu tra ili.", @@ -165,7 +163,6 @@ "Authentication check failed: incorrect password?": "Aŭtentiga kontrolo malsukcesis: ĉu pro malĝusta pasvorto?", "Failed to join room": "Malsukcesis aliĝi al ĉambro", "Message Pinning": "Fikso de mesaĝoj", - "Tag Panel": "Etikeda panelo", "Disable Emoji suggestions while typing": "Malŝalti mienetajn sugestojn dum tajpado", "Use compact timeline layout": "Uzi densan okazordan aranĝon", "Hide removed messages": "Kaŝi forigitajn mesaĝojn", @@ -746,8 +743,6 @@ "Error whilst fetching joined communities": "Okazis eraro dum venigado de viaj komunumoj", "Create a new community": "Krei novan komunumon", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Kreu komunumon por kunigi uzantojn kaj ĉambrojn! Fari propran hejmpaĝon por montri vian spacon en la universo de Matrix.", - "Join an existing community": "Aliĝi al jama komunumo", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Por aliĝi al jama komunumo, vi devos scii ĝian komunuman identigilon; ĝi aspektas proksimume tiel ĉi: +ekzemplo:matrix.org.", "You have no visible notifications": "Neniuj videblaj sciigoj", "Scroll to bottom of page": "Rulumi al susbo de la paĝo", "Message not sent due to unknown devices being present": "Mesaĝoj ne sendiĝis pro ĉeesto de nekonataj aparatoj", diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index e0e3c91bcd..5434c570f7 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -108,7 +108,6 @@ "Failed to kick": "Falló al expulsar", "Failed to leave room": "Falló al dejar la sala", "Failed to load timeline position": "Falló al cargar el historico", - "Failed to lookup current room": "Falló al buscar la actual sala", "Failed to mute user": "Falló al silenciar el usuario", "Failed to reject invite": "Falló al rechazar invitación", "Failed to reject invitation": "Falló al rechazar la invitación", @@ -313,7 +312,6 @@ "Mobile phone number": "Número de teléfono móvil", "Mobile phone number (optional)": "Número de teléfono móvil (opcional)", "Moderator": "Moderador", - "Must be viewing a room": "Debe estar viendo una sala", "Mute": "Silenciar", "%(serverName)s Matrix ID": "%(serverName)s ID de Matrix", "Name": "Nombre", diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index f5367ba4f3..9526e87285 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -140,7 +140,6 @@ "Identity Server is": "Identitate zerbitzaria:", "Mobile phone number (optional)": "Mugikor zenbakia (aukerazkoa)", "Moderator": "Moderatzailea", - "Must be viewing a room": "Gela bat ikusten egon behar da", "Account": "Kontua", "Access Token:": "Sarbide tokena:", "Active call (%(roomName)s)": "Dei aktiboa (%(roomName)s)", @@ -243,7 +242,6 @@ "Failed to kick": "Huts egin du kanporatzean", "Failed to leave room": "Huts egin du gelatik ateratzean", "Failed to load timeline position": "Huts egin du denbora-lerroko puntua kargatzean", - "Failed to lookup current room": "Huts egin du uneko gela bilatzean", "Failed to mute user": "Huts egin du erabiltzailea mututzean", "Failed to reject invite": "Huts egin du gonbidapena baztertzean", "Failed to reject invitation": "Huts egin du gonbidapena baztertzean", @@ -722,7 +720,6 @@ "%(names)s and %(count)s others are typing|one": "%(names)s eta beste bat idazten ari dira", "Send": "Bidali", "Message Pinning": "Mezuak finkatzea", - "Tag Panel": "Etiketen panela", "Hide avatar changes": "Ezkutatu abatar aldaketak", "Hide display name changes": "Ezkutatu pantaila izenen aldaketak", "Disable big emoji in chat": "Desgaitu emoji handiak txatean", @@ -807,7 +804,6 @@ "Old cryptography data detected": "Kriptografia datu zaharrak atzeman dira", "Your Communities": "Zure komunitateak", "Create a new community": "Sortu komunitate berria", - "Join an existing community": "Elkartu badagoen komunitate batetara", "Warning": "Abisua", "Please note you are logging into the %(hs)s server, not matrix.org.": "Kontuan izan %(hs)s zerbitzarira elkartu zarela, ez matrix.org.", "Sign in to get started": "Hasi saioa hasteko", @@ -926,7 +922,6 @@ "Custom of %(powerLevel)s": "%(powerLevel)s pertsonalizatua", "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Riot bertsio zahar batek datuak antzeman dira. Honek bertsio zaharrean muturretik muturrerako zifratzea ez funtzionatzea eragingo du. Azkenaldian bertsio zaharrean bidali edo jasotako zifratutako mezuak agian ezin izango dira deszifratu bertsio honetan. Honek ere Bertsio honekin egindako mezu trukeak huts egitea ekar dezake. Arazoak badituzu, amaitu saioa eta hasi berriro saioa. Mezuen historiala gordetzeko, esportatu eta berriro inportatu zure gakoak.", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Sortu komunitate bat erabiltzaileak eta gelak biltzeko! Sortu zure hasiera orria eta markatu zure espazioa Matrix unibertsoan.", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Bdagoen komunitate batera elkartzeko, komunitatearen identifikatzailea jakin behar duzu; honen antza izango du +adibidea:matrix.org.", "There's no one else here! Would you like to invite others or stop warning about the empty room?": "Ez dago beste inor hemen! Beste batzuk gonbidatu nahi dituzu edo gela hutsik dagoela abisatzeari utzi?", "Light theme": "Itxura argia", "Dark theme": "Itxura iluna", diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json index ebcee3b6c6..d39091b619 100644 --- a/src/i18n/strings/fi.json +++ b/src/i18n/strings/fi.json @@ -450,7 +450,6 @@ "End-to-end encryption is in beta and may not be reliable": "Päästä päähän salaus on vielä testausvaiheessa ja saattaa toimia epävarmasti", "Error: Problem communicating with the given homeserver.": "Virhe: Ongelma yhteydenpidossa kotipalvelimeen.", "Existing Call": "Käynnissä oleva puhelu", - "Failed to lookup current room": "Nykyisen huoneen löytäminen epäonnistui", "Join as voice or video.": "Liity käyttäen ääntä tai videota.", "%(targetName)s joined the room.": "%(targetName)s liittyi huoneeseen.", "%(senderName)s kicked %(targetName)s.": "%(senderName)s poisti käyttäjän %(targetName)s huoneesta.", @@ -458,7 +457,6 @@ "Publish this room to the public in %(domain)s's room directory?": "Julkaise tämä huone domainin %(domain)s huoneluettelossa?", "Missing room_id in request": "room_id puuttuu kyselystä", "Missing user_id in request": "user_id puuttuu kyselystä", - "Must be viewing a room": "Pakko olla huoneessa", "Never send encrypted messages to unverified devices from this device": "Älä koskaa lähetä salattuja viestejä varmentamattomiin laitteisiin tältä laitteelta", "Never send encrypted messages to unverified devices in this room from this device": "Älä koskaa lähetä salattuja viestejä varmentamattomiin laitteisiin tässä huoneessa tältä laitteelta", "New address (e.g. #foo:%(localDomain)s)": "Uusi osoite (esim. #foo:%(localDomain)s)", @@ -789,7 +787,6 @@ "You're not currently a member of any communities.": "Et ole minkään yhteisön jäsen tällä hetkellä.", "Error whilst fetching joined communities": "Virhe ladatessa listaa yhteistöistä joihin olet liittynyt", "Create a new community": "Luo uusi yhteisö", - "Join an existing community": "Liity olemassaolevaan yhteisöön", "Light theme": "Vaalea ulkoasu", "Dark theme": "Tumma ulkoasu", "Status.im theme": "Status.im ulkoasu", @@ -823,7 +820,6 @@ "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s pienoisohjelman lisännyt %(senderName)s", "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s pienoisohjelman poistanut %(senderName)s", "Send": "Lähetä", - "Tag Panel": "Tagit", "Delete %(count)s devices|other": "Poista %(count)s laitetta", "Delete %(count)s devices|one": "Poista laite", "Select devices": "Valitse laitteet", diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index c54975b54d..9e6115b853 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -105,7 +105,6 @@ "Failed to kick": "Échec de l'exclusion", "Failed to leave room": "Échec du départ du salon", "Failed to load timeline position": "Échec du chargement de la position dans l'historique", - "Failed to lookup current room": "Échec de la recherche du salon actuel", "Failed to mute user": "Échec de la mise en sourdine de l'utilisateur", "Failed to reject invite": "Échec du rejet de l'invitation", "Failed to reject invitation": "Échec du rejet de l'invitation", @@ -182,7 +181,6 @@ "Missing user_id in request": "Absence du user_id dans la requête", "Mobile phone number": "Numéro de téléphone mobile", "Moderator": "Modérateur", - "Must be viewing a room": "Doit être en train de visualiser un salon", "%(serverName)s Matrix ID": "%(serverName)s identifiant Matrix", "Name": "Nom", "Never send encrypted messages to unverified devices from this device": "Ne jamais envoyer de message chiffré aux appareils non vérifiés depuis cet appareil", @@ -863,8 +861,6 @@ "Error whilst fetching joined communities": "Erreur lors de l'obtention des communautés rejointes", "Create a new community": "Créer une nouvelle communauté", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Créez une communauté pour grouper des utilisateurs et des salons ! Construisez une page d'accueil personnalisée pour distinguer votre espace dans l'univers Matrix.", - "Join an existing community": "Rejoindre une communauté existante", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Pour rejoindre une communauté existante, vous devrez connaître son identifiant. Cela ressemblera à +exemple:matrix.org.", "Disable Emoji suggestions while typing": "Désactiver les suggestions d'emojis lors de la saisie", "Disable big emoji in chat": "Désactiver les gros emojis dans les discussions", "Mirror local video feed": "Refléter le flux vidéo local", @@ -918,7 +914,6 @@ "Flair will appear if enabled in room settings": "Les badges n'apparaîtront que s'ils sont activés dans les paramètres de chaque salon", "Flair will not appear": "Les badges n'apparaîtront pas", "Display your community flair in rooms configured to show it.": "Sélectionnez les badges dans les paramètres de chaque salon pour les afficher.", - "Tag Panel": "Panneau des étiquettes", "Addresses": "Adresses", "expand": "développer", "collapse": "réduire", diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index aaf84f717d..52feb86b30 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -93,7 +93,6 @@ "You are not in this room.": "Vostede non está en esta sala.", "You do not have permission to do that in this room.": "Non ten permiso para facer eso en esta sala.", "Missing room_id in request": "Falta o room_id na petición", - "Must be viewing a room": "Debería estar vendo unha sala", "Room %(roomId)s not visible": "A sala %(roomId)s non é visible", "Missing user_id in request": "Falata o user_id na petición", "Usage": "Uso", @@ -169,7 +168,6 @@ "Authentication check failed: incorrect password?": "Fallou a comprobación de autenticación: contrasinal incorrecto?", "Failed to join room": "Non se puido unir a sala", "Message Pinning": "Fixando mensaxe", - "Tag Panel": "Panel de etiquetas", "Disable Emoji suggestions while typing": "Deshabilitar a suxestión de Emoji mentras escribe", "Use compact timeline layout": "Utilizar a disposición compacta da liña temporal", "Hide removed messages": "Ocultar mensaxes eliminadas", @@ -752,8 +750,6 @@ "Error whilst fetching joined communities": "Fallo mentras se obtiñas as comunidades unidas", "Create a new community": "Crear unha nova comunidade", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crear unha comunidade para agrupar usuarias e salas! Poña unha páxina de inicio personalizada para destacar o seu lugar no universo Matrix.", - "Join an existing community": "Unirse a unha comunidade existente", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Para unirse a unha comunidade existente deberá coñecer o identificador de esa comunidade; terá un aspecto como +exemplo:matrix.org.", "You have no visible notifications": "Non ten notificacións visibles", "Scroll to bottom of page": "Desplácese ate o final da páxina", "Message not sent due to unknown devices being present": "Non se enviou a mensaxe porque hai dispositivos non coñecidos", @@ -959,7 +955,6 @@ "Failed to set direct chat tag": "Fallo ao establecer etiqueta do chat directo", "Failed to remove tag %(tagName)s from room": "Fallo ao eliminar a etiqueta %(tagName)s da sala", "Failed to add tag %(tagName)s to room": "Fallo ao engadir a etiqueta %(tagName)s a sala", - "Failed to lookup current room": "Fallo ao bloquear a sala actual", "Disable Community Filter Panel": "Deshabilitar o panel de filtro de comunidades", "Your key share request has been sent - please check your other devices for key share requests.": "Enviouse a solicitude de compartir chave - por favor comprobe as peticións de compartir chaves nos seus outros dispositivos.", "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "As peticións de compartir chaves envíanse de xeito automático aos seus outros dispositivos. Si rexeita o obvia estas peticións nos outros dispositivos, pulse aquí para solicitar novamente as chaves para esta sesión.", diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 64d97ece1f..425f03b180 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -168,7 +168,6 @@ "Failed to kick": "Kirúgás nem sikerült", "Failed to leave room": "A szobát nem sikerült elhagyni", "Failed to load timeline position": "Az idővonal pozíciót nem sikerült betölteni", - "Failed to lookup current room": "Az aktuális szoba felkeresése sikertelen", "Failed to mute user": "A felhasználót nem sikerült hallgatásra bírni", "Failed to reject invite": "A meghívót nem sikerült elutasítani", "Failed to reject invitation": "A meghívót nem sikerült elutasítani", @@ -255,7 +254,6 @@ "Mobile phone number": "Mobil telefonszám", "Mobile phone number (optional)": "Mobill telefonszám (opcionális)", "Moderator": "Moderátor", - "Must be viewing a room": "Meg kell nézni a szobát", "%(serverName)s Matrix ID": "%(serverName)s Matrix azonosítóm", "Name": "Név", "Never send encrypted messages to unverified devices from this device": "Soha ne küldj titkosított üzenetet ellenőrizetlen eszközre erről az eszközről", @@ -782,8 +780,6 @@ "This Home server does not support communities": "Ez a saját szerver nem támogatja a közösségeket", "Error whilst fetching joined communities": "Hiba a csatlakozott közösségek betöltésénél", "Create a new community": "Új közösség létrehozása", - "Join an existing community": "Meglévő közösséghez csatlakozás", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Ahhoz hogy csatlakozni tudj egy meglévő közösséghez ismerned kell a közösségi azonosítót ami például így nézhet ki: +pelda:matrix.org.", "example": "példa", "Failed to load %(groupId)s": "Nem sikerült betölteni: %(groupId)s", "Your Communities": "Közösségeid", @@ -918,7 +914,6 @@ "Something went wrong when trying to get your communities.": "Valami nem sikerült a közösségeid elérésénél.", "Display your community flair in rooms configured to show it.": "Közösségi jelvényeid megjelenítése azokban a szobákban ahol ez engedélyezett.", "This homeserver doesn't offer any login flows which are supported by this client.": "Ez a saját szerver egyetlen bejelentkezési metódust sem támogat amit ez a kliens ismer.", - "Tag Panel": "Címke panel", "Addresses": "Címek", "collapse": "becsuk", "expand": "kinyit", diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index 4728ee9106..6a7fa39965 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -160,10 +160,8 @@ "You are not in this room.": "Non sei in questa stanza.", "You do not have permission to do that in this room.": "Non hai l'autorizzazione per farlo in questa stanza.", "Missing room_id in request": "Manca l'id_stanza nella richiesta", - "Must be viewing a room": "Devi vedere una stanza", "Room %(roomId)s not visible": "Stanza %(roomId)s non visibile", "Missing user_id in request": "Manca l'id_utente nella richiesta", - "Failed to lookup current room": "Impossibile cercare la stanza attuale", "Usage": "Utilizzo", "/ddg is not a command": "/ddg non è un comando", "To use it, just wait for autocomplete results to load and tab through them.": "Per usarlo, attendi l'autocompletamento dei risultati e selezionali con tab.", @@ -231,7 +229,6 @@ "Not a valid Riot keyfile": "Non è una chiave di Riot valida", "Authentication check failed: incorrect password?": "Controllo di autenticazione fallito: password sbagliata?", "Failed to join room": "Accesso alla stanza fallito", - "Tag Panel": "Pannello etichette", "Disable Emoji suggestions while typing": "Disattiva i suggerimenti delle emoji durante la digitazione", "Use compact timeline layout": "Usa impaginazione cronologia compatta", "Hide join/leave messages (invites/kicks/bans unaffected)": "Nascondi i messaggi di entrata/uscita (inviti/kick/ban esclusi)", @@ -794,8 +791,6 @@ "Error whilst fetching joined communities": "Errore nella rilevazione delle comunità a cui ti sei unito", "Create a new community": "Crea una nuova comunità", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crea una comunità per raggruppare utenti e stanze! Crea una pagina iniziale personalizzata per stabilire il tuo spazio nell'universo di Matrix.", - "Join an existing community": "Unisciti ad una comunità esistente", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Per unirti ad una comunità esistente devi conoscere il suo identificativo; è qualcosa del tipo +esempio:matrix.org.", "You have no visible notifications": "Non hai alcuna notifica visibile", "Scroll to bottom of page": "Scorri in fondo alla pagina", "Message not sent due to unknown devices being present": "Messaggio non inviato data la presenza di dispositivi sconosciuti", diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json index f0b6e81ba8..23b7efd97d 100644 --- a/src/i18n/strings/ko.json +++ b/src/i18n/strings/ko.json @@ -169,7 +169,6 @@ "Failed to kick": "내쫓지 못했어요", "Failed to leave room": "방을 떠나지 못했어요", "Failed to load timeline position": "타임라인 위치를 불러오지 못했어요", - "Failed to lookup current room": "현재 방을 찾지 못했어요", "Failed to mute user": "사용자의 알림을 끄지 못했어요", "Failed to reject invite": "초대를 거절하지 못했어요", "Failed to reject invitation": "초대를 거절하지 못했어요", @@ -257,7 +256,6 @@ "Mobile phone number": "휴대 전화번호", "Mobile phone number (optional)": "휴대 전화번호 (선택)", "Moderator": "조정자", - "Must be viewing a room": "방을 둘러봐야만 해요", "Name": "이름", "Never send encrypted messages to unverified devices from this device": "이 장치에서 인증받지 않은 장치로 암호화한 메시지를 보내지 마세요", "Never send encrypted messages to unverified devices in this room from this device": "이 장치에서 이 방의 인증받지 않은 장치로 암호화한 메시지를 보내지 마세요", diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json index 91a7de7624..a7458a525f 100644 --- a/src/i18n/strings/lv.json +++ b/src/i18n/strings/lv.json @@ -153,7 +153,6 @@ "Failed to kick": "Neizdevās izspert/padzīt (kick)", "Failed to leave room": "Neizdevās pamest istabu", "Failed to load timeline position": "Neizdevās ielādēt laikpaziņojumu pozīciju", - "Failed to lookup current room": "Neizdevās uziet pašreizējo istabu", "Failed to mute user": "Neizdevās apklusināt lietotāju", "Failed to reject invite": "Neizdevās noraidīt uzaicinājumu", "Failed to reject invitation": "Neizdevās noraidīt uzaicinājumu", @@ -244,7 +243,6 @@ "Mobile phone number": "Mobilā telefona numurs", "Mobile phone number (optional)": "Mobilā telefona numurs (nav obligāts)", "Moderator": "Moderators", - "Must be viewing a room": "Jāapskata istaba", "Mute": "Noklusināt (izslēgt skaņu)", "%(serverName)s Matrix ID": "%(serverName)s Matrix Id", "Name": "Vārds", @@ -721,7 +719,6 @@ "%(names)s and %(count)s others are typing|one": "%(names)s un vēl kāds raksta", "Message Replies": "Atbildes uz ziņām", "Message Pinning": "Ziņu piekabināšana", - "Tag Panel": "Birku panelis", "Disable Emoji suggestions while typing": "Atspējot Emoji ieteikumus teksta rakstīšanas laikā", "Hide avatar changes": "Slēpt avatara izmaiņas", "Hide display name changes": "Slēpt attēlojamā/redzamā vārda izmaiņas", @@ -972,8 +969,6 @@ "Did you know: you can use communities to filter your Riot.im experience!": "Vai zināji: Tu vari izmantot kopienas, lai filtrētu (atlasītu) savu Riot.im pieredzi!", "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Lai uzstādītu filtru, uzvelc kopienas avataru uz filtru paneļa ekrāna kreisajā malā. Lai redzētu tikai istabas un cilvēkus, kas saistīti ar šo kopienu, Tu vari klikšķināt uz avatara filtru panelī jebkurā brīdī.", "Create a new community": "Izveidot jaunu kopienu", - "Join an existing community": "Pievienoties esošai kopienai", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Lai pievienotos esošai kopienai Tev jāzina tā ID; tas izskatīties piemēram šādi +paraugs:matrix.org.", "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Tagadvisas atkārtoti sūtīt vai visas atcelt. Tu vari atzīmēt arī individuālas ziņas, kuras atkārtoti sūtīt vai atcelt.", "Clear filter": "Attīrīt filtru", "Debug Logs Submission": "Iesniegt atutošanas logfailus", diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index d85982a3fc..90be5ee923 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -101,7 +101,6 @@ "OK": "OK", "Failed to change password. Is your password correct?": "Wachtwoord wijzigen mislukt. Is uw wachtwoord juist?", "Moderator": "Moderator", - "Must be viewing a room": "Moet een ruimte weergeven", "%(serverName)s Matrix ID": "%(serverName)s Matrix-ID", "Name": "Naam", "New password": "Nieuw wachtwoord", @@ -238,7 +237,6 @@ "Failed to join room": "Niet gelukt om tot de ruimte toe te treden", "Failed to leave room": "Niet gelukt om de ruimte te verlaten", "Failed to load timeline position": "Niet gelukt om de tijdlijnpositie te laden", - "Failed to lookup current room": "Niet gelukt om de huidige ruimte op te zoeken", "Failed to mute user": "Niet gelukt om de gebruiker te dempen", "Failed to reject invite": "Niet gelukt om de uitnodiging te weigeren", "Failed to reject invitation": "Niet gelukt om de uitnodiging te weigeren", @@ -708,7 +706,6 @@ "Send": "Verstuur", "Message Pinning": "Boodschap vastpinnen", "Message Replies": "Antwoorden op bericht", - "Tag Panel": "Label Paneel", "Disable Emoji suggestions while typing": "Emoji suggesties tijdens het typen uitzetten", "Hide avatar changes": "Avatar veranderingen verbergen", "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s", @@ -927,8 +924,6 @@ "Error whilst fetching joined communities": "Er is een fout opgetreden tijdens het ophalen van de gemeenschappen waar je lid van bent", "Create a new community": "Maak een nieuwe gemeenschap aan", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Maak een gemeenschap aan om gebruikers en ruimtes samen te groeperen! Bouw een aangepaste homepagina om je eigen plek in het Matrix universum te maken.", - "Join an existing community": "Treed tot een bestaande gemeenschap toe", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Je moet het gemeenschaps-ID weten om tot de gemeenschap toe te treden; dit zal er uitzien zoals +voorbeeld:matrix.org.", "Show devices, send anyway or cancel.": "Toon apparaten, Toch versturen of annuleren.", "%(count)s of your messages have not been sent.|one": "Je bericht was niet verstuurd.", "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Nu alles opnieuw versturen of annuleren. Je kan ook individuele berichten selecteren om opnieuw te versturen of te annuleren.", diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json index d0b71cdb8d..367516675f 100644 --- a/src/i18n/strings/pl.json +++ b/src/i18n/strings/pl.json @@ -232,7 +232,6 @@ "Failed to kick": "Nie udało się wykopać użytkownika", "Failed to leave room": "Nie udało się opuścić pokoju", "Failed to load timeline position": "Nie udało się wczytać pozycji osi czasu", - "Failed to lookup current room": "Nie udało się wyszukać aktualnego pokoju", "Failed to mute user": "Nie udało się wyciszyć użytkownika", "Failed to reject invite": "Nie udało się odrzucić zaproszenia", "Failed to reject invitation": "Nie udało się odrzucić zaproszenia", @@ -434,7 +433,6 @@ "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Podany klucz podpisu odpowiada kluczowi podpisania otrzymanemu z urządzenia %(userId)s %(deviceId)s. Urządzenie oznaczone jako zweryfikowane.", "This email address is already in use": "Podany adres e-mail jest już w użyciu", "This email address was not found": "Podany adres e-mail nie został znaleziony", - "Must be viewing a room": "Musi być w trakcie wyświetlania pokoju", "The email address linked to your account must be entered.": "Musisz wpisać adres e-mail połączony z twoim kontem.", "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Rozmiar pliku '%(fileName)s' przekracza możliwy limit do przesłania na serwer domowy", "The file '%(fileName)s' failed to upload": "Przesyłanie pliku '%(fileName)s' nie powiodło się", diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json index d19eae40d4..7cc80cfc78 100644 --- a/src/i18n/strings/pt.json +++ b/src/i18n/strings/pt.json @@ -216,7 +216,6 @@ "Drop here to tag %(section)s": "Arraste aqui para marcar como %(section)s", "%(senderName)s ended the call.": "%(senderName)s finalizou a chamada.", "Existing Call": "Chamada em andamento", - "Failed to lookup current room": "Não foi possível buscar na sala atual", "Failed to send email": "Falha ao enviar email", "Failed to send request.": "Não foi possível mandar requisição.", "Failed to set up conference call": "Não foi possível montar a chamada de conferência", @@ -235,7 +234,6 @@ "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s deixou o histórico futuro da sala visível para desconhecido (%(visibility)s).", "Missing room_id in request": "Faltou o id da sala na requisição", "Missing user_id in request": "Faltou o id de usuário na requisição", - "Must be viewing a room": "Tem que estar visualizando uma sala", "(not supported by this browser)": "(não é compatível com este navegador)", "%(senderName)s placed a %(callType)s call.": "%(senderName)s fez uma chamada de %(callType)s.", "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.", diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index b786dc7182..700c7edecc 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -216,7 +216,6 @@ "Drop here to tag %(section)s": "Arraste aqui para marcar como %(section)s", "%(senderName)s ended the call.": "%(senderName)s finalizou a chamada.", "Existing Call": "Chamada em andamento", - "Failed to lookup current room": "Não foi possível buscar na sala atual", "Failed to send email": "Não foi possível enviar email", "Failed to send request.": "Não foi possível mandar requisição.", "Failed to set up conference call": "Não foi possível montar a chamada de conferência", @@ -235,7 +234,6 @@ "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s deixou o histórico futuro da sala visível para desconhecido (%(visibility)s).", "Missing room_id in request": "Faltou o id da sala na requisição", "Missing user_id in request": "Faltou o id de usuário na requisição", - "Must be viewing a room": "Tem que estar visualizando uma sala", "(not supported by this browser)": "(não é compatível com este navegador)", "%(senderName)s placed a %(callType)s call.": "%(senderName)s fez uma chamada de %(callType)s.", "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.", @@ -685,7 +683,6 @@ "Send": "Enviar", "Message Replies": "Respostas", "Message Pinning": "Fixar mensagem", - "Tag Panel": "Painel de tags", "Disable Emoji suggestions while typing": "Desativar sugestões de emojis enquanto estiver escrevendo", "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensagens de entrada e de saída (não afeta convites, expulsões e banimentos)", "Hide avatar changes": "Ocultar alterações da imagem de perfil", @@ -932,8 +929,6 @@ "Error whilst fetching joined communities": "Erro baixando comunidades das quais você faz parte", "Create a new community": "Criar nova comunidade", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crie uma comunidade para agrupar em um mesmo local pessoas e salas! Monte uma página inicial personalizada para dar uma identidade ao seu espaço no universo Matrix.", - "Join an existing community": "Entrar numa comunidade existente", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Para entrar em uma comunidade, você terá que conhecer o seu ID; um ID de comunidade normalmente tem este formato: +exemplo:matrix.org.", "Show devices, send anyway or cancel.": "Exibir dispositivos, enviar assim mesmo ou cancelar.", "%(count)s of your messages have not been sent.|one": "Sua mensagem não foi enviada.", "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Reenviar todas ou cancelar todas agora. Você também pode selecionar mensagens individualmente a serem reenviadas ou canceladas.", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index 2ef28d03c6..48824c7394 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -155,7 +155,6 @@ "Drop here to tag %(section)s": "Перетащите сюда, чтобы пометить как %(section)s", "%(senderName)s ended the call.": "%(senderName)s завершил(а) звонок.", "Existing Call": "Текущий вызов", - "Failed to lookup current room": "Не удалось найти текущую комнату", "Failed to send request.": "Не удалось отправить запрос.", "Failed to set up conference call": "Не удалось сделать конференц-звонок", "Failed to verify email address: make sure you clicked the link in the email": "Не удалось проверить email: убедитесь, что вы перешли по ссылке в письме", @@ -174,7 +173,6 @@ "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s сделал(а) историю комнаты видимой в неизвестном режиме (%(visibility)s).", "Missing room_id in request": "Отсутствует room_id в запросе", "Missing user_id in request": "Отсутствует user_id в запросе", - "Must be viewing a room": "Вы должны просматривать комнату", "(not supported by this browser)": "(не поддерживается этим браузером)", "Connectivity to the server has been lost.": "Связь с сервером потеряна.", "Sent messages will be stored until your connection has returned.": "Отправленные сообщения будут сохранены, пока соединение не восстановится.", @@ -787,8 +785,6 @@ "Error whilst fetching joined communities": "Ошибка при загрузке сообществ", "Create a new community": "Создать новое сообщество", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Создайте сообщество для объединения пользователей и комнат! Создайте собственную домашнюю страницу, чтобы выделить свое пространство во вселенной Matrix.", - "Join an existing community": "Присоединиться к существующему сообществу", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Чтобы присоединиться к существующему сообществу, вам нужно знать его ID; это будет выглядеть примерно так+primer:matrix.org.", "Something went wrong whilst creating your community": "При создании сообщества что-то пошло не так", "%(names)s and %(count)s others are typing|other": "%(names)s и еще %(count)s печатают", "And %(count)s more...|other": "Еще %(count)s…", @@ -908,7 +904,6 @@ "Unknown for %(duration)s": "Неизвестно %(duration)s", "There's no one else here! Would you like to invite others or stop warning about the empty room?": "Здесь никого нет! Хотите пригласить кого-нибудь или выключить предупреждение о пустой комнате?", "Something went wrong when trying to get your communities.": "Что-то пошло не так при попытке получить список ваших сообществ.", - "Tag Panel": "Панель тегов", "Delete %(count)s devices|other": "Удалить (%(count)s)", "Delete %(count)s devices|one": "Удалить", "Select devices": "Выбрать", diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json index 5036699932..4988ac262b 100644 --- a/src/i18n/strings/sk.json +++ b/src/i18n/strings/sk.json @@ -84,10 +84,8 @@ "You are not in this room.": "Nenachádzate sa v tejto miestnosti.", "You do not have permission to do that in this room.": "V tejto miestnosti nemáte oprávnenie na vykonanie takejto akcie.", "Missing room_id in request": "V požiadavke chýba room_id", - "Must be viewing a room": "Musí byť zobrazená miestnosť", "Room %(roomId)s not visible": "Miestnosť %(roomId)s nie je viditeľná", "Missing user_id in request": "V požiadavke chýba user_id", - "Failed to lookup current room": "Nepodarilo sa vyhľadať aktuálnu miestnosť", "Usage": "Použitie", "/ddg is not a command": "/ddg nie je žiaden príkaz", "To use it, just wait for autocomplete results to load and tab through them.": "Ak to chcete použiť, len počkajte na načítanie výsledkov automatického dopĺňania a cyklicky prechádzajte stláčaním klávesu tab..", @@ -691,8 +689,6 @@ "Error whilst fetching joined communities": "Pri získavaní vašich komunít sa vyskytla chyba", "Create a new community": "Vytvoriť novú komunitu", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Vytvorte si komunitu s cieľom zoskupiť miestnosti a používateľov! Zostavte si vlastnú domovskú stránku a vymedzte tak svoj priestor vo svete Matrix.", - "Join an existing community": "Vstúpiť do existujúcej komunity", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Aby ste mohli vstúpiť do existujúcej komunity, musíte poznať jej identifikátor; Mal by vizerať nejako takto +priklad:matrix.org.", "You have no visible notifications": "Nie sú k dispozícii žiadne oznámenia", "Scroll to bottom of page": "Posunúť na spodok stránky", "Connectivity to the server has been lost.": "Spojenie so serverom bolo prerušené.", @@ -907,7 +903,6 @@ "Call": "Hovor", "Answer": "Prijať", "Send": "Odoslať", - "Tag Panel": "Panel so značkami", "Delete %(count)s devices|other": "Vymazať %(count)s zariadení", "Delete %(count)s devices|one": "Vymazať zariadenie", "Select devices": "Vybrať zariadenia", diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json index 66f6f032b7..680c63e458 100644 --- a/src/i18n/strings/sq.json +++ b/src/i18n/strings/sq.json @@ -106,9 +106,7 @@ "Power level must be positive integer.": "Niveli fuqie duhet të jetë numër i plotë pozitiv.", "You are not in this room.": "Ti nuk je në këtë dhomë.", "You do not have permission to do that in this room.": "Nuk ke leje të bësh këtë në këtë dhomë.", - "Must be viewing a room": "Duhet të shikohet një dhomë", "Room %(roomId)s not visible": "Dhoma %(roomId)s e padukshme", - "Failed to lookup current room": "Dhoma aktuale nuk mundi të kërkohej", "Usage": "Përdorimi", "/ddg is not a command": "/ddg s'është komandë", "To use it, just wait for autocomplete results to load and tab through them.": "Për të përdorur, thjesht prit derisa të mbushën rezultatat vetëplotësuese dhe pastaj shfletoji.", diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json index b8689454d4..86f1faade6 100644 --- a/src/i18n/strings/sr.json +++ b/src/i18n/strings/sr.json @@ -85,7 +85,6 @@ "You are not in this room.": "Нисте у овој соби.", "You do not have permission to do that in this room.": "Немате овлашћење да урадите то у овој соби.", "Missing room_id in request": "Недостаје room_id у захтеву", - "Must be viewing a room": "Морате гледати собу", "Room %(roomId)s not visible": "Соба %(roomId)s није видљива", "Missing user_id in request": "Недостаје user_id у захтеву", "Call Failed": "Позивање неуспешно", @@ -97,7 +96,6 @@ "Answer": "Одговори", "Call Timeout": "Прекорачено време позивања", "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s", - "Failed to lookup current room": "Неуспех при потраживању тренутне собе", "Usage": "Коришћење", "/ddg is not a command": "/ddg није наредба", "To use it, just wait for autocomplete results to load and tab through them.": "Да бисте је користили, само сачекајте да се исходи самодовршавања учитају и табом прођите кроз њих.", @@ -172,7 +170,6 @@ "Failed to join room": "Нисам успео да уђем у собу", "Message Replies": "Одговори", "Message Pinning": "Закачене поруке", - "Tag Panel": "Означи површ", "Disable Emoji suggestions while typing": "Онемогући предлагање емоџија приликом куцања", "Use compact timeline layout": "Користи збијени распоред временске линије", "Hide removed messages": "Сакриј уклоњене поруке", @@ -778,8 +775,6 @@ "Error whilst fetching joined communities": "Грешка приликом добављања списка са приступљеним заједницама", "Create a new community": "Направи нову заједницу", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Направите заједницу да бисте спојили кориснике и собе! Направите прилагођену почетну страницу да бисте означили ваш кутак у Матрикс универзуму.", - "Join an existing community": "Приступи већ постојећој заједници", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "Да бисте приступили већ постојећој заједници, морате знати њен идентификатор заједнице. Ово изгледа нешто као +primer:matrix.org.", "You have no visible notifications": "Немате видљивих обавештења", "Scroll to bottom of page": "Превуци на дно странице", "Message not sent due to unknown devices being present": "Порука се неће послати због присутности непознатих уређаја", diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index 1ad48b27a3..2d81d0768b 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -128,7 +128,6 @@ "Failed to kick": "Det gick inte att kicka", "Failed to leave room": "Det gick inte att lämna rummet", "Failed to load timeline position": "Det gick inte att hämta positionen på tidslinjen", - "Failed to lookup current room": "Det gick inte att hämta det nuvarande rummet", "Failed to mute user": "Det gick inte att dämpa användaren", "Failed to reject invite": "Det gick inte att avböja inbjudan", "Failed to reject invitation": "Det gick inte att avböja inbjudan", @@ -240,7 +239,6 @@ "Mobile phone number": "Telefonnummer", "Mobile phone number (optional)": "Telefonnummer (valfri)", "Moderator": "Moderator", - "Must be viewing a room": "Du måste ha ett öppet rum", "Mute": "Dämpa", "%(serverName)s Matrix ID": "%(serverName)s Matrix-ID", "Name": "Namn", @@ -1066,8 +1064,6 @@ "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "För att skapa ett filter, dra en community-avatar till filterpanelen längst till vänster på skärmen. Du kan när som helst klicka på en avatar i filterpanelen för att bara se rum och personer som är associerade med den communityn.", "Create a new community": "Skapa en ny community", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Skapa en community för att gruppera användare och rum! Bygg en anpassad hemsida för att markera er plats i Matrix-universumet.", - "Join an existing community": "Gå med i en befintlig community", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "För att gå med i en befintlig gemenskap behöver du ha community-ID; det ser ut som något i stil med +exempel:matrix.org.", "Invite to this community": "Bjud in till denna community", "Something went wrong when trying to get your communities.": "Något gick fel vid hämtning av dina communityn.", "You're not currently a member of any communities.": "Du är för närvarande inte medlem i någon community.", @@ -1180,7 +1176,6 @@ "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Den exporterade filen kommer att låta någon som kan läsa den att dekryptera alla krypterade meddelanden som du kan se, så du bör vara noga med att hålla den säker. För att hjälpa till med detta, bör du ange en lösenfras nedan, som kommer att användas för att kryptera exporterad data. Det kommer bara vara möjligt att importera data genom att använda samma lösenfras.", "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Denna process möjliggör import av krypteringsnycklar som tidigare exporterats från en annan Matrix-klient. Du kommer då kunna dekryptera alla meddelanden som den andra klienten kunde dekryptera.", "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Den exporterade filen kommer vara skyddad med en lösenfras. Du måste ange lösenfrasen här, för att dekryptera filen.", - "Tag Panel": "Tagg-panel", "Flair": "Emblem", "Showing flair for these communities:": "Visar emblem för dessa communityn:", "This room is not showing flair for any communities": "Detta rum visar inte emblem för några communityn", diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json index 606c60e95a..3fe7bf8f98 100644 --- a/src/i18n/strings/th.json +++ b/src/i18n/strings/th.json @@ -132,7 +132,6 @@ "Failed to join room": "การเข้าร่วมห้องล้มเหลว", "Failed to kick": "การเตะล้มเหลว", "Failed to leave room": "การออกจากห้องล้มเหลว", - "Failed to lookup current room": "การหาห้องปัจจุบันล้มเหลว", "Failed to reject invite": "การปฏิเสธคำเชิญล้มเหลว", "Failed to reject invitation": "การปฏิเสธคำเชิญล้มเหลว", "Failed to save settings": "การบันทึกการตั้งค่าล้มเหลว", diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index 1a8035a1db..04f78dc1ee 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -153,7 +153,6 @@ "Failed to kick": "Atma(Kick) işlemi başarısız oldu", "Failed to leave room": "Odadan ayrılma başarısız oldu", "Failed to load timeline position": "Zaman çizelgesi konumu yüklenemedi", - "Failed to lookup current room": "Geçerli odayı aramak başarısız oldu", "Failed to mute user": "Kullanıcıyı sessize almak başarısız oldu", "Failed to reject invite": "Daveti reddetme başarısız oldu", "Failed to reject invitation": "Davetiyeyi reddetme başarısız oldu", @@ -241,7 +240,6 @@ "Mobile phone number": "Cep telefonu numarası", "Mobile phone number (optional)": "Cep telefonu numarası (isteğe bağlı)", "Moderator": "Moderatör", - "Must be viewing a room": "Bir oda görüntülemeli olmalı", "Mute": "Sessiz", "Name": "İsim", "Never send encrypted messages to unverified devices from this device": "Bu cihazdan doğrulanmamış cihazlara asla şifrelenmiş mesajlar göndermeyin", diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json index 0fbd0a4ef3..28a1a35ef1 100644 --- a/src/i18n/strings/zh_Hans.json +++ b/src/i18n/strings/zh_Hans.json @@ -42,7 +42,6 @@ "Failed to kick": "移除失败", "Failed to leave room": "无法退出聊天室", "Failed to load timeline position": "无法加载时间轴位置", - "Failed to lookup current room": "找不到当前聊天室", "Failed to mute user": "禁言用户失败", "Failed to reject invite": "拒绝邀请失败", "Failed to reject invitation": "拒绝邀请失败", @@ -934,7 +933,6 @@ "Create a new community": "创建新社区", "Error whilst fetching joined communities": "获取已加入社区列表时出现错误", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "创建社区，将用户与聊天室整合在一起！搭建自定义社区主页以在 Matrix 宇宙之中标记出您的私人空间。", - "Join an existing community": "加入已有的社区", "Show devices, send anyway or cancel.": "显示未信任的设备 、 不经信任直接发送 或 取消发送。", "%(count)s of your messages have not been sent.|one": "您的消息尚未发送。", "Uploading %(filename)s and %(count)s others|other": "正在上传 %(filename)s 与其他 %(count)s 个文件", @@ -961,7 +959,6 @@ "Tried to load a specific point in this room's timeline, but was unable to find it.": "尝试加载此房间的时间线的特定时间点，但是无法找到。", "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "现在 重新发送消息 或 取消发送 。", "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "現在 重新发送消息 或 取消发送 。你也可以单独选择消息以重新发送或取消。", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "要加入已有的社区，你需要知道它的社区链接，比如 +example:matrix.org。", "Visibility in Room List": "是否在聊天室目录中可见", "Something went wrong when trying to get your communities.": "获取你加入的社区时发生错误。", "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "删除小部件后，此聊天室中的所有用户的这个小部件都会被删除。你确定要删除这个小部件吗？", @@ -1120,14 +1117,12 @@ "There's no one else here! Would you like to invite others or stop warning about the empty room?": "这里没有其他人了！你是想 邀请用户 还是 不再提示？", "You need to be able to invite users to do that.": "你需要有邀请用户的权限才能进行此操作。", "Missing roomId.": "找不到此聊天室 ID 所对应的聊天室。", - "Tag Panel": "标签面板", "You have been banned from %(roomName)s by %(userName)s.": "您已被 %(userName)s 从聊天室 %(roomName)s 中封禁。", "You have been banned from this room by %(userName)s.": "您已被 %(userName)s 从此聊天室中封禁。", "Every page you use in the app": "您在 Riot 中使用的每一个页面", "e.g. ": "例如：", "Your User Agent": "您的 User Agent", "Your device resolution": "您设备的分辨率", - "Must be viewing a room": "必须是在查看一个聊天室时", "Always show encryption icons": "总是显示加密标志", "At this time it is not possible to reply with a file so this will be sent without being a reply.": "目前无法以文件作为回复的内容，所以此文件将不作为回复，独立发送。", "Unable to reply": "无法回复", diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index ff7650b36f..4250e87c3b 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -78,7 +78,6 @@ "Failed to kick": "踢人失敗", "Failed to leave room": "無法離開聊天室", "Failed to load timeline position": "無法加載時間軸位置", - "Failed to lookup current room": "找不到當前聊天室", "Failed to mute user": "禁言用戶失敗", "Failed to reject invite": "拒絕邀請失敗", "Failed to reject invitation": "拒絕邀請失敗", @@ -336,7 +335,6 @@ "Mobile phone number": "行動電話號碼", "Mobile phone number (optional)": "行動電話號碼（選擇性）", "Moderator": "仲裁者", - "Must be viewing a room": "必須檢視房間", "Name": "名稱", "Never send encrypted messages to unverified devices from this device": "從不自此裝置傳送加密的訊息到未驗證的裝置", "Never send encrypted messages to unverified devices in this room from this device": "從不在此房間中從此裝置上傳送未加密的訊息到未驗證的裝置", @@ -704,7 +702,6 @@ "Send": "傳送", "Message Replies": "訊息回覆", "Message Pinning": "訊息釘選", - "Tag Panel": "標籤面板", "Disable Emoji suggestions while typing": "在輸入時停用繪文字建議", "Hide avatar changes": "隱藏大頭貼變更", "Hide display name changes": "隱藏顯示名稱變更", @@ -925,8 +922,6 @@ "Error whilst fetching joined communities": "擷取已加入的社群時發生錯誤", "Create a new community": "建立新社群", "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "建立社群以將使用者與聊天室湊成一組！建立自訂的首頁以在 Matrix 宇宙中標出您的空間。", - "Join an existing community": "加入既有的社群", - "To join an existing community you'll have to know its community identifier; this will look something like +example:matrix.org.": "要加入既有的社群，您必須知道它的社群標記符號；其看起來像是 +example:matrix.org.", "%(count)s of your messages have not been sent.|one": "您的訊息尚未傳送。", "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "現在重新傳送全部或取消全部。您也可以選取單一訊息以重新傳送或取消。", "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "現在重新傳送訊息或取消訊息。", From 0011f23125d9e807c92c997babb46e351b2f2ae8 Mon Sep 17 00:00:00 2001 From: Miguel Branco Date: Mon, 18 Jun 2018 21:04:42 +0000 Subject: [PATCH 185/283] Translated using Weblate (Galician) Currently translated at 100.0% (1203 of 1203 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/ --- src/i18n/strings/gl.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index 572da43dcf..091b7350fb 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -959,7 +959,7 @@ "Failed to set direct chat tag": "Fallo ao establecer etiqueta do chat directo", "Failed to remove tag %(tagName)s from room": "Fallo ao eliminar a etiqueta %(tagName)s da sala", "Failed to add tag %(tagName)s to room": "Fallo ao engadir a etiqueta %(tagName)s a sala", - "Failed to lookup current room": "Fallo ao bloquear a sala actual", + "Failed to lookup current room": "Non se deu anovado a actual sala", "Disable Community Filter Panel": "Desactivar o panel de filtro de comunidades", "Your key share request has been sent - please check your other devices for key share requests.": "Enviouse a solicitude de compartir chave - por favor comprobe as peticións de compartir chaves nos seus outros dispositivos.", "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "As peticións de compartir chaves envíanse de xeito automático aos seus outros dispositivos. Se rexeita o obvia estas peticións nos outros dispositivos, pulse aquí para solicitar novamente as chaves para esta sesión.", @@ -968,13 +968,13 @@ "Re-request encryption keys from your other devices.": "Volver a pedir chaves de cifrado desde os outros dispositivos.", "%(user)s is a %(userRole)s": "%(user)s é %(userRole)s", "Flair": "Aura", - "Showing flair for these communities:": "Mostrar o aura para estas comunidades:", - "Flair will appear if enabled in room settings": "O Aura aparecerá si está activado nas preferencias da sala", - "Flair will not appear": "O Aura non aparecerá", - "Display your community flair in rooms configured to show it.": "Mostrar o aura da súa comunidade en salas configuradas para mostralo.", + "Showing flair for these communities:": "Mostrar a aura para estas comunidades:", + "Flair will appear if enabled in room settings": "A aura aparecerá se está activada nas preferencias da sala", + "Flair will not appear": "A aura non aparecerá", + "Display your community flair in rooms configured to show it.": "Mostrar a aura da súa comunidade nas salas configuradas para que a mostren.", "Did you know: you can use communities to filter your Riot.im experience!": "Sabía que pode utilizar as comunidades para mellorar a súa experiencia con Riot.im!", "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Para establecer un filtro, arrastre un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Pode pulsar nun avatar no panel de filtrado en calquera momento para ver só salas e xente asociada a esa comunidade.", - "Deops user with given id": "Degradar usuaria co id dado", + "Deops user with given id": "Degradar o usuario con esa ID", "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Visto por %(displayName)s(%(userName)s en %(dateTime)s", "Code": "Código", "Unable to join community": "Non se puido unir a comunidade", From e5a509bb91eb9d0638eab95bf8e8fed7a1a1e78f Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 20 Jun 2018 10:04:03 +0100 Subject: [PATCH 186/283] i18n & prunei18n --- src/i18n/strings/bg.json | 1 - src/i18n/strings/ca.json | 1 - src/i18n/strings/de_DE.json | 1 - src/i18n/strings/en_EN.json | 1 - src/i18n/strings/eu.json | 1 - src/i18n/strings/fr.json | 1 - src/i18n/strings/gl.json | 1 - src/i18n/strings/hu.json | 1 - src/i18n/strings/lv.json | 1 - src/i18n/strings/nl.json | 1 - src/i18n/strings/pt_BR.json | 1 - src/i18n/strings/ru.json | 1 - src/i18n/strings/sk.json | 1 - src/i18n/strings/sr.json | 1 - src/i18n/strings/sv.json | 1 - src/i18n/strings/zh_Hans.json | 1 - src/i18n/strings/zh_Hant.json | 1 - 17 files changed, 17 deletions(-) diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json index f3c12edecb..357b007a6f 100644 --- a/src/i18n/strings/bg.json +++ b/src/i18n/strings/bg.json @@ -203,7 +203,6 @@ "Not a valid Riot keyfile": "Невалиден файл с ключ за Riot", "Authentication check failed: incorrect password?": "Неуспешна автентикация: неправилна парола?", "Failed to join room": "Неуспешно присъединяване към стаята", - "Message Replies": "Отговори на съобщението", "Message Pinning": "Функция за закачане на съобщения", "Disable Emoji suggestions while typing": "Изключване на предложенията за емотиконите при писане", "Use compact timeline layout": "Използване на компактно оформление за списъка със съобщения", diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json index 5b3732d725..98d51e99ac 100644 --- a/src/i18n/strings/ca.json +++ b/src/i18n/strings/ca.json @@ -209,7 +209,6 @@ "Not a valid Riot keyfile": "El fitxer no és un fitxer de claus de Riot valid", "Authentication check failed: incorrect password?": "Ha fallat l'autenticació: heu introduït correctament la contrasenya?", "Failed to join room": "No s'ha pogut entrar a la sala", - "Message Replies": "Respostes del missatge", "Message Pinning": "Fixació de missatges", "Disable Emoji suggestions while typing": "Desactiva els suggeriments d'Emoji mentre s'escriu", "Use compact timeline layout": "Utilitza el disseny compacte de la línia de temps", diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 6e1fff98c0..0df2e84897 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -946,7 +946,6 @@ "Your homeserver's URL": "Die URL deines Homeservers", "Your identity server's URL": "Die URL deines Identitätsservers", "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s", - "Message Replies": "Antworten auf Nachrichten", "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der letze Nutzer mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.", "Community IDs cannot not be empty.": "Community-IDs können nicht leer sein.", "Show devices, send anyway or cancel.": "Geräte anzeigen, trotzdem senden oder abbrechen.", diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index e96fd3b887..6d39586c0a 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -186,7 +186,6 @@ "Not a valid Riot keyfile": "Not a valid Riot keyfile", "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?", "Failed to join room": "Failed to join room", - "Message Replies": "Message Replies", "Message Pinning": "Message Pinning", "Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing", "Use compact timeline layout": "Use compact timeline layout", diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index 9526e87285..7c13228264 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -932,7 +932,6 @@ "%(count)s of your messages have not been sent.|one": "Zure mezua ez da bidali.", "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Birbidali guztiak edo baztertu guztiak orain. Mezuak banaka birbidali edo baztertu ditzakezu ere.", "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "Birbidali mezua edo baztertu mezua orain.", - "Message Replies": "Mezuei erantzunak", "Send an encrypted reply…": "Bidali zifratutako erantzun bat…", "Send a reply (unencrypted)…": "Bidali erantzun bat (zifratu gabea)…", "Send an encrypted message…": "Bidali zifratutako mezu bat…", diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 9e6115b853..cb5bc86515 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -932,7 +932,6 @@ "%(count)s of your messages have not been sent.|one": "Votre message n'a pas été envoyé.", "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Tout renvoyer ou tout annuler maintenant. Vous pouvez aussi choisir des messages individuels à renvoyer ou annuler.", "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "Renvoyer le message ou annuler le message maintenant.", - "Message Replies": "Réponses", "Send an encrypted reply…": "Envoyer une réponse chiffrée…", "Send a reply (unencrypted)…": "Envoyer une réponse (non chiffrée)…", "Send an encrypted message…": "Envoyer un message chiffré…", diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index 52feb86b30..ec2643712a 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -232,7 +232,6 @@ "Disable Notifications": "Deshabilitar notificacións", "Enable Notifications": "Habilitar notificacións", "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s", - "Message Replies": "Respostas a mensaxe", "Mirror local video feed": "Copiar fonte de vídeo local", "Cannot add any more widgets": "Non pode engadir máis widgets", "The maximum permitted number of widgets have already been added to this room.": "Xa se engadeu o número máximo de widgets a esta sala.", diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 425f03b180..4bbfe52d75 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -932,7 +932,6 @@ "%(count)s of your messages have not been sent.|one": "Az üzeneted nem lett elküldve.", "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Újraküldöd mind vagy elveted mind. Az üzeneteket egyenként is elküldheted vagy elvetheted.", "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "Üzenet újraküldése vagy üzenet elvetése most.", - "Message Replies": "Üzenet válaszok", "Send an encrypted reply…": "Titkosított válasz küldése…", "Send a reply (unencrypted)…": "Válasz küldése (titkosítatlanul)…", "Send an encrypted message…": "Titkosított üzenet küldése…", diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json index a7458a525f..0c6bcb0977 100644 --- a/src/i18n/strings/lv.json +++ b/src/i18n/strings/lv.json @@ -717,7 +717,6 @@ "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s vidžets, kuru mainīja %(senderName)s", "%(names)s and %(count)s others are typing|other": "%(names)s un %(count)s citi raksta", "%(names)s and %(count)s others are typing|one": "%(names)s un vēl kāds raksta", - "Message Replies": "Atbildes uz ziņām", "Message Pinning": "Ziņu piekabināšana", "Disable Emoji suggestions while typing": "Atspējot Emoji ieteikumus teksta rakstīšanas laikā", "Hide avatar changes": "Slēpt avatara izmaiņas", diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index 90be5ee923..ea97531832 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -705,7 +705,6 @@ "%(names)s and %(count)s others are typing|one": "%(names)s en iemand anders is aan het typen", "Send": "Verstuur", "Message Pinning": "Boodschap vastpinnen", - "Message Replies": "Antwoorden op bericht", "Disable Emoji suggestions while typing": "Emoji suggesties tijdens het typen uitzetten", "Hide avatar changes": "Avatar veranderingen verbergen", "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s", diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index 700c7edecc..c583e795cb 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -681,7 +681,6 @@ "%(names)s and %(count)s others are typing|other": "%(names)s e %(count)s outras pessoas estão escrevendo", "%(names)s and %(count)s others are typing|one": "%(names)s e uma outra pessoa estão escrevendo", "Send": "Enviar", - "Message Replies": "Respostas", "Message Pinning": "Fixar mensagem", "Disable Emoji suggestions while typing": "Desativar sugestões de emojis enquanto estiver escrevendo", "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensagens de entrada e de saída (não afeta convites, expulsões e banimentos)", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index 48824c7394..a82e5be64e 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -932,7 +932,6 @@ "%(count)s of your messages have not been sent.|one": "Ваше сообщение не было отправлено.", "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Отправить все или отменить все сейчас. Можно также выбрать отдельные сообщения для отправки или отмены.", "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "Отправить или отменить сообщение сейчас.", - "Message Replies": "Сообщения-ответы", "Send an encrypted reply…": "Отправить зашифрованный ответ…", "Send a reply (unencrypted)…": "Отправить ответ (нешифрованный)…", "Send an encrypted message…": "Отправить зашифрованное сообщение…", diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json index 4988ac262b..b1f3f4260d 100644 --- a/src/i18n/strings/sk.json +++ b/src/i18n/strings/sk.json @@ -929,7 +929,6 @@ "Flair will not appear": "Príslušnosť ku komunite nebude zobrazená", "Display your community flair in rooms configured to show it.": "Zobrazovať vašu príslušnosť ku komunite v miestnostiach, ktoré sú nastavené na zobrazovanie tejto príslušnosti.", "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s", - "Message Replies": "Odpovede na správy", "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Túto zmenu nebudete môcť vrátiť späť pretože znižujete vašu vlastnú úroveň moci. Ak ste jediný poverený používateľ v miestnosti, nebudete môcť znovu získať úroveň, akú máte teraz.", "Send an encrypted reply…": "Odoslať šifrovanú odpoveď…", "Send a reply (unencrypted)…": "Odoslať odpoveď (nešifrovanú)…", diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json index 86f1faade6..c9f6653e26 100644 --- a/src/i18n/strings/sr.json +++ b/src/i18n/strings/sr.json @@ -168,7 +168,6 @@ "Not a valid Riot keyfile": "Није исправана Riot кључ-датотека", "Authentication check failed: incorrect password?": "Провера идентитета није успела: нетачна лозинка?", "Failed to join room": "Нисам успео да уђем у собу", - "Message Replies": "Одговори", "Message Pinning": "Закачене поруке", "Disable Emoji suggestions while typing": "Онемогући предлагање емоџија приликом куцања", "Use compact timeline layout": "Користи збијени распоред временске линије", diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index 2d81d0768b..0fb01a4cc6 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -1019,7 +1019,6 @@ "Add rooms to the community": "Lägg till rum i communityn", "Add to community": "Lägg till i community", "Failed to invite users to community": "Det gick inte att bjuda in användare till communityn", - "Message Replies": "Meddelandesvar", "Mirror local video feed": "Spegelvänd lokal video", "Disable Community Filter Panel": "Inaktivera community-filterpanel", "Community Invites": "Community-inbjudningar", diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json index 28a1a35ef1..56d5c1e4dc 100644 --- a/src/i18n/strings/zh_Hans.json +++ b/src/i18n/strings/zh_Hans.json @@ -741,7 +741,6 @@ "Add rooms to the community": "添加聊天室到社区", "Add to community": "添加到社区", "Failed to invite users to community": "邀请用户到社区失败", - "Message Replies": "消息回复", "Disable Peer-to-Peer for 1:1 calls": "在一对一通话中禁用 P2P 对等网络", "Enable inline URL previews by default": "默认启用网址预览", "Disinvite this user?": "取消邀请此用户？", diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 4250e87c3b..e14268cfa1 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -700,7 +700,6 @@ "%(names)s and %(count)s others are typing|other": "%(names)s 與其他 %(count)s 個人正在輸入", "%(names)s and %(count)s others are typing|one": "%(names)s 與另一個人正在輸入", "Send": "傳送", - "Message Replies": "訊息回覆", "Message Pinning": "訊息釘選", "Disable Emoji suggestions while typing": "在輸入時停用繪文字建議", "Hide avatar changes": "隱藏大頭貼變更", From f5b12bd66ab5df55b20c81140b66fddbd3415884 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 20 Jun 2018 17:09:49 +0100 Subject: [PATCH 187/283] slash got consumed in the consolidation Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/SlashCommands.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SlashCommands.js b/src/SlashCommands.js index 3743fbb98c..211a68e7b0 100644 --- a/src/SlashCommands.js +++ b/src/SlashCommands.js @@ -27,14 +27,14 @@ import SettingsStore, {SettingLevel} from './settings/SettingsStore'; class Command { constructor({name, args='', description, runFn}) { - this.command = name; + this.command = '/' + name; this.args = args; this.description = description; this.runFn = runFn; } getCommand() { - return "/" + this.command; + return this.command; } getCommandWithArgs() { From 7d9d17145c125db962a0eff3bbcd4a065c5b403e Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 20 Jun 2018 17:21:06 +0100 Subject: [PATCH 188/283] change so that if someone enters invalid command with args we strict match Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/autocomplete/CommandProvider.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js index ea271e02ff..4b24e98605 100644 --- a/src/autocomplete/CommandProvider.js +++ b/src/autocomplete/CommandProvider.js @@ -41,17 +41,14 @@ export default class CommandProvider extends AutocompleteProvider { const {command, range} = this.getCurrentCommand(query, selection); if (!command) return []; - let matches; + let matches = []; if (command[0] !== command[1]) { // The input looks like a command with arguments, perform exact match const match = COMMANDS.find((o) => o.command === command[1]); if (match) { matches = [match]; } - } - - // If we don't yet have matches - if (!matches) { + } else { if (query === '/') { // If they have just entered `/` show everything matches = COMMANDS; From 884fa3b9139a078310ed9a6162ad06c7306c8b2d Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 20 Jun 2018 17:25:23 +0100 Subject: [PATCH 189/283] use existing command hashmap over linear array search Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/autocomplete/CommandProvider.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js index 4b24e98605..891ef97d65 100644 --- a/src/autocomplete/CommandProvider.js +++ b/src/autocomplete/CommandProvider.js @@ -44,9 +44,9 @@ export default class CommandProvider extends AutocompleteProvider { let matches = []; if (command[0] !== command[1]) { // The input looks like a command with arguments, perform exact match - const match = COMMANDS.find((o) => o.command === command[1]); - if (match) { - matches = [match]; + const name = command[1].substr(1); // strip leading `/` + if (CommandMap[name]) { + matches = [CommandMap[name]]; } } else { if (query === '/') { From 7cd8a5a2b230ac78c12cc40bddab10dcf9fce59f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 20 Jun 2018 18:01:37 +0100 Subject: [PATCH 190/283] allow chaining right click contextmenus Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/ContextualMenu.js | 26 +++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js index 91ec312f43..e5b3bd0b71 100644 --- a/src/components/structures/ContextualMenu.js +++ b/src/components/structures/ContextualMenu.js @@ -64,7 +64,9 @@ export default class ContextualMenu extends React.Component { // The component to render as the context menu elementClass: PropTypes.element.isRequired, // on resize callback - windowResize: PropTypes.func + windowResize: PropTypes.func, + // method to close menu + closeMenu: PropTypes.func, }; constructor() { @@ -73,6 +75,7 @@ export default class ContextualMenu extends React.Component { contextMenuRect: null, }; + this.onContextMenu = this.onContextMenu.bind(this); this.collectContextMenuRect = this.collectContextMenuRect.bind(this); } @@ -85,6 +88,25 @@ export default class ContextualMenu extends React.Component { }); } + onContextMenu(e) { + if (this.props.closeMenu) { + this.props.closeMenu(); + } + e.preventDefault(); + const x = e.clientX; + const y = e.clientY; + + setImmediate(() => { + const clickEvent = document.createEvent('MouseEvents'); + clickEvent.initMouseEvent( + 'contextmenu', true, true, window, 0, + 0, 0, x, y, false, false, + false, false, 0, null, + ); + document.elementFromPoint(x, y).dispatchEvent(clickEvent); + }); + } + render() { const position = {}; let chevronFace = null; @@ -195,7 +217,7 @@ export default class ContextualMenu extends React.Component { { chevron }
    - { props.hasBackground &&
    } + { props.hasBackground &&
    }
    ; } From 4508da56661a4e8bd80122ee1539bfddaf228449 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 20 Jun 2018 18:03:15 +0100 Subject: [PATCH 191/283] only override contextmenu if closeMenu is provided Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/ContextualMenu.js | 27 +++++++++++---------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js index e5b3bd0b71..8b88cae479 100644 --- a/src/components/structures/ContextualMenu.js +++ b/src/components/structures/ContextualMenu.js @@ -91,20 +91,21 @@ export default class ContextualMenu extends React.Component { onContextMenu(e) { if (this.props.closeMenu) { this.props.closeMenu(); - } - e.preventDefault(); - const x = e.clientX; - const y = e.clientY; - setImmediate(() => { - const clickEvent = document.createEvent('MouseEvents'); - clickEvent.initMouseEvent( - 'contextmenu', true, true, window, 0, - 0, 0, x, y, false, false, - false, false, 0, null, - ); - document.elementFromPoint(x, y).dispatchEvent(clickEvent); - }); + e.preventDefault(); + const x = e.clientX; + const y = e.clientY; + + setImmediate(() => { + const clickEvent = document.createEvent('MouseEvents'); + clickEvent.initMouseEvent( + 'contextmenu', true, true, window, 0, + 0, 0, x, y, false, false, + false, false, 0, null, + ); + document.elementFromPoint(x, y).dispatchEvent(clickEvent); + }); + } } render() { From bce87829b6c348b8da266dd741dc211eae436588 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 21 Jun 2018 00:33:24 +0100 Subject: [PATCH 192/283] hide already chosen results from AddressPickerDialog Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../views/dialogs/AddressPickerDialog.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js index 0d0b7456b5..935eecf5f1 100644 --- a/src/components/views/dialogs/AddressPickerDialog.js +++ b/src/components/views/dialogs/AddressPickerDialog.js @@ -1,6 +1,6 @@ /* Copyright 2015, 2016 OpenMarket Ltd -Copyright 2017 New Vector Ltd +Copyright 2017, 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -510,6 +510,10 @@ module.exports = React.createClass({ const AddressSelector = sdk.getComponent("elements.AddressSelector"); this.scrollElement = null; + // Use set to avoid O(n*m) operation + const selectedAddresses = new Set(this.state.userList.map(({address}) => address)); + const queryList = this.state.queryList.filter(({address}) => !selectedAddresses.has(address)); + const query = []; // create the invite list if (this.state.userList.length > 0) { @@ -561,16 +565,12 @@ module.exports = React.createClass({
    ; } else if (this.state.searchError) { error =
    { this.state.searchError }
    ; - } else if ( - this.state.query.length > 0 && - this.state.queryList.length === 0 && - !this.state.busy - ) { + } else if (this.state.query.length > 0 && queryList.length === 0 && !this.state.busy) { error =
    { _t("No results") }
    ; } else { addressSelector = ( {this.addressSelector = ref;}} - addressList={this.state.queryList} + addressList={queryList} showAddress={this.props.pickerType === 'user'} onSelected={this.onSelected} truncateAt={TRUNCATE_QUERY_LIST} From 4040e3f5cf287c253c27c860d0c277f734985ec1 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 21 Jun 2018 00:37:37 +0100 Subject: [PATCH 193/283] delint Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../views/dialogs/AddressPickerDialog.js | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js index 935eecf5f1..0105fb8ca9 100644 --- a/src/components/views/dialogs/AddressPickerDialog.js +++ b/src/components/views/dialogs/AddressPickerDialog.js @@ -17,7 +17,7 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; -import { _t } from '../../../languageHandler'; +import { _t, _td } from '../../../languageHandler'; import sdk from '../../../index'; import MatrixClientPeg from '../../../MatrixClientPeg'; import Promise from 'bluebird'; @@ -27,6 +27,13 @@ import GroupStore from '../../../stores/GroupStore'; const TRUNCATE_QUERY_LIST = 40; const QUERY_USER_DIRECTORY_DEBOUNCE_MS = 200; +const addressTypeName = { + 'mx-user-id': _td("Matrix ID"), + 'mx-room-id': _td("Matrix Room ID"), + 'email': _td("email address"), +}; + + module.exports = React.createClass({ displayName: "AddressPickerDialog", @@ -129,7 +136,7 @@ module.exports = React.createClass({ } else if (e.keyCode === 13) { // enter e.stopPropagation(); e.preventDefault(); - if (this.refs.textinput.value == '') { + if (this.refs.textinput.value === '') { // if there's nothing in the input box, submit the form this.onButtonClick(); } else { @@ -148,7 +155,7 @@ module.exports = React.createClass({ clearTimeout(this.queryChangedDebouncer); } // Only do search if there is something to search - if (query.length > 0 && query != '@' && query.length >= 2) { + if (query.length > 0 && query !== '@' && query.length >= 2) { this.queryChangedDebouncer = setTimeout(() => { if (this.props.pickerType === 'user') { if (this.props.groupId) { @@ -419,7 +426,7 @@ module.exports = React.createClass({ isKnown: false, }); if (this._cancelThreepidLookup) this._cancelThreepidLookup(); - if (addrType == 'email') { + if (addrType === 'email') { this._lookupThreepid(addrType, query).done(); } } @@ -442,14 +449,14 @@ module.exports = React.createClass({ if (!this.props.validAddressTypes.includes(addrType)) { this.setState({ error: true }); return null; - } else if (addrType == 'mx-user-id') { + } else if (addrType === 'mx-user-id') { const user = MatrixClientPeg.get().getUser(addrObj.address); if (user) { addrObj.displayName = user.displayName; addrObj.avatarMxc = user.avatarUrl; addrObj.isKnown = true; } - } else if (addrType == 'mx-room-id') { + } else if (addrType === 'mx-room-id') { const room = MatrixClientPeg.get().getRoom(addrObj.address); if (room) { addrObj.displayName = room.name; @@ -547,21 +554,13 @@ module.exports = React.createClass({ let error; let addressSelector; if (this.state.error) { - let tryUsing = ''; - const validTypeDescriptions = this.props.validAddressTypes.map((t) => { - return { - 'mx-user-id': _t("Matrix ID"), - 'mx-room-id': _t("Matrix Room ID"), - 'email': _t("email address"), - }[t]; - }); - tryUsing = _t("Try using one of the following valid address types: %(validTypesList)s.", { - validTypesList: validTypeDescriptions.join(", "), - }); + const validTypeDescriptions = this.props.validAddressTypes.map((t) => _t(addressTypeName[t])); error =
    { _t("You have entered an invalid address.") }
    - { tryUsing } + { _t("Try using one of the following valid address types: %(validTypesList)s.", { + validTypesList: validTypeDescriptions.join(", "), + }) }
    ; } else if (this.state.searchError) { error =
    { this.state.searchError }
    ; From fd252ded601d96130bef8b86265e1d63ef21ab16 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 21 Jun 2018 00:47:21 +0100 Subject: [PATCH 194/283] take into account the addressType also Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/AddressPickerDialog.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js index 0105fb8ca9..a87ffbb518 100644 --- a/src/components/views/dialogs/AddressPickerDialog.js +++ b/src/components/views/dialogs/AddressPickerDialog.js @@ -517,9 +517,16 @@ module.exports = React.createClass({ const AddressSelector = sdk.getComponent("elements.AddressSelector"); this.scrollElement = null; - // Use set to avoid O(n*m) operation - const selectedAddresses = new Set(this.state.userList.map(({address}) => address)); - const queryList = this.state.queryList.filter(({address}) => !selectedAddresses.has(address)); + // map addressType => set of addresses to avoid O(n*m) operation + const selectedAddresses = {}; + this.state.userList.forEach(({address, addressType}) => { + if (!selectedAddresses[addressType]) selectedAddresses[addressType] = new Set(); + selectedAddresses[addressType].add(address); + }); + + const queryList = this.state.queryList.filter(({address, addressType}) => { + return !selectedAddresses[addressType] || !selectedAddresses[addressType].has(address); + }); const query = []; // create the invite list From b18c95cdb57ca11068c755dc4493489d02383a62 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Jun 2018 10:03:35 +0100 Subject: [PATCH 195/283] js-sdk rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 33aa428d4b..c7cdfffb31 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "linkifyjs": "^2.1.3", "lodash": "^4.13.1", "lolex": "2.3.2", - "matrix-js-sdk": "0.10.4", + "matrix-js-sdk": "0.10.5-rc.1", "optimist": "^0.6.1", "pako": "^1.0.5", "prop-types": "^15.5.8", From f3d54a49b65bc220a76357d84b281afbda976ccb Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Jun 2018 10:06:52 +0100 Subject: [PATCH 196/283] Prepare changelog for v0.12.8-rc.1 --- CHANGELOG.md | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b97251604..2120e18a31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,99 @@ +Changes in [0.12.8-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.8-rc.1) (2018-06-21) +=============================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.7...v0.12.8-rc.1) + + * Update from Weblate. + [\#1997](https://github.com/matrix-org/matrix-react-sdk/pull/1997) + * refactor, consolidate and improve SlashCommands + [\#1988](https://github.com/matrix-org/matrix-react-sdk/pull/1988) + * Take replies out of labs! + [\#1996](https://github.com/matrix-org/matrix-react-sdk/pull/1996) + * re-merge reset PR + [\#1987](https://github.com/matrix-org/matrix-react-sdk/pull/1987) + * once command has a space, strict match instead of fuzzy match + [\#1985](https://github.com/matrix-org/matrix-react-sdk/pull/1985) + * Fix matrix.to URL RegExp + [\#1986](https://github.com/matrix-org/matrix-react-sdk/pull/1986) + * Fix blank sticker picker + [\#1984](https://github.com/matrix-org/matrix-react-sdk/pull/1984) + * fix e2ee file/media stuff + [\#1972](https://github.com/matrix-org/matrix-react-sdk/pull/1972) + * right click for room tile context menu + [\#1978](https://github.com/matrix-org/matrix-react-sdk/pull/1978) + * only show m.room.message in FilePanel + [\#1983](https://github.com/matrix-org/matrix-react-sdk/pull/1983) + * improve command provider + [\#1981](https://github.com/matrix-org/matrix-react-sdk/pull/1981) + * affix copyButton so that it doesn't get scrolled horizontally + [\#1980](https://github.com/matrix-org/matrix-react-sdk/pull/1980) + * split continuation if there is a gap in conversation + [\#1979](https://github.com/matrix-org/matrix-react-sdk/pull/1979) + * fix a bunch of instances of react console spam + [\#1973](https://github.com/matrix-org/matrix-react-sdk/pull/1973) + * Track decryption success/failure rate with piwik + [\#1949](https://github.com/matrix-org/matrix-react-sdk/pull/1949) + * route matrix.to/#/+... links internally (not just group ids) + [\#1975](https://github.com/matrix-org/matrix-react-sdk/pull/1975) + * implement `hitting enter after Ctrl-K should switch to the first result` + [\#1976](https://github.com/matrix-org/matrix-react-sdk/pull/1976) + * Remove tag panel feature flag + [\#1970](https://github.com/matrix-org/matrix-react-sdk/pull/1970) + * QuestionDialog pass hasCancelButton to DialogButtons + [\#1968](https://github.com/matrix-org/matrix-react-sdk/pull/1968) + * check type before msgtype in the case of `m.sticker` with msgtype + [\#1965](https://github.com/matrix-org/matrix-react-sdk/pull/1965) + * apply roomlist searchFilter to aliases if it begins with a `#` + [\#1957](https://github.com/matrix-org/matrix-react-sdk/pull/1957) + * Share Dialog + [\#1948](https://github.com/matrix-org/matrix-react-sdk/pull/1948) + * make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile + [\#1950](https://github.com/matrix-org/matrix-react-sdk/pull/1950) + * Fix widgets re-appearing after being deleted + [\#1958](https://github.com/matrix-org/matrix-react-sdk/pull/1958) + * Fix crash on unspecified thumbnail info, and handle gracefully + [\#1967](https://github.com/matrix-org/matrix-react-sdk/pull/1967) + * fix styling of clearButton when its not there + [\#1964](https://github.com/matrix-org/matrix-react-sdk/pull/1964) + * Implement slightly magical CSS soln. to thumbnail sizing + [\#1912](https://github.com/matrix-org/matrix-react-sdk/pull/1912) + * Select audio output for WebRTC + [\#1932](https://github.com/matrix-org/matrix-react-sdk/pull/1932) + * move css rule to be more generic; remove overriden rule + [\#1962](https://github.com/matrix-org/matrix-react-sdk/pull/1962) + * improve tag panel accessibility and remove a no-op dispatch + [\#1960](https://github.com/matrix-org/matrix-react-sdk/pull/1960) + * Revert "Fix exception when opening dev tools" + [\#1963](https://github.com/matrix-org/matrix-react-sdk/pull/1963) + * fix message appears unencrypted while encrypting and not_sent + [\#1959](https://github.com/matrix-org/matrix-react-sdk/pull/1959) + * Fix exception when opening dev tools + [\#1961](https://github.com/matrix-org/matrix-react-sdk/pull/1961) + * show redacted stickers like other redacted messages + [\#1956](https://github.com/matrix-org/matrix-react-sdk/pull/1956) + * add mx_filterFlipColor to mx_MemberInfo_cancel img + [\#1951](https://github.com/matrix-org/matrix-react-sdk/pull/1951) + * don't set the displayname on registration as Synapse now does it + [\#1953](https://github.com/matrix-org/matrix-react-sdk/pull/1953) + * allow CreateRoom to scale properly horizontally + [\#1955](https://github.com/matrix-org/matrix-react-sdk/pull/1955) + * Keep context menus that extend downwards vertically on screen + [\#1952](https://github.com/matrix-org/matrix-react-sdk/pull/1952) + * re-run checkIfAlone if a member change occurred in the active room + [\#1947](https://github.com/matrix-org/matrix-react-sdk/pull/1947) + * Persist pinned message open-ness between room switches + [\#1935](https://github.com/matrix-org/matrix-react-sdk/pull/1935) + * Pinned message cosmetic improvements + [\#1933](https://github.com/matrix-org/matrix-react-sdk/pull/1933) + * Update sinon to 5.0.7 + [\#1916](https://github.com/matrix-org/matrix-react-sdk/pull/1916) + * re-run checkIfAlone if a member change occurred in the active room + [\#1946](https://github.com/matrix-org/matrix-react-sdk/pull/1946) + * Replace "Login as guest" with "Try the app first" on login page + [\#1937](https://github.com/matrix-org/matrix-react-sdk/pull/1937) + * kill stream when using gUM for permission to device labels to turn off + camera + [\#1931](https://github.com/matrix-org/matrix-react-sdk/pull/1931) + Changes in [0.12.7](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.7) (2018-06-12) ===================================================================================================== [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.7-rc.1...v0.12.7) From 2b8bc8a80045af99dc3fb22cba825711427b7af1 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Jun 2018 10:06:53 +0100 Subject: [PATCH 197/283] v0.12.8-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c7cdfffb31..7da47f27c3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.12.7", + "version": "0.12.8-rc.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From 2428eb12af651db687a5afed4804dcd258a9df3d Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 21 Jun 2018 11:37:06 +0100 Subject: [PATCH 198/283] delint ChatCreateOrReuseDialog Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../views/dialogs/ChatCreateOrReuseDialog.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/components/views/dialogs/ChatCreateOrReuseDialog.js b/src/components/views/dialogs/ChatCreateOrReuseDialog.js index 9228e59280..b7cf0f5a6e 100644 --- a/src/components/views/dialogs/ChatCreateOrReuseDialog.js +++ b/src/components/views/dialogs/ChatCreateOrReuseDialog.js @@ -1,5 +1,6 @@ /* Copyright 2017 Vector Creations Ltd +Copyright 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -28,6 +29,7 @@ export default class ChatCreateOrReuseDialog extends React.Component { constructor(props) { super(props); + this.onFinished = this.onFinished.bind(this); this.onRoomTileClick = this.onRoomTileClick.bind(this); this.state = { @@ -53,10 +55,7 @@ export default class ChatCreateOrReuseDialog extends React.Component { const room = client.getRoom(roomId); if (room) { const me = room.getMember(client.credentials.userId); - const highlight = ( - room.getUnreadNotificationCount('highlight') > 0 || - me.membership == "invite" - ); + const highlight = room.getUnreadNotificationCount('highlight') > 0 || me.membership === "invite"; tiles.push( , ); @@ -110,6 +109,10 @@ export default class ChatCreateOrReuseDialog extends React.Component { this.props.onExistingRoomSelected(roomId); } + onFinished() { + this.props.onFinished(false); + } + render() { let title = ''; let content = null; @@ -177,7 +180,7 @@ export default class ChatCreateOrReuseDialog extends React.Component { const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); return ( From 073796507937c72bb56efcec7ab8fc032b1bd0a9 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 21 Jun 2018 12:13:27 +0100 Subject: [PATCH 199/283] s/userList/selectedList/ & s/queryList/suggestedList/ Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../views/dialogs/AddressPickerDialog.js | 81 +++++++++---------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js index a87ffbb518..2dabe317dd 100644 --- a/src/components/views/dialogs/AddressPickerDialog.js +++ b/src/components/views/dialogs/AddressPickerDialog.js @@ -73,7 +73,7 @@ module.exports = React.createClass({ // List of UserAddressType objects representing // the list of addresses we're going to invite - userList: [], + selectedList: [], // Whether a search is ongoing busy: false, @@ -83,10 +83,9 @@ module.exports = React.createClass({ serverSupportsUserDirectory: true, // The query being searched for query: "", - // List of UserAddressType objects representing - // the set of auto-completion results for the current search - // query. - queryList: [], + // List of UserAddressType objects representing the set of + // auto-completion results for the current search query. + suggestedList: [], }; }, @@ -98,14 +97,14 @@ module.exports = React.createClass({ }, onButtonClick: function() { - let userList = this.state.userList.slice(); + let selectedList = this.state.selectedList.slice(); // Check the text input field to see if user has an unconverted address - // If there is and it's valid add it to the local userList + // If there is and it's valid add it to the local selectedList if (this.refs.textinput.value !== '') { - userList = this._addInputToList(); - if (userList === null) return; + selectedList = this._addInputToList(); + if (selectedList === null) return; } - this.props.onFinished(true, userList); + this.props.onFinished(true, selectedList); }, onCancel: function() { @@ -125,14 +124,14 @@ module.exports = React.createClass({ e.stopPropagation(); e.preventDefault(); if (this.addressSelector) this.addressSelector.moveSelectionDown(); - } else if (this.state.queryList.length > 0 && (e.keyCode === 188 || e.keyCode === 13 || e.keyCode === 9)) { // comma or enter or tab + } else if (this.state.suggestedList.length > 0 && (e.keyCode === 188 || e.keyCode === 13 || e.keyCode === 9)) { // comma or enter or tab e.stopPropagation(); e.preventDefault(); if (this.addressSelector) this.addressSelector.chooseSelection(); - } else if (this.refs.textinput.value.length === 0 && this.state.userList.length && e.keyCode === 8) { // backspace + } else if (this.refs.textinput.value.length === 0 && this.state.selectedList.length && e.keyCode === 8) { // backspace e.stopPropagation(); e.preventDefault(); - this.onDismissed(this.state.userList.length - 1)(); + this.onDismissed(this.state.selectedList.length - 1)(); } else if (e.keyCode === 13) { // enter e.stopPropagation(); e.preventDefault(); @@ -177,7 +176,7 @@ module.exports = React.createClass({ }, QUERY_USER_DIRECTORY_DEBOUNCE_MS); } else { this.setState({ - queryList: [], + suggestedList: [], query: "", searchError: null, }); @@ -186,11 +185,11 @@ module.exports = React.createClass({ onDismissed: function(index) { return () => { - const userList = this.state.userList.slice(); - userList.splice(index, 1); + const selectedList = this.state.selectedList.slice(); + selectedList.splice(index, 1); this.setState({ - userList: userList, - queryList: [], + selectedList, + suggestedList: [], query: "", }); if (this._cancelThreepidLookup) this._cancelThreepidLookup(); @@ -204,11 +203,11 @@ module.exports = React.createClass({ }, onSelected: function(index) { - const userList = this.state.userList.slice(); - userList.push(this.state.queryList[index]); + const selectedList = this.state.selectedList.slice(); + selectedList.push(this.state.suggestedList[index]); this.setState({ - userList: userList, - queryList: [], + selectedList, + suggestedList: [], query: "", }); if (this._cancelThreepidLookup) this._cancelThreepidLookup(); @@ -386,10 +385,10 @@ module.exports = React.createClass({ }, _processResults: function(results, query) { - const queryList = []; + const suggestedList = []; results.forEach((result) => { if (result.room_id) { - queryList.push({ + suggestedList.push({ addressType: 'mx-room-id', address: result.room_id, displayName: result.name, @@ -406,7 +405,7 @@ module.exports = React.createClass({ // Return objects, structure of which is defined // by UserAddressType - queryList.push({ + suggestedList.push({ addressType: 'mx-user-id', address: result.user_id, displayName: result.display_name, @@ -420,7 +419,7 @@ module.exports = React.createClass({ // a perfectly valid address if there are close matches. const addrType = getAddressType(query); if (this.props.validAddressTypes.includes(addrType)) { - queryList.unshift({ + suggestedList.unshift({ addressType: addrType, address: query, isKnown: false, @@ -431,7 +430,7 @@ module.exports = React.createClass({ } } this.setState({ - queryList, + suggestedList, error: false, }, () => { if (this.addressSelector) this.addressSelector.moveSelectionTop(); @@ -465,15 +464,15 @@ module.exports = React.createClass({ } } - const userList = this.state.userList.slice(); - userList.push(addrObj); + const selectedList = this.state.selectedList.slice(); + selectedList.push(addrObj); this.setState({ - userList: userList, - queryList: [], + selectedList, + suggestedList: [], query: "", }); if (this._cancelThreepidLookup) this._cancelThreepidLookup(); - return userList; + return selectedList; }, _lookupThreepid: function(medium, address) { @@ -499,7 +498,7 @@ module.exports = React.createClass({ if (res === null) return null; if (cancelled) return null; this.setState({ - queryList: [{ + suggestedList: [{ // a UserAddressType addressType: medium, address: address, @@ -519,24 +518,24 @@ module.exports = React.createClass({ // map addressType => set of addresses to avoid O(n*m) operation const selectedAddresses = {}; - this.state.userList.forEach(({address, addressType}) => { + this.state.selectedList.forEach(({address, addressType}) => { if (!selectedAddresses[addressType]) selectedAddresses[addressType] = new Set(); selectedAddresses[addressType].add(address); }); - const queryList = this.state.queryList.filter(({address, addressType}) => { + const filteredSuggestedList = this.state.suggestedList.filter(({address, addressType}) => { return !selectedAddresses[addressType] || !selectedAddresses[addressType].has(address); }); const query = []; // create the invite list - if (this.state.userList.length > 0) { + if (this.state.selectedList.length > 0) { const AddressTile = sdk.getComponent("elements.AddressTile"); - for (let i = 0; i < this.state.userList.length; i++) { + for (let i = 0; i < this.state.selectedList.length; i++) { query.push( , @@ -546,7 +545,7 @@ module.exports = React.createClass({ // Add the query at the end query.push( -