From ee9f781adc484b9a22a0db533250116e95a28c6a Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 25 Apr 2018 15:37:24 +0100 Subject: [PATCH 01/33] js-sdk & react-sdk RCs --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0e8d62737c..e63160ab0f 100644 --- a/package.json +++ b/package.json @@ -60,8 +60,8 @@ "browser-request": "^0.3.3", "extract-text-webpack-plugin": "^0.9.1", "favico.js": "^0.3.10", - "matrix-js-sdk": "0.10.1", - "matrix-react-sdk": "0.12.2", + "matrix-js-sdk": "0.10.2-rc.1", + "matrix-react-sdk": "0.12.3-rc.1", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 3dcf1949607eb9435b07e83708b4300799dd798e Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 25 Apr 2018 15:41:33 +0100 Subject: [PATCH 02/33] v0.14.2-rc.1 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 8c23a8ff76..22fd89d4fc 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.14.1", + "version": "0.14.2-rc.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 8e218f12b42aa2419c83962011dd7e0a4ed201f5 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 25 Apr 2018 15:42:38 +0100 Subject: [PATCH 03/33] Prepare changelog for v0.14.2-rc.1 --- CHANGELOG.md | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e526076421..bdbc710286 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,45 @@ +Changes in [0.14.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.1) (2018-04-25) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.1...v0.14.2-rc.1) + + * Update from Weblate. + [\#6602](https://github.com/vector-im/riot-web/pull/6602) + * Add readme bit on cross-origin renderer + [\#6600](https://github.com/vector-im/riot-web/pull/6600) + * Update from Weblate. + [\#6573](https://github.com/vector-im/riot-web/pull/6573) + * Copy media from react-sdk + [\#6588](https://github.com/vector-im/riot-web/pull/6588) + * Fix favicon + [\#6580](https://github.com/vector-im/riot-web/pull/6580) + * Update from Weblate. + [\#6569](https://github.com/vector-im/riot-web/pull/6569) + * move everything not explicitly riot (or status) branded into matrix-react- + sdk + [\#6500](https://github.com/vector-im/riot-web/pull/6500) + * Remove presence management + [\#5881](https://github.com/vector-im/riot-web/pull/5881) + * change vector-web repo to riot-web in changelog + [\#6480](https://github.com/vector-im/riot-web/pull/6480) + * Update from Weblate. + [\#6473](https://github.com/vector-im/riot-web/pull/6473) + * Bump source-map-loader version to avoid bug /w inline base64 maps + [\#6472](https://github.com/vector-im/riot-web/pull/6472) + * Add CSS for new group admin radio button + [\#6415](https://github.com/vector-im/riot-web/pull/6415) + * Rxl881/sticker picker styling + [\#6447](https://github.com/vector-im/riot-web/pull/6447) + * Stickerpacks + [\#6242](https://github.com/vector-im/riot-web/pull/6242) + * Force gemini on HomePage + [\#6368](https://github.com/vector-im/riot-web/pull/6368) + * Rename the Riot-Web Translations Room + [\#6348](https://github.com/vector-im/riot-web/pull/6348) + * Add disable-presence-by-hs option to sample config + [\#6350](https://github.com/vector-im/riot-web/pull/6350) + * Reword the BugReportDialog.js as per @lampholder + [\#6354](https://github.com/vector-im/riot-web/pull/6354) + Changes in [0.14.1](https://github.com/vector-im/riot-web/releases/tag/v0.14.1) (2018-04-12) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.0...v0.14.1) From 8d4d16bde155c624d4245e45c6cad3e46b552a2a Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 25 Apr 2018 16:35:13 +0100 Subject: [PATCH 04/33] Bump react-sdk version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e63160ab0f..e718f745b2 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "extract-text-webpack-plugin": "^0.9.1", "favico.js": "^0.3.10", "matrix-js-sdk": "0.10.2-rc.1", - "matrix-react-sdk": "0.12.3-rc.1", + "matrix-react-sdk": "0.12.3-rc.2", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 083dd4eeecf9f26c76c16564581e0c9e5a384044 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 25 Apr 2018 16:36:16 +0100 Subject: [PATCH 05/33] Temporarily revert electron version bump --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 22fd89d4fc..8c23a8ff76 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.14.2-rc.1", + "version": "0.14.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 981bd94615dbd49075af7bd87baab42ba97eca7d Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 25 Apr 2018 17:33:18 +0100 Subject: [PATCH 06/33] Change CSS dependencies to not hardcoded paths Add add direct dependencies on the packages they come from, because referring to them by path like this doesn't work in a frash checkout / npm install because of how npm lays out the packages. --- package.json | 4 ++++ src/vector/index.js | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index e718f745b2..f59f78785e 100644 --- a/package.json +++ b/package.json @@ -58,8 +58,12 @@ "babel-runtime": "^6.11.6", "bluebird": "^3.5.0", "browser-request": "^0.3.3", + "draft-js": "^0.10.5", "extract-text-webpack-plugin": "^0.9.1", "favico.js": "^0.3.10", + "gemini-scrollbar": "^1.5.3", + "gfm.css": "^1.1.2", + "highlight.js": "^9.12.0", "matrix-js-sdk": "0.10.2-rc.1", "matrix-react-sdk": "0.12.3-rc.2", "modernizr": "^3.1.0", diff --git a/src/vector/index.js b/src/vector/index.js index 63affadde9..183e0b50eb 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -32,10 +32,10 @@ require('babel-polyfill'); // Require common CSS here; this will make webpack process it into bundle.css. // Our own CSS (which is themed) is imported via separate webpack entry points // in webpack.config.js -require('matrix-react-sdk/node_modules/gemini-scrollbar/gemini-scrollbar.css'); -require('matrix-react-sdk/node_modules/gfm.css/gfm.css'); -require('matrix-react-sdk/node_modules/highlight.js/styles/github.css'); -require('matrix-react-sdk/node_modules/draft-js/dist/Draft.css'); +require('gemini-scrollbar/gemini-scrollbar.css'); +require('gfm.css/gfm.css'); +require('highlight.js/styles/github.css'); +require('draft-js/dist/Draft.css'); const rageshake = require("matrix-react-sdk/lib/rageshake/rageshake"); rageshake.init().then(() => { From 8b99a72f2c74317a3b702a30981d4999af2a940c Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 25 Apr 2018 17:37:35 +0100 Subject: [PATCH 07/33] v0.14.2-rc.1 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 8c23a8ff76..22fd89d4fc 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.14.1", + "version": "0.14.2-rc.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 5923417654039c6cc77ba884ec1d32055e56466d Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 25 Apr 2018 17:39:56 +0100 Subject: [PATCH 08/33] v0.14.2-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f59f78785e..0d2e3b5c60 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.14.1", + "version": "0.14.2-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 18ba570c747f2bf6f5dc9f3f590627b6dde0a493 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 26 Apr 2018 11:33:44 +0100 Subject: [PATCH 09/33] Bump react-sdk version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0d2e3b5c60..eca9d7de60 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.12.0", "matrix-js-sdk": "0.10.2-rc.1", - "matrix-react-sdk": "0.12.3-rc.2", + "matrix-react-sdk": "0.12.3-rc.3", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 45661dd9603a9d088bc7bac1939d4adefd2a5f67 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 26 Apr 2018 11:37:49 +0100 Subject: [PATCH 10/33] changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bdbc710286..aecc5f8b9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.14.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.2) (2018-04-26) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.1...v0.14.2-rc.2) + + * Fix Download of attachments in e2e encrypted rooms in Firefox + Changes in [0.14.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.1) (2018-04-25) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.1...v0.14.2-rc.1) From 73e4fcafdc22896021baf210d8b509af5db3db15 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 26 Apr 2018 11:44:36 +0100 Subject: [PATCH 11/33] v0.14.2-rc.2 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 22fd89d4fc..f4024b6535 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.14.2-rc.1", + "version": "0.14.2-rc.2", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From b8f7025f2abb20b26dfb9d7a25946cdaa0c89cc8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 26 Apr 2018 11:46:38 +0100 Subject: [PATCH 12/33] v0.14.2-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eca9d7de60..df8583a201 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.14.2-rc.1", + "version": "0.14.2-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 1eb82d97ae514fa61db54fa8061f95b724aa94d8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 26 Apr 2018 15:25:20 +0100 Subject: [PATCH 13/33] Fix dependencies to the same versions as react-sdk Otherwise Things Get Weird, eg. headers in the left panel end up in the wrong place because the gemini scrollbar CSS has changed between versions. --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index df8583a201..b76ae22c52 100644 --- a/package.json +++ b/package.json @@ -58,12 +58,12 @@ "babel-runtime": "^6.11.6", "bluebird": "^3.5.0", "browser-request": "^0.3.3", - "draft-js": "^0.10.5", + "draft-js": "^0.11.0-alpha", "extract-text-webpack-plugin": "^0.9.1", "favico.js": "^0.3.10", - "gemini-scrollbar": "^1.5.3", - "gfm.css": "^1.1.2", - "highlight.js": "^9.12.0", + "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279", + "gfm.css": "^1.1.1", + "highlight.js": "^9.0.0", "matrix-js-sdk": "0.10.2-rc.1", "matrix-react-sdk": "0.12.3-rc.3", "modernizr": "^3.1.0", From 6dad8e695e4a3b8e2623398dc21598a1cd78f498 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 26 Apr 2018 15:35:51 +0100 Subject: [PATCH 14/33] v0.14.2-rc.3 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index f4024b6535..b3b650404e 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.14.2-rc.2", + "version": "0.14.2-rc.3", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 3d1c2fa5f12e2f7db1d05de6cf6348b7790703b2 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 26 Apr 2018 15:38:17 +0100 Subject: [PATCH 15/33] Prepare changelog for v0.14.2-rc.3 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aecc5f8b9b..b26fecc11f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [0.14.2-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.3) (2018-04-26) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.2...v0.14.2-rc.3) + + * Fix CSS dependency versions to be the same as those in react-sdk to fix + left panel header positions. + Changes in [0.14.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.2) (2018-04-26) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.1...v0.14.2-rc.2) From 137665685d429902349cae8a250e58ce785767f0 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 26 Apr 2018 15:38:18 +0100 Subject: [PATCH 16/33] v0.14.2-rc.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b76ae22c52..2e9cd6c381 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.14.2-rc.2", + "version": "0.14.2-rc.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 53f44c5459cc2c0dc7c3daafbd29552e8fa89b37 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: Fri, 26 Jan 2018 20:33:20 +0000 Subject: [PATCH 17/33] Translated using Weblate (Serbian) Currently translated at 100.0% (37 of 37 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/ --- src/i18n/strings/sr.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json index 31a0fb349d..053ceb64e9 100644 --- a/src/i18n/strings/sr.json +++ b/src/i18n/strings/sr.json @@ -34,5 +34,6 @@ "Support for those using, running and writing other bridges": "Подршка за оне који користе, одржавају и пишу друге мостове", "Contributing code to Matrix and Riot": "Додавање кода у Матрикс и Riot", "Dev chat for the Riot/Web dev team": "Програмерско ћаскање за Riot/веб програмерски тим", - "Dev chat for the Dendrite dev team": "Програмерско ћаскање за Dendrite програмерски тим" + "Dev chat for the Dendrite dev team": "Програмерско ћаскање за Dendrite програмерски тим", + "Co-ordination for Riot translators": "Координација за Riot преводиоце" } From 3df214c56e59ad24504c77d5b1fef7c82bc563ef Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 27 Apr 2018 12:57:37 +0100 Subject: [PATCH 18/33] Update hoek --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 64e2e49aef..958c27e174 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4955,9 +4955,9 @@ "integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4=" }, "hoek": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", - "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", + "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==" }, "hoist-non-react-statics": { "version": "2.3.1", From 9b055171abd19df03547bfdd4ad39a3233d98df8 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Fri, 27 Apr 2018 13:32:09 +0100 Subject: [PATCH 19/33] Enforce loading babel-polyfill first This is to avoid loading anything before loading the polyfill, otherwise we risk loading dependencies (such as React) before it. This was causing the compatibility page to fail somehow. See https://github.com/facebook/react/issues/8379 Fixes https://github.com/vector-im/riot-web/issues/6562 --- src/vector/index.js | 12 ------------ webpack.config.js | 5 +++++ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/vector/index.js b/src/vector/index.js index 63affadde9..0b14c6a1d7 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -17,18 +17,6 @@ limitations under the License. 'use strict'; -// for ES6 stuff like startsWith() that Safari doesn't handle -// and babel doesn't do by default -// Note we use this, as well as the babel transform-runtime plugin -// since transform-runtime does not cover instance methods -// such as "foobar".includes("foo") which bits of our library -// code use, but the babel transform-runtime plugin allows the -// regenerator runtime to be injected early enough in the process -// (it can't be here as it's too late: the alternative is to put -// the babel-polyfill as the first 'entry' in the webpack config). -// https://babeljs.io/docs/plugins/transform-runtime/ -require('babel-polyfill'); - // Require common CSS here; this will make webpack process it into bundle.css. // Our own CSS (which is themed) is imported via separate webpack entry points // in webpack.config.js diff --git a/webpack.config.js b/webpack.config.js index d82d4bcc89..81e0c1794d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -8,6 +8,11 @@ if (!og_image_url) og_image_url = 'https://riot.im/app/themes/riot/img/logos/rio module.exports = { entry: { + main: [ + // Load this first to avoid issues where some imports (namely react) + // potentially before babel-polyfill. + 'babel-polyfill', + ], "bundle": "./src/vector/index.js", "indexeddb-worker": "./src/vector/indexeddb-worker.js", From c56b54eddddd75f1eabfccda5166165d6b44cd82 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Fri, 27 Apr 2018 15:12:16 +0100 Subject: [PATCH 20/33] Load babel-polyfill in the bundle entry, before index.js --- webpack.config.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 81e0c1794d..2a116f5777 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -8,12 +8,9 @@ if (!og_image_url) og_image_url = 'https://riot.im/app/themes/riot/img/logos/rio module.exports = { entry: { - main: [ - // Load this first to avoid issues where some imports (namely react) - // potentially before babel-polyfill. - 'babel-polyfill', - ], - "bundle": "./src/vector/index.js", + // Load babel-polyfill first to avoid issues where some imports (namely react) + // are potentially loaded before babel-polyfill. + "bundle": ["babel-polyfill", "./src/vector/index.js"], "indexeddb-worker": "./src/vector/indexeddb-worker.js", // We ship olm.js as a separate lump of javascript. This makes it get From 181efcfbae19c6f4e8e6ce9eb86e13a5b75a83db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20V=C3=A1gner?= Date: Wed, 8 Nov 2017 12:12:52 +0000 Subject: [PATCH 21/33] Translated using Weblate (Slovak) Currently translated at 100.0% (37 of 37 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/ --- src/i18n/strings/sk.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json index 3425ef0b83..e01933b287 100644 --- a/src/i18n/strings/sk.json +++ b/src/i18n/strings/sk.json @@ -34,5 +34,6 @@ "Support for those using, running and writing other bridges": "Podpora pre používateľov, prevádzkovateľov a tvorcov premostení do ďalších sietí", "Contributing code to Matrix and Riot": "Prispievanie kódu projektom Matrix a Riot", "Dev chat for the Riot/Web dev team": "Diskusia pre tím vývojárov Riot/Web", - "Dev chat for the Dendrite dev team": "Diskusia pre tím vývojárov Dendrite" + "Dev chat for the Dendrite dev team": "Diskusia pre tím vývojárov Dendrite", + "Co-ordination for Riot translators": "Koordinácia prekladov Riot" } From ff8f617fc6e34428f8bdd47e86e8f5f7d04c46d6 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 30 Apr 2018 13:42:38 +0100 Subject: [PATCH 22/33] Released react-sdk & js-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2e9cd6c381..98638e3532 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", - "matrix-js-sdk": "0.10.2-rc.1", - "matrix-react-sdk": "0.12.3-rc.3", + "matrix-js-sdk": "0.10.2", + "matrix-react-sdk": "0.12.3", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 9235c0dcfad316dfe55f2242af7892ea4dd1be1e Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 30 Apr 2018 13:43:04 +0100 Subject: [PATCH 23/33] v0.14.2 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index b3b650404e..2eb681ec0d 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.14.2-rc.3", + "version": "0.14.2", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 8afdbab9d5e9a7d641dd67990f1eb466eddfd717 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 30 Apr 2018 13:44:23 +0100 Subject: [PATCH 24/33] Prepare changelog for v0.14.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b26fecc11f..43b227408e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.14.2](https://github.com/vector-im/riot-web/releases/tag/v0.14.2) (2018-04-30) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.3...v0.14.2) + + * No changes since rc.3 + Changes in [0.14.2-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.3) (2018-04-26) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.2...v0.14.2-rc.3) From 76d4a4f3fe7b6aa9188fd3ea3fda5c2c0dc58860 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 30 Apr 2018 13:44:23 +0100 Subject: [PATCH 25/33] v0.14.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 98638e3532..26bde29d1a 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.14.2-rc.3", + "version": "0.14.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 48a16464d588671c1db78a34e45bd044c9d8be11 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 30 Apr 2018 16:00:17 +0100 Subject: [PATCH 26/33] Don't show presence on matrix.org --- electron_app/riot.im/config.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index 5b2fe37ba0..ed4a19a374 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -19,5 +19,8 @@ "piwik": { "url": "https://piwik.riot.im/", "siteId": 1 + }, + "enable_presence_by_hs_url": { + "https://matrix.org/": false } } From dd7ae83226a2a4b0a0a0e30141f9596f060a4ada Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 30 Apr 2018 16:12:53 +0100 Subject: [PATCH 27/33] No trailing / --- electron_app/riot.im/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index ed4a19a374..099db1b57d 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -21,6 +21,6 @@ "siteId": 1 }, "enable_presence_by_hs_url": { - "https://matrix.org/": false + "https://matrix.org": false } } From d2e4d3bc1c4c47eeea7003d557a6aca3c05de225 Mon Sep 17 00:00:00 2001 From: Goudarz Jafari Date: Sat, 28 Apr 2018 20:18:44 +0000 Subject: [PATCH 28/33] Translated using Weblate (Persian) Currently translated at 97.2% (36 of 37 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fa/ --- src/i18n/strings/fa.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json index fda0d14d1e..adcf0f903c 100644 --- a/src/i18n/strings/fa.json +++ b/src/i18n/strings/fa.json @@ -33,5 +33,6 @@ "Implementing VoIP services with Matrix": "پیاده‌سازی سرویس‌های VoIP با ماتریکس", "Discussion of the Identity Service API": "بحث درمورد API سرویس هویت", "Building services on Matrix": "ساخت سرویس بر روی ماتریکس", - "Support for those using the Matrix spec": "پشتیبانی برای آنان که از مستندات ماتریکس استفاده می‌کنند" + "Support for those using the Matrix spec": "پشتیبانی برای آنان که از مستندات ماتریکس استفاده می‌کنند", + "Co-ordination for Riot translators": "هماهنگی برای مترجمان Riot" } From 81c2bf68147a25cdc986cb6c5252d77f90f3e7e0 Mon Sep 17 00:00:00 2001 From: Kenneth Larsson Date: Thu, 15 Mar 2018 09:55:24 +0000 Subject: [PATCH 29/33] Translated using Weblate (Swedish) Currently translated at 100.0% (37 of 37 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sv/ --- src/i18n/strings/sv.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index 918824e5bb..eb59cd6f48 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -34,5 +34,6 @@ "Riot/Android & matrix-android-sdk chat": "Riot/Android & matrix-android-sdk-chatt", "Admin support for Dendrite": "Hjälp för administratörer av Dendrite", "Building services on Matrix": "Bygga tjänster med Matrix", - "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Du kan använda anpassade serverinställningar för att logga in på andra Matrix-servrar genom att ange en annan hemserver-URL.
Du kan då använda Riot med ett befintligt Matrix-konto på en annan hemserver.

Du kan också ange en anpassad identitetsserver men kommer då inte kunna bjuda in användare med epostadress, eller själv bli inbjuden med epostadress." + "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Du kan använda anpassade serverinställningar för att logga in på andra Matrix-servrar genom att ange en annan hemserver-URL.
Du kan då använda Riot med ett befintligt Matrix-konto på en annan hemserver.

Du kan också ange en anpassad identitetsserver men kommer då inte kunna bjuda in användare med epostadress, eller själv bli inbjuden med epostadress.", + "Co-ordination for Riot translators": "Koordination för Riot-översättare" } From 5bab9a7e34c74eeaf0e6dfeb9ac9a46fdbbb34d5 Mon Sep 17 00:00:00 2001 From: daniel tygel Date: Mon, 26 Feb 2018 20:43:19 +0000 Subject: [PATCH 30/33] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (37 of 37 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/ --- src/i18n/strings/pt_BR.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index 0c78fb602b..afdfc1604b 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -34,5 +34,6 @@ "Dev chat for the Dendrite dev team": "Chat de desenvolvimento para o time devel do Dendrite", "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Muitas salas já existem no Matrix, algumas independentes, e outras relacionadas a redes existentes (tais como Slack, IRC, Gitter, entre outras). Dê uma olhada na lista de salas públicas!", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo impulsionado por [matrix]", - "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Você pode usar as opções customizadas de servidor para conectar-se a outros servidores Matrix ao especificar uma outra URL de Servidor de Base (homeserver).
Isso permite que você use o Riot com uma conta Matrix existente em outro servidor de base.

Você também pode definir um servidor de identidade customizado, mas neste caso você não poderá convidar outras pesoas por endereço de email, ou ser convidada/o pelo seu endereço de email." + "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Você pode usar as opções customizadas de servidor para conectar-se a outros servidores Matrix ao especificar uma outra URL de Servidor de Base (homeserver).
Isso permite que você use o Riot com uma conta Matrix existente em outro servidor de base.

Você também pode definir um servidor de identidade customizado, mas neste caso você não poderá convidar outras pesoas por endereço de email, ou ser convidada/o pelo seu endereço de email.", + "Co-ordination for Riot translators": "Coordenação para tradutores Riot" } From a8a5d9e0539bd7e2ee9f042b7d3931ea67f1a687 Mon Sep 17 00:00:00 2001 From: Walter Date: Fri, 17 Nov 2017 20:15:46 +0000 Subject: [PATCH 31/33] Translated using Weblate (Ukrainian) Currently translated at 100.0% (37 of 37 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/ --- src/i18n/strings/uk.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json index f0b1fc4b3d..6833276a67 100644 --- a/src/i18n/strings/uk.json +++ b/src/i18n/strings/uk.json @@ -34,5 +34,6 @@ "Dev chat for the Dendrite dev team": "Чат команди розробників Dendrite", "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "У мережі Matrix вже існує багато кімнат, що з'єднані як з існуючими мережами (Slack, IRC, Gitter тощо), так і незалежними. Подивіться у каталозі кімнат!", "Running Matrix services": "Запуск служби Matrix", - "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Ви можете використовувати параметри користувача сервера для входа на другі сервера Matrix, вказав другий URL-адресу домашнього сервера.
Це дозволяє використовувати Riot з обліковим записом Matrix який існує на другому домашньому сервері.

Окрім цього, можливо встановити ідентифікаційний сервер користувача, але ви не зможете запросити других користувачів та бути запрошенному використовуючи адресу електронної пошти." + "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Ви можете використовувати параметри користувача сервера для входа на другі сервера Matrix, вказав другий URL-адресу домашнього сервера.
Це дозволяє використовувати Riot з обліковим записом Matrix який існує на другому домашньому сервері.

Окрім цього, можливо встановити ідентифікаційний сервер користувача, але ви не зможете запросити других користувачів та бути запрошенному використовуючи адресу електронної пошти.", + "Co-ordination for Riot translators": "Координаційний чат для перекладачів Riot" } From 83d9ca080ac2f8771c753663bd2ec535cea93699 Mon Sep 17 00:00:00 2001 From: Simone Salsi Date: Wed, 2 May 2018 20:34:00 +0000 Subject: [PATCH 32/33] Translated using Weblate (Italian) Currently translated at 97.2% (36 of 37 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/ --- src/i18n/strings/it.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index 7f03f83486..58a812d6f6 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -5,7 +5,7 @@ "Riot Desktop on %(platformName)s": "Riot Desktop su %(platformName)s", "Riot is not supported on mobile web. Install the app?": "Riot non è supportato sul web mobile. Vuoi installare l'applicazione?", "Unknown device": "Dispositivo sconosciuto", - "You need to be using HTTPS to place a screen-sharing call.": "Devi usare HTTPS per utilizzare una chiamata con condivisione schermo.", + "You need to be using HTTPS to place a screen-sharing call.": "Devi usare HTTPS per instaurare una chiamata con condivisione schermo.", "Welcome to Riot.im": "Benvenuto/a su Riot.im", "Search the room directory": "Cerca nella lista delle stanze", "Chat with Riot Bot": "Chatta con Riot Bot", From 0e0067785174de35c9fe6947a62d0f5cbe063704 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Wed, 9 May 2018 13:48:06 +0100 Subject: [PATCH 33/33] Bump react-sdk dep to 12.4-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 26bde29d1a..3c4c88cf6d 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", "matrix-js-sdk": "0.10.2", - "matrix-react-sdk": "0.12.3", + "matrix-react-sdk": "0.12.4-rc.1", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0",