From d395fdcc6a4240c683fc19b9f98575c859f71ecc Mon Sep 17 00:00:00 2001 From: Abel Luck Date: Wed, 13 Feb 2019 11:59:36 +0100 Subject: [PATCH 01/60] Make scripts/make-icons.sh work on linux This commit detects if the macos-only utility `iconutil` is available in the PATH, if it is, then the icns is built as usual. However if it isn't (such as on a linux system), then it checks for `png2icns` and uses it if possible. Signed-off-by: Abel Luck --- scripts/make-icons.sh | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/scripts/make-icons.sh b/scripts/make-icons.sh index 19e48895df..2db5293df3 100755 --- a/scripts/make-icons.sh +++ b/scripts/make-icons.sh @@ -1,4 +1,10 @@ #!/bin/bash +# +# Converts an svg logo into the various image resources required by +# the various platforms deployments. +# +# On debian-based systems you need these deps: +# apt-get install xmlstarlet python3-cairosvg icnsutils if [ $# != 1 ] then @@ -52,7 +58,23 @@ cp "$tmpdir/256.png" "$tmpdir/Riot.iconset/icon_256x256.png" cp "$tmpdir/512.png" "$tmpdir/Riot.iconset/icon_256x256@2x.png" cp "$tmpdir/512.png" "$tmpdir/Riot.iconset/icon_512x512.png" cp "$tmpdir/1024.png" "$tmpdir/Riot.iconset/icon_512x512@2x.png" -iconutil -c icns -o electron_app/build/icon.icns "$tmpdir/Riot.iconset" + +if [ -x "$(command -v iconutil)" ]; then + # available on macos + iconutil -c icns -o electron_app/build/icon.icns "$tmpdir/Riot.iconset" +elif [ -x "$(command -v png2icns)" ]; then + # available on linux + # png2icns is more finicky about its input than iconutil + # 1. it doesn't support a 64x64 (aka 32x32@2x) + # 2. it doesn't like duplicates (128x128@2x == 256x256) + rm "$tmpdir/Riot.iconset/icon_128x128@2x.png" + rm "$tmpdir/Riot.iconset/icon_256x256@2x.png" + rm "$tmpdir/Riot.iconset/icon_16x16@2x.png" + rm "$tmpdir/Riot.iconset/icon_32x32@2x.png" + png2icns electron_app/build/icon.icns "$tmpdir"/Riot.iconset/*png +else + echo "WARNING: Unsupported platform. Skipping icns build" +fi cp "$tmpdir/36.png" "res/vector-icons/android-chrome-36x36.png" cp "$tmpdir/48.png" "res/vector-icons/android-chrome-48x48.png" From 1a6efb3a1c49337ce401a4f449e3d36c3d92b11f 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, 15 Feb 2019 08:09:56 +0000 Subject: [PATCH 02/60] Translated using Weblate (Serbian) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/ --- src/i18n/strings/sr.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json index 053ceb64e9..612c01babc 100644 --- a/src/i18n/strings/sr.json +++ b/src/i18n/strings/sr.json @@ -35,5 +35,12 @@ "Contributing code to Matrix and Riot": "Додавање кода у Матрикс и Riot", "Dev chat for the Riot/Web dev team": "Програмерско ћаскање за Riot/веб програмерски тим", "Dev chat for the Dendrite dev team": "Програмерско ћаскање за Dendrite програмерски тим", - "Co-ordination for Riot translators": "Координација за Riot преводиоце" + "Co-ordination for Riot translators": "Координација за Riot преводиоце", + "Sign In": "Пријава", + "Create Account": "Направи налог", + "Need help?": "Потребна помоћ?", + "Explore rooms": "Истражи собе", + "Room Directory": "Фасцикла са собама", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Можете користити опције прилагођеног сервера да бисте се пријавили на друге Матрикс сервере тако што ћете навести другачију адресу кућног сервера. Ово вам омогућава да користите Riot са постојећим Матрикс налогом на другом кућном серверу.", + "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.": "Такође, можете подесити прилагођени сервер идентитета али у том случају нећете моћи да позивате кориснике преко мејла адресе или да сами будете позвани преко мејл адресе." } From df1ff657969fbfcec62b0a20eea76eaa4969cef2 Mon Sep 17 00:00:00 2001 From: pebles Date: Fri, 15 Feb 2019 09:03:37 +0000 Subject: [PATCH 03/60] Translated using Weblate (Spanish) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/ --- src/i18n/strings/es.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index 921b4566d8..a07330f789 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -35,5 +35,12 @@ "Dev chat for the Dendrite dev team": "Conversaciones del equipo de desarrollo de Dendrite", "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Muchas salas ya están disponibles en Matrix, enlazadas a redes existentes (Slack, IRC, Gitter, etc) o independientes. ¡Revisa el directorio!", "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.": "Puedes usar las opciones del servidor personalizado para acceder a otros servidores Matrix especificando su URL.
Esto te permite usar Riot con una cuenta Matrix existente en un servidor doméstico distinto.

También puedes establecer un servidor de identidad personalizado pero no podrás invitar a otros usuarios usando su dirección de correo electrónico, y tampoco ser invitado por el tuyo.", - "Co-ordination for Riot translators": "Co-odinación de traductores de Riot" + "Co-ordination for Riot translators": "Co-odinación de traductores de Riot", + "Sign In": "Iniciar sesión", + "Create Account": "Crear cuenta", + "Need help?": "Ayuda?", + "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.": "También puedes definir un servidor de identidad personalizado, pero no podrás invitar a usuarios o ser inivitado usando direcciones de correo.", + "Explore rooms": "Explorar salas", + "Room Directory": "Directorio de salas", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Puedes usar la opción de servidor personalizado para iniciar sesión en otros servidores Matrix, especificando la dirección URL del servidor. Esto te permite usar una cuenta Matrix en un servidor diferente." } From 8766fcd089f6c03975957e73b66d7660ae9036e7 Mon Sep 17 00:00:00 2001 From: hectorfdezlopez Date: Fri, 15 Feb 2019 09:34:26 +0000 Subject: [PATCH 04/60] Translated using Weblate (Galician) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/ --- src/i18n/strings/gl.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index be3e3cc072..37e9c8887b 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -35,5 +35,12 @@ "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Xa existen multitude de salas en Matrix ben ligadas a redes existentes (Slack, IRC, Gitter etc) ou ben independentes. Busque no directorio!", "Riot/Android & matrix-android-sdk chat": "Riot/Android & sala de conversas matrix-android-sdk", "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.": "Pode utilizar as opcións persoais de servidor para conectarse a outros servidores Matrix indicando o enderezo URL dese servidor.
Isto permítelle utilizar Riot cunha conta Matrix existente en outro servidor.

Tamén pode empregar un servidor personalizado de identidade mais nese caso nin se poderán convidar a outros usuarios empregando os correo electrónicos nin tampouco eles o poderán convidar a vostede por correo.", - "Co-ordination for Riot translators": "Coordinación para tradutora/es de Riot" + "Co-ordination for Riot translators": "Coordinación para tradutora/es de Riot", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Podes usar as opcións de servidor personalizado para iniciar sesión en outros servidores Matrix especificando unha dirección diferente de servidor doméstico. Con esto podes usar Riot cunha conta Matrix existente noutro servidor doméstico.", + "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.": "Tamén podes fixar un servidor de identidade, pero non poderás invitar a usuarios polo enderezo de correo, e tampouco que te inviten.", + "Sign In": "Entrar", + "Create Account": "Crear conta", + "Need help?": "¿Precisas axuda?", + "Explore rooms": "Explorar salas", + "Room Directory": "Directorio de salas" } From 2e60037d9f8ef334bac93b864a8c7fec4a890b27 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Fri, 15 Feb 2019 16:11:33 +0100 Subject: [PATCH 05/60] add cache busting for app icons and msapp config xml --- src/vector/index.html | 24 ++++++++++++------------ webpack.config.js | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/vector/index.html b/src/vector/index.html index 5451ec5232..f24007c964 100644 --- a/src/vector/index.html +++ b/src/vector/index.html @@ -3,22 +3,22 @@ Riot - - - - - - - - - + + + + + + + + + - + - - + + <% for (var i=0; i < htmlWebpackPlugin.files.css.length; i++) { diff --git a/webpack.config.js b/webpack.config.js index aba990541b..6786d9e492 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -61,7 +61,7 @@ module.exports = { }), }, { - test: /\.(gif|png|svg|ttf)$/, + test: /\.(gif|png|svg|ttf|xml|ico)$/, // Use a content-based hash in the name so that we can set a long cache // lifetime for assets while still delivering changes quickly. oneOf: [ From 257611f1b48940b5196dbc4ebe8491ee51a96770 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Fri, 15 Feb 2019 22:29:28 -0600 Subject: [PATCH 06/60] Remove redesign issue template The redesign is just the design now Signed-off-by: Aaron Raimist --- .github/ISSUE_TEMPLATE/redesign_issue.md | 32 ------------------------ 1 file changed, 32 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/redesign_issue.md diff --git a/.github/ISSUE_TEMPLATE/redesign_issue.md b/.github/ISSUE_TEMPLATE/redesign_issue.md deleted file mode 100644 index 162d0a1285..0000000000 --- a/.github/ISSUE_TEMPLATE/redesign_issue.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -name: Redesign Issue -about: Bugs, feedback or feature requests specifically associated with the Redesign - project (https://riot.im/experimental) -title: '' -labels: redesign -assignees: '' - ---- - - - -- **Browser**: Chrome, Safari, Firefox? which version? -- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc? - -### Description - -Describe here the problem that you are experiencing, or the feature you are requesting. -Include screenshots if possible: you can drag and drop images below. - -### Steps to reproduce - -- For bugs, list the steps -- that reproduce the bug -- using hyphens as bullet points - -Describe how what happens differs from what you expected. - -Log: sent/not sent? From 3391689d29c798f1b1f47877648ab601d5921bd0 Mon Sep 17 00:00:00 2001 From: Jordi Mallach Date: Mon, 18 Feb 2019 11:30:13 +0000 Subject: [PATCH 07/60] Translated using Weblate (Catalan) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/ --- src/i18n/strings/ca.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json index ea3ecf2988..7d6b1e58d8 100644 --- a/src/i18n/strings/ca.json +++ b/src/i18n/strings/ca.json @@ -35,5 +35,12 @@ "Contributing code to Matrix and Riot": "Contribuir codi a Matrix i Riot", "Dev chat for the Riot/Web dev team": "Xat de l'equip de desenvolupadors Riot/Web", "Dev chat for the Dendrite dev team": "Xat de l'equip Dendrite per a desenvolupadors", - "Co-ordination for Riot translators": "Coordinació dels traductors del Riot" + "Co-ordination for Riot translators": "Coordinació dels traductors del Riot", + "Create Account": "Crea un compte", + "Need help?": "Necessiteu ajuda?", + "Explore rooms": "Exploreu les sales", + "Room Directory": "Directori de sales", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Podeu emprar les opcions personalitzades del servidor per iniciar la sessió en altres servidors de Matrix especificant un URL de servidor personal diferent. Això us permet emprar el Riot amb un compte de Matrix existent en un servidor personal diferent.", + "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.": "També podeu establir un servidor d'identitat personalitzat, però no podreu convidar usuaris o ser convidats vosaltres mateixos per adreça de correu electrònic.", + "Sign In": "Inicia la sessió" } From 878190ba279312ce906c20a3e9a1148fe06a399c Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 18 Feb 2019 16:11:41 +0100 Subject: [PATCH 08/60] add content hash to individual language files --- package.json | 1 + scripts/copy-res.js | 104 ++++++++++++++++++++++++++------------------ 2 files changed, 63 insertions(+), 42 deletions(-) diff --git a/package.json b/package.json index de7847c34b..19cc5e6af1 100644 --- a/package.json +++ b/package.json @@ -125,6 +125,7 @@ "karma-spec-reporter": "0.0.31", "karma-summary-reporter": "^1.5.1", "karma-webpack": "4.0.0-beta.0", + "loader-utils": "^1.2.3", "matrix-mock-request": "^1.2.2", "matrix-react-test-utils": "^0.2.0", "minimist": "^1.2.0", diff --git a/scripts/copy-res.js b/scripts/copy-res.js index cde96bc419..f1ed15b5d5 100755 --- a/scripts/copy-res.js +++ b/scripts/copy-res.js @@ -1,5 +1,7 @@ #!/usr/bin/env node +const loaderUtils = require("loader-utils"); + // copies the resources into the webapp directory. // @@ -61,12 +63,6 @@ const COPY_LIST = [ ["./config.json", "webapp", { directwatch: 1 }], ]; -INCLUDE_LANGS.forEach(function(l) { - COPY_LIST.push([ - l.value, "webapp/i18n/", { lang: 1 }, - ]); -}); - const parseArgs = require('minimist'); const Cpx = require('cpx'); const chokidar = require('chokidar'); @@ -77,8 +73,8 @@ const argv = parseArgs( process.argv.slice(2), {} ); -var watch = argv.w; -var verbose = argv.v; +const watch = argv.w; +const verbose = argv.v; function errCheck(err) { if (err) { @@ -136,39 +132,11 @@ function next(i, err) { .on('change', copy) .on('ready', cb) .on('error', errCheck); - } else if (opts.lang) { - const reactSdkFile = 'node_modules/matrix-react-sdk/src/i18n/strings/' + source + '.json'; - const riotWebFile = 'src/i18n/strings/' + source + '.json'; - - // XXX: Use a debounce because for some reason if we read the language - // file immediately after the FS event is received, the file contents - // appears empty. Possibly https://github.com/nodejs/node/issues/6112 - let makeLangDebouncer; - const makeLang = () => { - if (makeLangDebouncer) { - clearTimeout(makeLangDebouncer); - } - makeLangDebouncer = setTimeout(() => { - genLangFile(source, dest); - }, 500); - }; - - [reactSdkFile, riotWebFile].forEach(function(f) { - chokidar.watch(f) - .on('add', makeLang) - .on('change', makeLang) - //.on('ready', cb) We'd have to do this when both files are ready - .on('error', errCheck); - }); - next(i + 1, err); } else { cpx.on('watch-ready', cb); cpx.on("watch-error", cb); cpx.watch(); } - } else if (opts.lang) { - genLangFile(source, dest); - next(i + 1, err); } else { cpx.copy(cb); } @@ -195,21 +163,28 @@ function genLangFile(lang, dest) { translations = weblateToCounterpart(translations); - fs.writeFileSync(dest + lang + '.json', JSON.stringify(translations, null, 4)); + const json = JSON.stringify(translations, null, 4); + const jsonBuffer = Buffer.from(json); + const digest = loaderUtils.getHashDigest(jsonBuffer, "sha512", "base64", 7); + const filename = `${lang}.${digest}.json`; + + fs.writeFileSync(dest + filename, json); if (verbose) { - console.log("Generated language file: " + lang); + console.log("Generated language file: " + filename); } + + return filename; } -function genLangList() { +function genLangList(langFileMap) { const languages = {}; INCLUDE_LANGS.forEach(function(lang) { const normalizedLanguage = lang.value.toLowerCase().replace("_", "-"); const languageParts = normalizedLanguage.split('-'); if (languageParts.length == 2 && languageParts[0] == languageParts[1]) { - languages[languageParts[0]] = {'fileName': lang.value + '.json', 'label': lang.label}; + languages[languageParts[0]] = {'fileName': langFileMap[lang.value], 'label': lang.label}; } else { - languages[normalizedLanguage] = {'fileName': lang.value + '.json', 'label': lang.label}; + languages[normalizedLanguage] = {'fileName': langFileMap[lang.value], 'label': lang.label}; } }); fs.writeFile('webapp/i18n/languages.json', JSON.stringify(languages, null, 4), function(err) { @@ -257,5 +232,50 @@ function weblateToCounterpart(inTrs) { return outTrs; } -genLangList(); +/** +watch the input files for a given language, +regenerate the file, adding its content-hashed filename to langFileMap +and regenerating languages.json with the new filename +*/ +function watchLanguage(lang, dest, langFileMap) { + const reactSdkFile = 'node_modules/matrix-react-sdk/src/i18n/strings/' + lang + '.json'; + const riotWebFile = 'src/i18n/strings/' + lang + '.json'; + + // XXX: Use a debounce because for some reason if we read the language + // file immediately after the FS event is received, the file contents + // appears empty. Possibly https://github.com/nodejs/node/issues/6112 + let makeLangDebouncer; + const makeLang = () => { + if (makeLangDebouncer) { + clearTimeout(makeLangDebouncer); + } + makeLangDebouncer = setTimeout(() => { + const filename = genLangFile(lang, dest); + langFileMap[lang]=filename; + genLangList(langFileMap); + }, 500); + }; + + [reactSdkFile, riotWebFile].forEach(function(f) { + chokidar.watch(f) + .on('add', makeLang) + .on('change', makeLang) + .on('error', errCheck); + }); +} + +// language resources +const I18N_DEST = "webapp/i18n/"; +const I18N_FILENAME_MAP = INCLUDE_LANGS.reduce((m, l) => { + const filename = genLangFile(l.value, I18N_DEST); + m[l.value] = filename; + return m; +}, {}); +genLangList(I18N_FILENAME_MAP); + +if (watch) { + INCLUDE_LANGS.forEach(l => watchLanguage(l.value, I18N_DEST, I18N_FILENAME_MAP)); +} + +// non-language resources next(0); From 070cc77e0fb1230e7d0335fbdbbe7a3bdf344a14 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 18 Feb 2019 16:12:04 +0100 Subject: [PATCH 09/60] add content hash to languages.json file using webpack file-loader --- webpack.config.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/webpack.config.js b/webpack.config.js index 6786d9e492..0aa43fddce 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -60,6 +60,20 @@ module.exports = { use: "css-loader", }), }, + { + // cache-bust languages.json file placed in + // riot-web/webapp/i18n during build by copy-res.js + test: /\.*languages.json$/, + type: "javascript/auto", + use: [ + { + loader: 'file-loader', + options: { + name: 'i18n/[name].[hash:7].[ext]', + }, + }, + ], + }, { test: /\.(gif|png|svg|ttf|xml|ico)$/, // Use a content-based hash in the name so that we can set a long cache From 223d8a87ca6725d21ac41432fcb76c74785ba894 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 18 Feb 2019 16:25:19 +0100 Subject: [PATCH 10/60] move relative path in react-sdk to webpack config file otherwise react-sdk can't build anymore with riot-web in a specific location --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 0aa43fddce..629e4db2a5 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -162,8 +162,8 @@ module.exports = { 'process.env': { NODE_ENV: JSON.stringify(process.env.NODE_ENV), }, + 'LANGUAGES_FILE': "'../../riot-web/webapp/i18n/languages.json'", // relative to languageHandler.js in matrix-react-sdk }), - new ExtractTextPlugin("bundles/[hash]/[name].css", { allChunks: true, }), From c2d14392b2e660619ebf3578fc417a4fbc5721a3 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 18 Feb 2019 17:26:49 +0100 Subject: [PATCH 11/60] allow setting the relative location of the language file for running the unit tests in ci, where riot-web is a subdirectory of react-sdk --- webpack.config.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 629e4db2a5..c3d85caf78 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -6,6 +6,12 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); let og_image_url = process.env.RIOT_OG_IMAGE_URL; if (!og_image_url) og_image_url = 'https://riot.im/app/themes/riot/img/logos/riot-im-logo-black-text.png'; +// relative to languageHandler.js in matrix-react-sdk +let RIOT_LANGUAGES_FILE = process.env.RIOT_LANGUAGES_FILE; +if (!RIOT_LANGUAGES_FILE) { + RIOT_LANGUAGES_FILE = "../../riot-web/webapp/i18n/languages.json"; +} + module.exports = { entry: { // Load babel-polyfill first to avoid issues where some imports (namely react) @@ -162,7 +168,7 @@ module.exports = { 'process.env': { NODE_ENV: JSON.stringify(process.env.NODE_ENV), }, - 'LANGUAGES_FILE': "'../../riot-web/webapp/i18n/languages.json'", // relative to languageHandler.js in matrix-react-sdk + 'LANGUAGES_FILE': JSON.stringify(RIOT_LANGUAGES_FILE), }), new ExtractTextPlugin("bundles/[hash]/[name].css", { allChunks: true, From e56206241ba1ae683e0eb3d14122210a8217b533 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 20 Feb 2019 09:39:27 +0100 Subject: [PATCH 12/60] use same hash format as webpack defaults --- scripts/copy-res.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/copy-res.js b/scripts/copy-res.js index f1ed15b5d5..4a2c6707d0 100755 --- a/scripts/copy-res.js +++ b/scripts/copy-res.js @@ -165,7 +165,7 @@ function genLangFile(lang, dest) { const json = JSON.stringify(translations, null, 4); const jsonBuffer = Buffer.from(json); - const digest = loaderUtils.getHashDigest(jsonBuffer, "sha512", "base64", 7); + const digest = loaderUtils.getHashDigest(jsonBuffer, null, null, 7); const filename = `${lang}.${digest}.json`; fs.writeFileSync(dest + filename, json); From 6a9c053536e7d4e1f95da7ca00f6b7be2f7388ac Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 20 Feb 2019 09:39:42 +0100 Subject: [PATCH 13/60] simplify config entry --- webpack.config.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index c3d85caf78..70ef0574a7 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -71,14 +71,10 @@ module.exports = { // riot-web/webapp/i18n during build by copy-res.js test: /\.*languages.json$/, type: "javascript/auto", - use: [ - { - loader: 'file-loader', - options: { - name: 'i18n/[name].[hash:7].[ext]', - }, - }, - ], + loader: 'file-loader', + options: { + name: 'i18n/[name].[hash:7].[ext]', + }, }, { test: /\.(gif|png|svg|ttf|xml|ico)$/, From b87f1f7713b8897cdd0ba3afa5a6ef0ae46a362b Mon Sep 17 00:00:00 2001 From: Herman S Date: Wed, 20 Feb 2019 12:13:17 +0000 Subject: [PATCH 14/60] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nb_NO/ --- src/i18n/strings/nb_NO.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json index 5019066afd..4162012e7a 100644 --- a/src/i18n/strings/nb_NO.json +++ b/src/i18n/strings/nb_NO.json @@ -10,7 +10,7 @@ "Dismiss": "Avvis", "Welcome to Riot.im": "Velkommen skal De være til Riot.im", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Desentralisert, kryptert nettprat & sammabeid drevet av [matrix]", - "Search the room directory": "Søk i romutvalget", + "Search the room directory": "Søk i alle rom", "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Allerede finnes det alskens rom i Matrix, sammenkoblet til eksisterende nettverk (Slack, IRC, Gitter osv.) eller selvstendig. Dersom De formoder, kan De kikke på utvalget!", "Chat with Riot Bot": "Nettprat med Riot Bot", "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Du kan bruke egendefinert tjener instillingen for å logge inn på andre Matrix tjenere ved å spesifisere enn annen hjemmetrjener URL. Dette lar deg bruke Riot med en eksisterende Matrix konto på en annen hjemmetjener.", @@ -28,5 +28,7 @@ "Announcements about Synapse releases": "Kunngjøring om Synapse utgivelser", "Sign In": "Logg inn", "Create Account": "Lag konto", - "Need help?": "Trenger du hjelp?" + "Need help?": "Trenger du hjelp?", + "Room Directory": "Alle rom", + "Explore rooms": "Se alle rom" } From 2dc26b4c5d0c2e4b201193d4fee36341dac57d92 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 19 Feb 2019 16:17:27 +0000 Subject: [PATCH 15/60] Document and recommend `default_server_name` This the recommended way to define a default server (instead of the existing HS and IS URL options). It will use `.well-known` discovery to find the URLs. See https://github.com/vector-im/riot-web/issues/8763. --- README.md | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 10fef7360e..d7c7ba96eb 100644 --- a/README.md +++ b/README.md @@ -116,17 +116,24 @@ config.json You can configure the app by copying `config.sample.json` to `config.json` and customising it: -For a good example, see https://riot.im/develop/config.json +For a good example, see https://riot.im/develop/config.json. -1. `default_hs_url` is the default homeserver url. -1. `default_is_url` is the default identity server url (this is the server used - for verifying third party identifiers like email addresses). If this is blank, - registering with an email address, adding an email address to your account, - or inviting users via email address will not work. Matrix identity servers are - very simple web services which map third party identifiers (currently only email - addresses) to matrix IDs: see http://matrix.org/docs/spec/identity_service/unstable.html - for more details. Currently the only public matrix identity servers are https://matrix.org - and https://vector.im. In future identity servers will be decentralised. +1. `default_server_name` sets the default server name to use for authentication. + This will trigger Riot to ask + `https:///.well-known/matrix/client` for the homeserver and + identity server URLs to use. This is the recommended approach for setting a + default server. However, it is also possible to use the following to directly + configure each of the URLs: + * `default_hs_url` sets the default homeserver URL. + * `default_is_url` sets the default identity server URL (this is the server used + for verifying third party identifiers like email addresses). If this is blank, + registering with an email address, adding an email address to your account, + or inviting users via email address will not work. Matrix identity servers are + very simple web services which map third party identifiers (currently only email + addresses) to matrix IDs: see http://matrix.org/docs/spec/identity_service/unstable.html + for more details. Currently the only public matrix identity servers are https://matrix.org + and https://vector.im. In the future, identity servers will be decentralised. + * Riot will report an error if you accidentally configure both `default_server_name` _and_ `default_hs_url` since it's unclear which should take priority. 1. `features`: Lookup of optional features that may be `enable`d, `disable`d, or exposed to the user in the `labs` section of settings. The available optional experimental features vary from release to release. From 09b17f77c21f96bda4aeb42c5c3af13b08f1faf1 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 21 Feb 2019 12:18:52 +0000 Subject: [PATCH 16/60] Fix language file path for Jenkins Jenkins seems to use a different layout of the repos than other environments. The sub-projects are cloned inside of the `riot-web` workspace. To account for this, we need to adjust the Riot language file path. --- scripts/package.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/package.sh b/scripts/package.sh index 23d0925b05..008803cac9 100755 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -14,7 +14,11 @@ else fi npm run clean -npm run build$dev +# riot-web is at `workspace`. +# matrix-react-sdk is at `workspace/node_modules/matrix-react-sdk`, but this is +# symlinked to a repo at `workspace/matrix-react-sdk`. +# To get from `workspace/matrix-react-sdk/lib` up to the lang file, we use: +RIOT_LANGUAGES_FILE="../../webapp/i18n/languages.json" npm run build$dev # include the sample config in the tarball. Arguably this should be done by # `npm run build`, but it's just too painful. From a4f541adada68d65e6bdf7d37bfa3510c7dfeebf Mon Sep 17 00:00:00 2001 From: Jaroslav Date: Thu, 21 Feb 2019 19:04:31 +0000 Subject: [PATCH 17/60] Translated using Weblate (Ukrainian) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/ --- src/i18n/strings/uk.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json index 6833276a67..85531a46c1 100644 --- a/src/i18n/strings/uk.json +++ b/src/i18n/strings/uk.json @@ -1,5 +1,5 @@ { - "Custom Server Options": "Нетипові параметри сервера", + "Custom Server Options": "Власні параметри сервера", "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s через %(browserName)s на %(osName)s", "Dismiss": "Відхилити", "powered by Matrix": "працює на Matrix", @@ -10,7 +10,7 @@ "Welcome to Riot.im": "Ласкаво просимо до Riot.im", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Децентралізований, шифрований чат та засіб для співробітництва, що працює на [matrix]", "Search the room directory": "Шукати у каталозі кімнат", - "Chat with Riot Bot": "Розмовляти з Riot-ботом", + "Chat with Riot Bot": "Чат із Riot-ботом", "Get started with some tips from Riot Bot!": "Розпочніть за допомогою декількох підказок від Riot-боту!", "General discussion about Matrix and Riot": "Загальне обговорення Matrix та Riot", "Discussion of all things Matrix!": "Обговорення усіх деталей про Matrix!", @@ -35,5 +35,12 @@ "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 який існує на другому домашньому сервері.

Окрім цього, можливо встановити ідентифікаційний сервер користувача, але ви не зможете запросити других користувачів та бути запрошенному використовуючи адресу електронної пошти.", - "Co-ordination for Riot translators": "Координаційний чат для перекладачів Riot" + "Co-ordination for Riot translators": "Координаційний чат для перекладачів Riot", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Ви можете використати власні параметри сервера для входу в інші Matrix сервери, вказавши інший URL. Це дозволить використовувати Riot з наявним обліковим записом Matrix на іншому сервері.", + "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.": "Ви також можете встановити власний сервер ідентифікації, але Ви не зможете запрошувати користувачів або бути запрошеним за адресою електронної пошти.", + "Need help?": "Допомогти?", + "Sign In": "Вхід", + "Create Account": "Створити аккаунт", + "Explore rooms": "Дослідити кімнати", + "Room Directory": "Каталог кімнат" } From c691b248a28981956891e8a35c7e1728c657a022 Mon Sep 17 00:00:00 2001 From: Akarshan Biswas Date: Fri, 22 Feb 2019 06:52:13 +0000 Subject: [PATCH 18/60] Translated using Weblate (Hindi) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hi/ --- src/i18n/strings/hi.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hi.json b/src/i18n/strings/hi.json index 82b716bd00..98c8405fa5 100644 --- a/src/i18n/strings/hi.json +++ b/src/i18n/strings/hi.json @@ -35,5 +35,12 @@ "Contributing code to Matrix and Riot": "मैट्रिक्स और रायट में कोड योगदान करना", "Dev chat for the Riot/Web dev team": "रायट / वेब डेव टीम के लिए डेवलपर चैट", "Dev chat for the Dendrite dev team": "डेन्ड्राइट देव टीम के लिए डेवलपर चैट", - "Co-ordination for Riot translators": "रायट अनुवादकों के लिए समन्वय" + "Co-ordination for Riot translators": "रायट अनुवादकों के लिए समन्वय", + "Sign In": "साइन करना", + "Create Account": "खाता बनाएं", + "Need help?": "मदद चाहिए?", + "Explore rooms": "रूम का अन्वेषण करें", + "Room Directory": "कक्ष निर्देशिका", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "आप एक अलग होमरवर URL निर्दिष्ट करके अन्य मैट्रिक्स सर्वर में साइन इन करने के लिए कस्टम सर्वर विकल्पों का उपयोग कर सकते हैं। यह आपको एक अलग होमसर पर मौजूदा मैट्रिक्स खाते के साथ रायट का उपयोग करने की अनुमति देता है।", + "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.": "आप एक कस्टम पहचान सर्वर भी सेट कर सकते हैं, लेकिन आप उपयोगकर्ताओं को ईमेल पते से आमंत्रित नहीं कर पाएंगे, या स्वयं ईमेल पते से आमंत्रित नहीं किया जाएगा।" } From 714570443d2213587d6266377ed9cecc9efe7c69 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 24 Feb 2019 01:08:01 +0000 Subject: [PATCH 19/60] Allow configuration of whether closing window closes or minimizes to tray Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- electron_app/package.json | 1 + electron_app/src/electron-main.js | 12 +++++++++++- src/vector/platform/ElectronPlatform.js | 14 +++++++++++++- src/vector/platform/VectorBasePlatform.js | 13 ------------- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/electron_app/package.json b/electron_app/package.json index 8481db77a7..f80f3ad341 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -7,6 +7,7 @@ "author": "New Vector Ltd.", "dependencies": { "auto-launch": "^5.0.1", + "electron-store": "^2.0.0", "electron-window-state": "^4.1.0", "minimist": "^1.2.0", "png-to-ico": "^1.0.2" diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js index 12203e7906..6da7182cc7 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -35,6 +35,7 @@ const updater = require('./updater'); const { migrateFromOldOrigin } = require('./originMigrator'); const windowStateKeeper = require('electron-window-state'); +const Store = require('electron-store'); // boolean flag set whilst we are doing one-time origin migration // We only serve the origin migration script while we're actually @@ -55,8 +56,11 @@ try { // Continue with the defaults (ie. an empty config) } +const store = new Store(); + let mainWindow = null; global.appQuitting = false; +global.minimizeToTray = store.get('minimizeToTray', true); // handle uncaught errors otherwise it displays @@ -136,6 +140,12 @@ ipcMain.on('ipcCall', async function(ev, payload) { launcher.disable(); } break; + case 'getMinimizeToTrayEnabled': + ret = global.minimizeToTray; + break; + case 'setMinimizeToTrayEnabled': + store.set('minimizeToTray', global.minimizeToTray = args[0]); + break; case 'getAppVersion': ret = app.getVersion(); break; @@ -331,7 +341,7 @@ app.on('ready', () => { mainWindow = global.mainWindow = null; }); mainWindow.on('close', (e) => { - if (!global.appQuitting && (tray.hasTray() || process.platform === 'darwin')) { + if (global.minimizeToTray && !global.appQuitting && (tray.hasTray() || process.platform === 'darwin')) { // On Mac, closing the window just hides it // (this is generally how single-window Mac apps // behave, eg. Mail.app) diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js index 6e600cfc85..13140a2d1e 100644 --- a/src/vector/platform/ElectronPlatform.js +++ b/src/vector/platform/ElectronPlatform.js @@ -182,10 +182,22 @@ export default class ElectronPlatform extends VectorBasePlatform { return await this._ipcCall('getAutoLaunchEnabled'); } - async setAutoLaunchEnabled(enabled) { + async setAutoLaunchEnabled(enabled: boolean) { return await this._ipcCall('setAutoLaunchEnabled', enabled); } + supportsMinimizeToTray() { + return true; + } + + async getMinimizeToTrayEnabled() { + return await this._ipcCall('getMinimizeToTrayEnabled'); + } + + async setMinimizeToTrayEnabled(enabled: boolean) { + return await this._ipcCall('setMinimizeToTrayEnabled', enabled); + } + async canSelfUpdate(): boolean { const feedUrl = await this._ipcCall('getUpdateFeedUrl'); return Boolean(feedUrl); diff --git a/src/vector/platform/VectorBasePlatform.js b/src/vector/platform/VectorBasePlatform.js index 602a0c27c9..cfdeeacbe4 100644 --- a/src/vector/platform/VectorBasePlatform.js +++ b/src/vector/platform/VectorBasePlatform.js @@ -88,19 +88,6 @@ export default class VectorBasePlatform extends BasePlatform { this._updateFavicon(); } - supportsAutoLaunch() { - return false; - } - - // XXX: Surely this should be a setting like any other? - async getAutoLaunchEnabled() { - return false; - } - - async setAutoLaunchEnabled(enabled) { - throw new Error("Unimplemented"); - } - /** * Begin update polling, if applicable */ From 717495c4e0219ab7d1c0a49734162692665c7aa9 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 24 Feb 2019 01:21:18 +0000 Subject: [PATCH 20/60] specify return types to match superclass Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/vector/platform/ElectronPlatform.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js index 13140a2d1e..f2dd6cb782 100644 --- a/src/vector/platform/ElectronPlatform.js +++ b/src/vector/platform/ElectronPlatform.js @@ -174,11 +174,11 @@ export default class ElectronPlatform extends VectorBasePlatform { return await this._ipcCall('getAppVersion'); } - supportsAutoLaunch() { + supportsAutoLaunch(): boolean { return true; } - async getAutoLaunchEnabled() { + async getAutoLaunchEnabled(): boolean { return await this._ipcCall('getAutoLaunchEnabled'); } @@ -186,11 +186,11 @@ export default class ElectronPlatform extends VectorBasePlatform { return await this._ipcCall('setAutoLaunchEnabled', enabled); } - supportsMinimizeToTray() { + supportsMinimizeToTray(): boolean { return true; } - async getMinimizeToTrayEnabled() { + async getMinimizeToTrayEnabled(): boolean { return await this._ipcCall('getMinimizeToTrayEnabled'); } From 5a3b9ae4542a3673cf2de5e6d6ce2e5de1730894 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 24 Feb 2019 01:38:21 +0000 Subject: [PATCH 21/60] more matching Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/vector/platform/ElectronPlatform.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js index f2dd6cb782..fcab36ac39 100644 --- a/src/vector/platform/ElectronPlatform.js +++ b/src/vector/platform/ElectronPlatform.js @@ -182,7 +182,7 @@ export default class ElectronPlatform extends VectorBasePlatform { return await this._ipcCall('getAutoLaunchEnabled'); } - async setAutoLaunchEnabled(enabled: boolean) { + async setAutoLaunchEnabled(enabled: boolean): void { return await this._ipcCall('setAutoLaunchEnabled', enabled); } @@ -194,7 +194,7 @@ export default class ElectronPlatform extends VectorBasePlatform { return await this._ipcCall('getMinimizeToTrayEnabled'); } - async setMinimizeToTrayEnabled(enabled: boolean) { + async setMinimizeToTrayEnabled(enabled: boolean): void { return await this._ipcCall('setMinimizeToTrayEnabled', enabled); } From ffacf30722557dfbba6a05abf9ca7f7c038a2b96 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 24 Feb 2019 04:52:07 +0000 Subject: [PATCH 22/60] Allow disabling update mechanism Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- electron_app/src/electron-main.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js index 12203e7906..25caddb2cf 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -147,6 +147,7 @@ ipcMain.on('ipcCall', async function(ev, payload) { } else { mainWindow.focus(); } + break; case 'origin_migrate': migratingOrigin = true; await migrateFromOldOrigin(); @@ -262,10 +263,12 @@ app.on('ready', () => { path: absTarget, }); }, (error) => { - if (error) console.error('Failed to register protocol') + if (error) console.error('Failed to register protocol'); }); - if (vectorConfig['update_base_url']) { + if (argv['no-update']) { + console.log('Auto update disabled via command line flag "--no-update"'); + } else if (vectorConfig['update_base_url']) { console.log(`Starting auto update with base URL: ${vectorConfig['update_base_url']}`); updater.start(vectorConfig['update_base_url']); } else { From 0c742e54248190205110c195767a74503976ced5 Mon Sep 17 00:00:00 2001 From: Tim Stahel Date: Fri, 15 Feb 2019 11:10:34 +0000 Subject: [PATCH 23/60] Translated using Weblate (Swedish) Currently translated at 94.7% (18 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sv/ --- src/i18n/strings/sv.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index 69d5561aad..372e79de66 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -37,5 +37,9 @@ "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", "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 en egen identitetsserver, men då kan du inte bjuda in användare via epostadress eller själv bjudas in med din epostadress.", - "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Under anpassade serverinställningar kan du logga in på andra Matrixservrar genom att ange en egen hemserveradress. På så sätt kan du använda Riot med ett Matrixkonto du redan har på en annan hemserver." + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Under anpassade serverinställningar kan du logga in på andra Matrixservrar genom att ange en egen hemserveradress. På så sätt kan du använda Riot med ett Matrixkonto du redan har på en annan hemserver.", + "Sign In": "Logga in", + "Create Account": "Skapa konto", + "Need help?": "Behöver du hjälp?", + "Explore rooms": "Utforska rum" } From 4beeba6cf671bb6fbe2e2f93db9967ef511763ea Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Mon, 25 Feb 2019 10:57:37 +0000 Subject: [PATCH 24/60] Translated using Weblate (Swedish) Currently translated at 94.7% (19 of 19 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 372e79de66..45f9a91a56 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -41,5 +41,6 @@ "Sign In": "Logga in", "Create Account": "Skapa konto", "Need help?": "Behöver du hjälp?", - "Explore rooms": "Utforska rum" + "Explore rooms": "Utforska rum", + "Room Directory": "Rumslista" } From af2921d0c4cbe4cabec59d4cacf0f465f1a39e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= Date: Wed, 27 Feb 2019 09:50:50 +0000 Subject: [PATCH 25/60] Translated using Weblate (Czech) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/ --- src/i18n/strings/cs.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json index e2a5e50ef1..a2ab2af438 100644 --- a/src/i18n/strings/cs.json +++ b/src/i18n/strings/cs.json @@ -4,7 +4,7 @@ "Riot is not supported on mobile web. Install the app?": "Riot není podporovaný na mobilním webu. Nainstalovat aplikaci?", "You need to be using HTTPS to place a screen-sharing call.": "Pro uskutečnění hovoru se sdílením obrazovky musíte používat HTTPS.", "Search the room directory": "Prohledat adresář místností", - "Chat with Riot Bot": "Chatujte s Riot Botem", + "Chat with Riot Bot": "Konverzovat s Riot Botem", "Get started with some tips from Riot Bot!": "Začněte s radami od Riot Bota!", "General discussion about Matrix and Riot": "Obecná diskuse o Matrixu a Riotu", "Discussion of all things Matrix!": "Diskuse o všem okolo Matrixu!", @@ -35,5 +35,12 @@ "Riot/Android & matrix-android-sdk chat": "Riot/Android a matrix-android-sdk chat", "Discussion of the Identity Service API": "Diskuze o API služby identity", "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.": "Přes vlastní serverové volby se můžete přihlásit k dalším Matrix serverům tak, že zadáte jinou adresu domovského serveru.
Díky tomu můžete v Riotu používat Matrix účet z jiného domovského serveru.

Můžete nastavit i vlastní server identity, ale pak už nebudete moci zvát ani být zván/a skrze e-mailovou adresu.", - "Co-ordination for Riot translators": "Spolupráce pro překladatele Riot" + "Co-ordination for Riot translators": "Spolupráce pro překladatele Riot", + "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.": "Také je možné nastavit vlastní server identity, ale pak nebude možné pozvat uživatele pomocí emailové adresy ani být pozván pomocí emailové adresy.", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Ve vlastních serverových volbách si můžete nastavit použití vlastního domovského serveru. To Vám umožní používat Riot s existujícím Matrix účtem na jiném serveru.", + "Sign In": "Přihlásit se", + "Create Account": "Vytvořit účet", + "Need help?": "Chcete pomoct?", + "Explore rooms": "Objevit místnosti", + "Room Directory": "Adresář místností" } From 0a0aa1c59129bba2cba645873c594f4637cce5a4 Mon Sep 17 00:00:00 2001 From: Paulo Miranda Date: Wed, 27 Feb 2019 13:50:31 +0000 Subject: [PATCH 26/60] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (19 of 19 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 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index e9dea2bd99..f1fa48fb6c 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -35,5 +35,12 @@ "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 oferecido 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.", - "Co-ordination for Riot translators": "Coordenação para tradutores Riot" + "Co-ordination for Riot translators": "Coordenação para tradutores Riot", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Você pode usar as opções personalizadas do servidor para entrar em outros servidores Matrix, especificando um URL diferente de homeserver. Isso permite que você use o Riot com uma conta Matrix existente em um homeserver diferente.", + "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ê também pode definir um servidor de identidade personalizado, mas não poderá convidar usuários por endereço de e-mail nem ser convidado por endereço de e-mail.", + "Sign In": "Entrar", + "Create Account": "Criar Conta", + "Need help?": "Precisa de ajuda?", + "Explore rooms": "Explore as salas", + "Room Directory": "Diretório de salas" } From 5d555e044d1427d4dda194b12011a3f3935f2d97 Mon Sep 17 00:00:00 2001 From: ButterflyOfFire Date: Thu, 14 Feb 2019 21:47:49 +0000 Subject: [PATCH 27/60] Translated using Weblate (Arabic) Currently translated at 89.4% (17 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ar/ --- src/i18n/strings/ar.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json index 8f7d60b0d4..96702c4d86 100644 --- a/src/i18n/strings/ar.json +++ b/src/i18n/strings/ar.json @@ -5,7 +5,7 @@ "Riot Desktop on %(platformName)s": "الواجهة المكتبية لرايوت على %(platformName)s", "Unknown device": "جهاز مجهول", "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s عبر %(browserName)s على %(osName)s", - "You need to be using HTTPS to place a screen-sharing call.": "تحتاج الى استخدام الاتصال الآمن ( HTTPS) للسماح بمشاركة الشاشة", + "You need to be using HTTPS to place a screen-sharing call.": "تحتاج الى استخدام الاتصال الآمن (HTTPS) للسماح بمشاركة الشاشة.", "Co-ordination for Riot translators": "التنسيق لمترجمين Riot", "powered by Matrix": "مشغل بواسطة Matrix", "Welcome to Riot.im": "مرحبا بك في Riot.im", @@ -28,5 +28,10 @@ "Running Matrix services": "تشغيل خدمات Matrix", "Community-run support for Synapse": "الدعم المجتمعي لـ Synapse", "Admin support for Dendrite": "الدعم الاداري لـDendrite", - "Announcements about Synapse releases": "إعلانات حول إصدارات Synaps" + "Announcements about Synapse releases": "إعلانات حول إصدارات Synaps", + "Create Account": "انشاء حساب", + "Need help?": "بحاجة إلى مساعدة؟", + "Explore rooms": "استكشف غرف المحادثات", + "Room Directory": "دليل غرف المحادثات", + "Sign In": "التسجيل" } From b10ec4db3711f0cf01a9562c65472d553dfc4f23 Mon Sep 17 00:00:00 2001 From: Samu Voutilainen Date: Thu, 21 Feb 2019 11:12:42 +0000 Subject: [PATCH 28/60] Translated using Weblate (Finnish) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fi/ --- src/i18n/strings/fi.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json index 27222c8d0f..596ff51f3f 100644 --- a/src/i18n/strings/fi.json +++ b/src/i18n/strings/fi.json @@ -6,7 +6,7 @@ "Custom Server Options": "Palvelinasetukset", "Riot Desktop on %(platformName)s": "Riot Desktop %(platformName)s", "You need to be using HTTPS to place a screen-sharing call.": "Sinun täytyy käyttää HTTPS -yhteyttä, jotta voit jakaa ruudun.", - "Chat with Riot Bot": "Keskustele Riot Botin kanssa", + "Chat with Riot Bot": "Keskustele Riot-botin kanssa", "Get started with some tips from Riot Bot!": "Aloita Riot Botin vinkkien avulla!", "General discussion about Matrix and Riot": "Matrix- ja Riot keskustelut", "Discussion of all things Matrix!": "Keskustelu kaikesta Matrixiin liittyvästä!", @@ -35,7 +35,7 @@ "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s %(browserName)s %(osName)s", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Salattua ja vikasietoista viestintää Matrix -teknologialla", "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.": "Voit käyttää edistyksellisiä asetuksia kirjautuaksesi muille Matrix palvelimille, määrittelemällä kotipalvelimen URL-osoitteen.
Tämän avulla voit käyttää Riot:ia olemassa olevalla toisen Matrix palvelimen käyttäjätilillä.

Voit myös asettaa valinnaisen identiteettipalvelimen, mutta et voi kutsua käyttäjiä sähköpostiosoitteella tai tulla kutsutuksi.", - "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Voit käyttää mukautettuja palvelinasetuksia kirjautuaksesi muihin Matrix-palvelimiin määrittämällä toisen kotipalvelimen osoitteen. Tämä mahdollistaa Riotin käyttämisen toisella palvelimella olevalla Matrix-tunnuksella.", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Voit käyttää mukautettuja palvelinasetuksia kirjautuaksesi muihin Matrix-palvelimiin. Tämä mahdollistaa Riotin käyttämisen toisella palvelimella olevalla Matrix-tunnuksella.", "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.": "Voit myös määrittää toisen identiteettipalvelimen, mutta et voi kutsua muita käyttäjiä sähköpostin perusteella, eivätkä se voi kutsua sinua.", "Sign In": "Kirjaudu sisään", "Create Account": "Luo tunnus", From c3c9b63326d1e16e86b9fe1cc9e07223e24e6005 Mon Sep 17 00:00:00 2001 From: Fridtjof Mund Date: Tue, 19 Feb 2019 10:03:14 +0000 Subject: [PATCH 29/60] Translated using Weblate (German) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/ --- src/i18n/strings/de_DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 4c0f71c250..6d1223f9d8 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -40,7 +40,7 @@ "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 kannst auch einen anderen Identitätsserver setzen. Dieser hat einen anderen Wissensstand als der Standardserver, weswegen es beim Einladen oder Eingeladen werden mittels E-Mail-Adresse Probleme geben kann.", "Sign In": "Anmelden", "Create Account": "Konto erstellen", - "Need help?": "Braucht du Hilfe?", + "Need help?": "Brauchst du Hilfe?", "Explore rooms": "Räume erkunden", "Room Directory": "Raumverzeichnis" } From d644a73595ecb1d72e9f9fa3af5075f2d610d955 Mon Sep 17 00:00:00 2001 From: Sotiris Papatheodorou Date: Tue, 19 Feb 2019 22:50:38 +0000 Subject: [PATCH 30/60] Translated using Weblate (Greek) Currently translated at 84.2% (16 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/el/ --- src/i18n/strings/el.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index 2fb6d6eb17..3a8d21d2e0 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -35,5 +35,9 @@ "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 κ.λπ) ή αυτόνομα. Ρίξτε μια ματιά στο ευρετήριο!", "Support for those using, running and writing other bridges": "Υποστήριξη για τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix", "Co-ordination for Riot translators": "Συντονισμός για μεταφραστές του Riot", - "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 σε έναν διαφορετικό διακομιστή.

Μπορείτε επίσης να ορίσετε έναν προσαρμοσμένο διακομιστή ταυτοποίησης αλλά δεν θα μπορείτε να προσκαλέσετε χρήστες ή να προσκληθείτε εσείς μέσω διεύθυνσης ηλεκτρονικού ταχυδρομίου.", + "Sign In": "Σύνδεση", + "Create Account": "Δημιουργία Λογαριασμού", + "Need help?": "Χρειάζεστε βοήθεια;", + "Room Directory": "Ευρετήριο δωματίων" } From ea0ce23ac79e1601900833efd57e3a30867b2889 Mon Sep 17 00:00:00 2001 From: Akarshan Biswas Date: Fri, 22 Feb 2019 06:58:03 +0000 Subject: [PATCH 31/60] Translated using Weblate (Hindi) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hi/ --- src/i18n/strings/hi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/hi.json b/src/i18n/strings/hi.json index 98c8405fa5..172796d032 100644 --- a/src/i18n/strings/hi.json +++ b/src/i18n/strings/hi.json @@ -41,6 +41,6 @@ "Need help?": "मदद चाहिए?", "Explore rooms": "रूम का अन्वेषण करें", "Room Directory": "कक्ष निर्देशिका", - "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "आप एक अलग होमरवर URL निर्दिष्ट करके अन्य मैट्रिक्स सर्वर में साइन इन करने के लिए कस्टम सर्वर विकल्पों का उपयोग कर सकते हैं। यह आपको एक अलग होमसर पर मौजूदा मैट्रिक्स खाते के साथ रायट का उपयोग करने की अनुमति देता है।", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "आप एक अलग होमसर्वर URL निर्दिष्ट करके अन्य मैट्रिक्स सर्वर में साइन इन करने के लिए कस्टम सर्वर विकल्पों का उपयोग कर सकते हैं। यह आपको एक अलग होमसर्वर पर मौजूदा मैट्रिक्स खाते के साथ रायट का उपयोग करने की अनुमति देता है।", "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.": "आप एक कस्टम पहचान सर्वर भी सेट कर सकते हैं, लेकिन आप उपयोगकर्ताओं को ईमेल पते से आमंत्रित नहीं कर पाएंगे, या स्वयं ईमेल पते से आमंत्रित नहीं किया जाएगा।" } From 2c0b47a1e928c102851c560d18ca361eb775c4bb Mon Sep 17 00:00:00 2001 From: Szimszon Date: Tue, 26 Feb 2019 12:00:13 +0000 Subject: [PATCH 32/60] Translated using Weblate (Hungarian) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/ --- src/i18n/strings/hu.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 3d58c10b4d..c9aad674b9 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1,7 +1,7 @@ { "Custom Server Options": "Egyedi szerverbeállítások", "Dismiss": "Eltüntet", - "powered by Matrix": "Matrix hajtja", + "powered by Matrix": "[Matrix]-szal töltve", "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s alkalmazás %(browserName)s böngészőn %(osName)s rendszeren", "Riot Desktop on %(platformName)s": "Riot Desktop itt: %(platformName)s", "Riot is not supported on mobile web. Install the app?": "A mobilböngésző nem támogatja a Riotot. Telepíted inkább az alkalmazást?", @@ -37,7 +37,7 @@ "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.": "Bejelentkezhetsz más Matrix szerverre is az egyedi szerverbeállításoknál megadott Matrix szerver URL-jével.
Így használhatod a Riotot egy már máshol meglévő Matrix fiókkal is.

Beállíthatsz egyéni identitásszervert is, de akkor nem tudsz más felhasználókat e-mail címmel meghívni, illetve ők sem tudnak téged.", "Co-ordination for Riot translators": "Koordináció Riot fordítók számára", "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.": "Más azonosítási szervert is használhatsz, de akkor nem tudsz másokat e-mail cím alapján meghívni és téged sem fognak tudni.", - "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Használhatod az egyedi szerver beállítást más Matrix szerverre való belépéshez, azzal, hogy megadod a Matrix szerver URL-jét. Ezzel a Riot-ot használhatod más Matrix szerveren lévő fiókkal.", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Használhatod az egyedi szerver beállítást más [matrix] szerverre való belépéshez, azzal, hogy megadod a [matrix] szerver URL-jét. Ezzel a Riot-ot használhatod más [matrix] szerveren lévő fiókkal.", "Sign In": "Bejelentkezés", "Create Account": "Fiók készítés", "Need help?": "Segíthetünk?", From 3acc6ee5c9ba01c920d09cd587556ff069ccac75 Mon Sep 17 00:00:00 2001 From: Herman S Date: Wed, 20 Feb 2019 12:21:55 +0000 Subject: [PATCH 33/60] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nb_NO/ --- src/i18n/strings/nb_NO.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json index 4162012e7a..97898f522c 100644 --- a/src/i18n/strings/nb_NO.json +++ b/src/i18n/strings/nb_NO.json @@ -1,20 +1,20 @@ { - "Custom Server Options": "Tilpassede serveralternativer", - "powered by Matrix": "benytter seg av Matrix", + "Custom Server Options": "Server-instillinger", + "powered by Matrix": "Drevet av Matrix", "Riot is not supported on mobile web. Install the app?": "Riot er ikke støttet av mobil-nettlesere. Ønsker De å innstalere appen?", - "Riot Desktop on %(platformName)s": "Riot på skrivebordet er på %(platformName)s", + "Riot Desktop on %(platformName)s": "Riot Desktop på %(platformName)s", "Unknown device": "Ukjent enhet", "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s på %(osName)s", - "You need to be using HTTPS to place a screen-sharing call.": "De er nødt til å benytte HTTPS for å kunne ha en samtale med skjermdeling.", + "You need to be using HTTPS to place a screen-sharing call.": "Du er nødt til å bruke HTTPS for å ha en samtale med skjermdeling.", "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.": "De kan benytte brukerdefinerte server-innstillinger for å kunne logge Dem inn på andre Matrix-servere ved å spesifisere en annen hjemmeserver-adresse.
Dette tillater Dem til å bruke Riot med en eksisterende Matrix-konto på en annen hjemmeserver.

De kan i tillegg definere en egen hjemmeserver-identitet, men De kan da ikke invitere andre brukere via email, og De kan heller ikke bli invitert via email selv.", "Dismiss": "Avvis", - "Welcome to Riot.im": "Velkommen skal De være til Riot.im", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Desentralisert, kryptert nettprat & sammabeid drevet av [matrix]", + "Welcome to Riot.im": "Velkommen til Riot.im", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Desentralisert, kryptert chat & sammabeid drevet av [matrix]", "Search the room directory": "Søk i alle rom", "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Allerede finnes det alskens rom i Matrix, sammenkoblet til eksisterende nettverk (Slack, IRC, Gitter osv.) eller selvstendig. Dersom De formoder, kan De kikke på utvalget!", - "Chat with Riot Bot": "Nettprat med Riot Bot", - "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Du kan bruke egendefinert tjener instillingen for å logge inn på andre Matrix tjenere ved å spesifisere enn annen hjemmetrjener URL. Dette lar deg bruke Riot med en eksisterende Matrix konto på en annen hjemmetjener.", - "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 også stille inn en egen idendtitetstjener, men du kommer ikke til å kunne invitere andre brukere med e-post, eller bli invitert med e-post selv.", + "Chat with Riot Bot": "Chat med Riot Bot", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Du kan bruke instillinger for «egendefinert tjener» til å logge inn på andre Matrix tjenere ved å spesifisere en annen URL. Dette lar deg bruke Riot med en eksisterende Matrix konto på en annen hjemmetjener.", + "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 også bruke din egen identitetstjener, men du kommer ikke til å kunne invitere andre brukere med e-post, eller bli invitert med e-post selv.", "Get started with some tips from Riot Bot!": "Kom i gang med noen tips fra Riot Bot!", "General discussion about Matrix and Riot": "Generelle diskusjoner om Matrix og Riot", "Discussion of all things Matrix!": "Diskusjoner om alt Matrix!", From 5266d1bc11a0c8a857a7770d917f93a9f0a6ebd7 Mon Sep 17 00:00:00 2001 From: hectorfdezlopez Date: Fri, 15 Feb 2019 11:58:42 +0000 Subject: [PATCH 34/60] Translated using Weblate (Spanish) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/ --- src/i18n/strings/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index a07330f789..3c949426e7 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -10,7 +10,7 @@ "Welcome to Riot.im": "Bienvenido a Riot.im", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas & colaboración con el poder de [matrix]", "Search the room directory": "Buscar en el directorio de salas", - "Chat with Riot Bot": "Conversar con el Bot de Riot", + "Chat with Riot Bot": "Hablar con Riot Bot", "Get started with some tips from Riot Bot!": "¡Comenzar con algunos consejos de Riot Bot!", "General discussion about Matrix and Riot": "Discusión general sobre Matrix y Riot", "Discussion of all things Matrix!": "¡Discusión sobre todas las cosas de Matrix!", From 0d5e80cc519e17ee42bbdcb3c64d6e6fbe51aff4 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 27 Feb 2019 17:34:36 +0000 Subject: [PATCH 35/60] Update to electron 4.0.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 19cc5e6af1..9c7fe711dd 100644 --- a/package.json +++ b/package.json @@ -152,7 +152,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "4.0.4", + "electronVersion": "4.0.6", "files": [ "node_modules/**", "src/**", From 3b70faee24195f11a71300224e56207d629f1eec Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 27 Feb 2019 17:40:43 +0000 Subject: [PATCH 36/60] Translated using Weblate (Hungarian) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/ --- src/i18n/strings/hu.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index c9aad674b9..885025269d 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1,7 +1,7 @@ { "Custom Server Options": "Egyedi szerverbeállítások", "Dismiss": "Eltüntet", - "powered by Matrix": "[Matrix]-szal töltve", + "powered by Matrix": "Matrix hajtja", "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s alkalmazás %(browserName)s böngészőn %(osName)s rendszeren", "Riot Desktop on %(platformName)s": "Riot Desktop itt: %(platformName)s", "Riot is not supported on mobile web. Install the app?": "A mobilböngésző nem támogatja a Riotot. Telepíted inkább az alkalmazást?", From f020995ac48a47a98646e50868f430c7cd4e0f28 Mon Sep 17 00:00:00 2001 From: Nad Chishtie Date: Thu, 28 Feb 2019 11:19:00 +0100 Subject: [PATCH 37/60] Updated install spinner referenced in #8913 --- electron_app/build/install-spinner.gif | Bin 4460 -> 5523 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/electron_app/build/install-spinner.gif b/electron_app/build/install-spinner.gif index c4f832c34230af5d0267962c7e1d0fab4bab5dd0..4a685294b634ead0e6ef72212bdbe2df8e502181 100644 GIT binary patch literal 5523 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 literal 4460 zcmV-y5tHsmNk%w1VITn@0q6e!t!bsHYo)Jhrl)P7p>Ln6Y^I!Yl%H{#k9Uojbd!jB zhnjPluxqHIaG;ZRlZ|vi;aqSl!cLsqKuAK_k)V*0kB5_>cbkfFor{r^kcgC_hnAdjo{W-|k&Ts{h?kvnpN*51 zl5L@mg_)RippKN5lY^R`m6w!+o1b!{ih`Y+mY9`uq>Fr@oP(a6mzkDrr;L4}otT=J zZm5lZqMn+Yn0%y}Z>f%Ur<#4GnsBO*YOIi(otby2n{ld~Yps!-o||~7oOY|1ou8a= zt(ax8lWnh)o}is^u9;@Cl%JuVa<7_avz2SJkZZD=prW5|vXyAGmZ77daI=zQMh~ z!oI=7zrw`9!^OhH#>2(O#Ky?Q$H~UY%gD;i$;-~l&Ckov(azA)&(YJ+($vw@)zZ|~ z)7971*4Wk9+Sb|I*V^3K+uhpS-rL^b-QVHf;Nsum%z)=;i0>=IH9@ z>Fem~?CI<7>h16A?(psJ@$T^Q@A32S^7QfZ_44%h^Y-}k_xbkt`uF+!`1<_$`~CX- z|NH*`{Qv*|A^8LW3IP8AEC2ui03ZP%0RRa80RIUbNU)&6g9sBUT*$DY!-o(fN}Ncs zqQ#3CGiuz(kzt6BAVZ2AN%CXIlPFWFT*-1{$(Jx=l59z{rp=o;4a(ffv!}_NK!XY$ zs?(>@qdbW!UCI+P82) zww+5hu3fuy^ESQ9_paW*IQt6b3%Ib#!HD}BUhFinW5SFhKYUDCvE<7KD{Hol`SRw^ zoI4i=O**vbxusJ>KFwCO>(#8gzMkzjc2(NA@!H;-yEok3M12eY4IJq3<8O=GM9w^| z@|Mk`qkWE2y7jZvIbPomHhV_y;J^NQrx?C`*6|U|tG|lg;rjPb+b@Jq|Ec`U_46CO zKTyB_{rCMRU{CT5XrNZ(9jIVT-Yw|hOVm9mp<2LAXrV|IUZ~+utZnFF2pxXtp=ctC zh*^mxN`@kek*&z0VJ@yXT8uL4MWc&0-iRY=I>yLjk2{tH3`5-D4fO5Vn# zj!r(=BvVoXIaQTbE`?>5!EMQRG4B0MW&Hvo>}HiYN8ofn`_bpr<-!lNheEo z-g#J_dRE70pW6Kis7rzl+E}4+28w8+-z{orMUEz^Xrx~rN@3ahBHVwzs9v!aSCl(+86E3Ljx>1wdT>Pqa9s~-ES zvC0O?Y_l~!3vG(hPHSSd){cm6wi_zMEwXOGQE*DfZVFV1{ zR^}~Q9LR8j0Q~kFK^33CBJjWj7i{n^h(%hY#PF=$^kC*5mpO4mCXPd!wIaL4=dW{+C%qW&D3%6(1%e~n!vwXq2o1=@f15kX54<75$f=`p(5oQ_ zNeCemW@Q8ZD4bX!R;aZ!ybyyv>B2g67`b`iA%{$S9}j!@v9Guwh!T4Q5w*s$m%vbO zJ^_OOqo}xgR4;^NgxwTNa=oxv0gL>KfGf6`wM)e0i+7tM7S@(V#o>bwB|&2!RmYwx ze#H-P6aW+GsI@G>1dn#(ArjOv$jH${4I~j{C1V(sHiD%S5es4>7@4(BJQ9gA>Bc4_ zw+THh)E!&)}r7=RKkQ9v5XuwUKvbZBE^$mF$FB%2tg5$LYG-v zL@zV9z(}00n0UK|NMMQ0v8|Cp|EMJ_R>1@NML-hJ)Ee6V z7|;F?M?TPJ4=04g3A_lXKnF_Df{sIT)+ne#7wXShiW3&DsDkfKP>FPEEes`TXWQZ@ zjOnGL7dRXV3NSH^eKKzvUzvvHcwsMEhDDhJb3{2u76CZS(V|%+L`ID%5-H$=dFdDh zPn7VCYr@VDSy5@`SV|c~W(B4Mb3_@IV1pA3K?{ON1x^Wf3Kz1Iry<#(?eq~03;F~P z8nv4^lDg8Cq6Mm3)g}K#l2)=+4-5OS9X#ytlon9qc9g)1QZdKW$GG&RaZTsKzDmuP zB*S*?2i}NdisTirQ*T&iAP>zE zgSFX(Eqs$JUm~`lzQ-epGBnqXw{$df-T?4Y-MZNV=g+gZP4Gw#nz`Af1qtNE96rp7 z6!zlHy@NsSQ!ToRMC9QOZ1_Vd7`a%w@)QMm#auk%f(^~}w!{HG?toXU%SSK)a1#T9 zAhtNykbrh^BQb;Ko)MQ?XwHC7G4b6{EEpAIWwt9!#S=n@gMj6)s|fzz{(Uv~inu7j zzv~V1d*8~)P+ZY>5pYEQbed*Ph6EUzQ-WRIkvWuRS8TsUQ_L1K-}W#cZx7ITxkl!~ zf$l^74oBSgM*@zyeYC(X<;dJMTE69%Uj@vh6U58~PzHlB;(|I4 z!7MZviMX^N$B{z@(e1`%&d57>q*%HDMmaE1taIcV4v8H!H;lL#LUXv-dfmFdny&|M z2ul}%R$-xv9q{DIWfQOFE)JK+W)7+E)^=tU9TlXLZVzJD0xV8pgz!Z@1eDC&YSR+W zp1U&f1Yf+}gE!Ne)1k>ZCwU0OiaBV!WfYoYwcOiA_u4QXDvl@JB*Y$o4EO}_U_+iQ zG_Oye}OB z)=#@gAeXs)01_-F0B+{$ak}r5E&Rmsa^p!E3Lq}M0)OXRyZ}4uFaux_46qXo*d=R1 zrhmAnOMf7C15kabr+)urRFQ)XUttJXhdG$AfXvr`&W9Ax*FB;(a|r--s`n8p2Rl@D z6>2aKu(J-A#enbSR7Xcdgg^y6$b(lP0ZRt}4^V+>MiP8*JJ3L4N8tuC2s^n@gCTf> z4oHFqHWDAedla~97AO+oa68^$d`5u^_h38n@N*!jcmjrl`?o>|HWCIPb_Z}r&h-)8 zcRTYS3qFAa(!e~uz*aWcWj+LR6V!$x!2tsxcK#HAc12hc{l+}vzzRx85=cM{V|Y91 z5Q(6dacQWA56FfkQ2}Bn0KWHZTPPA+P+hkZ56>_P9|RI6AO^T#4I#!nf#ru$2#A5W zhJ*ML2>^#$xQHcTZSFGi)bi?oJfV9_!12egaG((?z9u>)=iRQfGLG& zu+fZ1QGzE!h$N8#zDSK5wG&7X57^i?`XD!8p=DgxeB-B!`6G@bfdE06g-$kyB0&kW zxQ=173ugh3bGM1}*onIs69=$#3Sf@#(-W_Nf!HWq1IdlLAvHPpj4&|*0Wfokm|?&e z69@>9{*a7eL6Ed(kO%3E2^kX@000U1{*g9zc`%U+5*bU(@D?Zuek$pWK5+>|Bxy3S z010;i4ry0M5exqqOTYjZJ9&R1I6qOb2t+gmJTU@?_-)fTlPee#hR|QJln=HL7f(4h z_=g<{@fB%6MD@25p!jX17?M081kklfdf@1PMmbi*OW&M;TgB z@e7qmM*F}F+DMibnSY*h6;zo&R%sN`h(%k;m8F=6<`YHMfR|1gna<&tJrM-?BbY}) zjzKg5zvyRCVF%Z6lhYFp9@ZCn88&<=9>a1KVGul~aCSa{0Vp(quSscHAqLP;5ALH6 z*MN9~k(*$%o9EG+SD^=lvkFK45ET?)KLY>)iU^xofda2!4WtD-`p^xx@Og{nyMj0KixCx^`3$^f~qc93?Frm(} zp+*4%UeE`Oa0!S|2Q?NJ98duckN^gd02Bb89TT6xlB5q(Doi>dz4D|B5~WgVAQDlf zQ+lOXYNcAbrT+mbUg{rU8m9GO5oDSlW^tzQk)~>@9*xqb9C4v8cI$Cyx3W&=IMwQ74p28q0C1ppmJX zsu^$6sf*_opem1?I;yys6Q-JI#*wPsh^nkAeoFDGk_jfVIvrF}t9{8ExT>VOx~uUK zCBE7@ToJ6tG_1tx6G(Eb@>3+rN=3}ttRwLw&?*is}Q zI#t5>Le(z25}Coo&8VKTF>x+OMCt51@%TGA>!`>8(iv%vZxLi?;1QnYOW yrAT|N01rKRn;^b%wfd?WT8pt!*|jjsn_xS(Wa|(C0RTH8VRfPa From 45d1ec8825576968cabd2edb99c89e30a9a75fa3 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 28 Feb 2019 13:18:21 +0100 Subject: [PATCH 38/60] set chrome path for travis CI explicitly karma seems to be giving priority to a location where an old version is installed. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3b201c1e95..6d8b348e4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,5 +24,5 @@ install: # commit. - npm install && scripts/fetch-develop.deps.sh --depth 1 script: - - npm run test + - CHROME_BIN='/usr/bin/google-chrome-stable' npm run test - npm run lint From 0e2938d7b314cdaaabfa18292eea1de66ca95280 Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 28 Feb 2019 14:10:31 +0000 Subject: [PATCH 39/60] [matrix] -> Matrix --- src/i18n/strings/hu.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 885025269d..3d58c10b4d 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -37,7 +37,7 @@ "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.": "Bejelentkezhetsz más Matrix szerverre is az egyedi szerverbeállításoknál megadott Matrix szerver URL-jével.
Így használhatod a Riotot egy már máshol meglévő Matrix fiókkal is.

Beállíthatsz egyéni identitásszervert is, de akkor nem tudsz más felhasználókat e-mail címmel meghívni, illetve ők sem tudnak téged.", "Co-ordination for Riot translators": "Koordináció Riot fordítók számára", "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.": "Más azonosítási szervert is használhatsz, de akkor nem tudsz másokat e-mail cím alapján meghívni és téged sem fognak tudni.", - "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Használhatod az egyedi szerver beállítást más [matrix] szerverre való belépéshez, azzal, hogy megadod a [matrix] szerver URL-jét. Ezzel a Riot-ot használhatod más [matrix] szerveren lévő fiókkal.", + "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Használhatod az egyedi szerver beállítást más Matrix szerverre való belépéshez, azzal, hogy megadod a Matrix szerver URL-jét. Ezzel a Riot-ot használhatod más Matrix szerveren lévő fiókkal.", "Sign In": "Bejelentkezés", "Create Account": "Fiók készítés", "Need help?": "Segíthetünk?", From 6206b1d0739112403e5a32399db7ab5a44d64016 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 28 Feb 2019 14:51:51 +0000 Subject: [PATCH 40/60] js-sdk & react-sdk rc.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9c7fe711dd..8957e4f118 100644 --- a/package.json +++ b/package.json @@ -70,8 +70,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "1.0.0", - "matrix-react-sdk": "1.0.1", + "matrix-js-sdk": "1.0.1-rc.1", + "matrix-react-sdk": "1.0.2-rc.1", "modernizr": "^3.6.0", "prop-types": "^15.6.2", "react": "^15.6.0", From 53e25ff2472e2f1bc22613415ad3263c011c187f Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 11:32:37 +0000 Subject: [PATCH 41/60] Set a resuire alias for the webapp directory So languagehandler can pull the languages json from there --- scripts/package.sh | 6 +----- webpack.config.js | 9 ++------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/scripts/package.sh b/scripts/package.sh index 008803cac9..23d0925b05 100755 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -14,11 +14,7 @@ else fi npm run clean -# riot-web is at `workspace`. -# matrix-react-sdk is at `workspace/node_modules/matrix-react-sdk`, but this is -# symlinked to a repo at `workspace/matrix-react-sdk`. -# To get from `workspace/matrix-react-sdk/lib` up to the lang file, we use: -RIOT_LANGUAGES_FILE="../../webapp/i18n/languages.json" npm run build$dev +npm run build$dev # include the sample config in the tarball. Arguably this should be done by # `npm run build`, but it's just too painful. diff --git a/webpack.config.js b/webpack.config.js index 70ef0574a7..2b3423007f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -6,12 +6,6 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); let og_image_url = process.env.RIOT_OG_IMAGE_URL; if (!og_image_url) og_image_url = 'https://riot.im/app/themes/riot/img/logos/riot-im-logo-black-text.png'; -// relative to languageHandler.js in matrix-react-sdk -let RIOT_LANGUAGES_FILE = process.env.RIOT_LANGUAGES_FILE; -if (!RIOT_LANGUAGES_FILE) { - RIOT_LANGUAGES_FILE = "../../riot-web/webapp/i18n/languages.json"; -} - module.exports = { entry: { // Load babel-polyfill first to avoid issues where some imports (namely react) @@ -157,6 +151,8 @@ module.exports = { // same goes for js-sdk "matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'), + + "Webapp": path.resolve('./webapp'), }, }, plugins: [ @@ -164,7 +160,6 @@ module.exports = { 'process.env': { NODE_ENV: JSON.stringify(process.env.NODE_ENV), }, - 'LANGUAGES_FILE': JSON.stringify(RIOT_LANGUAGES_FILE), }), new ExtractTextPlugin("bundles/[hash]/[name].css", { allChunks: true, From bf1ab7f4204840c658814168b4a6a3b351a3cc5f Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 12:03:19 +0000 Subject: [PATCH 42/60] Use $webapp rather than Webapp --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 2b3423007f..9cdc9cae45 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -152,7 +152,7 @@ module.exports = { // same goes for js-sdk "matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'), - "Webapp": path.resolve('./webapp'), + "$webapp": path.resolve('./webapp'), }, }, plugins: [ From 2e3d0e50ec766d1e68401ba78a0a10eaa7720277 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 12:19:28 +0000 Subject: [PATCH 43/60] react-sdk rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8957e4f118..a4e10da667 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "1.0.1-rc.1", - "matrix-react-sdk": "1.0.2-rc.1", + "matrix-react-sdk": "1.0.2-rc.2", "modernizr": "^3.6.0", "prop-types": "^15.6.2", "react": "^15.6.0", From ab1ceff242f8eee14bd9320bbe01c4611029d78c Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 12:20:32 +0000 Subject: [PATCH 44/60] v1.0.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 f80f3ad341..412c3248e2 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": "1.0.1", + "version": "1.0.2-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 813fdf4aade7128b1eed97215fe3e8ae6aa08143 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 12:22:18 +0000 Subject: [PATCH 45/60] Prepare changelog for v1.0.2-rc.1 --- CHANGELOG.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 522b7f5b36..f40e17c728 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,30 @@ +Changes in [1.0.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.1) (2019-03-01) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.1...v1.0.2-rc.1) + + * Set a require alias for the webapp directory + [\#9014](https://github.com/vector-im/riot-web/pull/9014) + * Update from Weblate. + [\#8973](https://github.com/vector-im/riot-web/pull/8973) + * set chrome path for travis CI explicitly + [\#8987](https://github.com/vector-im/riot-web/pull/8987) + * Updated install spinner + [\#8984](https://github.com/vector-im/riot-web/pull/8984) + * Allow disabling update mechanism + [\#8911](https://github.com/vector-im/riot-web/pull/8911) + * Allow configuration of whether closing window closes or minimizes to tray + [\#8908](https://github.com/vector-im/riot-web/pull/8908) + * Fix language file path for Jenkins + [\#8854](https://github.com/vector-im/riot-web/pull/8854) + * Document and recommend `default_server_name` + [\#8832](https://github.com/vector-im/riot-web/pull/8832) + * Cache busting for icons & language files + [\#8710](https://github.com/vector-im/riot-web/pull/8710) + * Remove redesign issue template + [\#8722](https://github.com/vector-im/riot-web/pull/8722) + * Make scripts/make-icons.sh work on linux + [\#8550](https://github.com/vector-im/riot-web/pull/8550) + Changes in [1.0.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.1) (2019-02-15) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.0...v1.0.1) From ea959d5994b61fe2bd5a8ee92ff9a4c44d9152d5 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 12:22:19 +0000 Subject: [PATCH 46/60] v1.0.2-rc.1 --- 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 903d8ccfa2..d7b4d41a97 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "riot-web", - "version": "1.0.1", + "version": "1.0.2-rc.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a4e10da667..477f25e663 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.0.1", + "version": "1.0.2-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 20c437277cb4527526faca9528137538490e9404 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 17:38:31 +0000 Subject: [PATCH 47/60] react-sdk rc.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 477f25e663..287b421ab6 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "1.0.1-rc.1", - "matrix-react-sdk": "1.0.2-rc.2", + "matrix-react-sdk": "1.0.2-rc.3", "modernizr": "^3.6.0", "prop-types": "^15.6.2", "react": "^15.6.0", From 29ff95ccccb123c915ddb8dd51f82acaba96142e Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 17:39:57 +0000 Subject: [PATCH 48/60] v1.0.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 412c3248e2..5920ec1610 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": "1.0.2-rc.1", + "version": "1.0.2-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 0d6d7557889c6b3716a86f960f3dc7e6c9f2685d Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 17:42:18 +0000 Subject: [PATCH 49/60] Prepare changelog for v1.0.2-rc.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f40e17c728..8e712c78fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.0.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.2) (2019-03-01) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2-rc.1...v1.0.2-rc.2) + + * Update to react-sdk rc.3 + Changes in [1.0.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.1) (2019-03-01) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.1...v1.0.2-rc.1) From d4f29805c3198ce5ca028505a47935b306d90121 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 1 Mar 2019 17:42:19 +0000 Subject: [PATCH 50/60] v1.0.2-rc.2 --- 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 d7b4d41a97..3b5ba5468b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "riot-web", - "version": "1.0.2-rc.1", + "version": "1.0.2-rc.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 287b421ab6..8fb68be4e6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.0.2-rc.1", + "version": "1.0.2-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 9235b5a861608d927a6e5d9bf413286f19554043 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 5 Mar 2019 16:18:04 +0000 Subject: [PATCH 51/60] Add modular.im hosting link to electron app config --- electron_app/riot.im/config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index 2a52a5117d..21f47b69a3 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -9,6 +9,7 @@ "https://scalar-staging.riot.im/scalar/api", "https://scalar.vector.im/api" ], + "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web&utm_campaign=riot-web-hosting-link", "bug_report_endpoint_url": "https://riot.im/bugreports/submit", "welcomeUserId": "@riot-bot:matrix.org", "roomDirectory": { From 5474a5e0c7e55f2a71027e78229a25770744b7d7 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 5 Mar 2019 16:45:46 +0000 Subject: [PATCH 52/60] utm_campaign is now added automatically --- 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 21f47b69a3..de3699891e 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -9,7 +9,7 @@ "https://scalar-staging.riot.im/scalar/api", "https://scalar.vector.im/api" ], - "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web&utm_campaign=riot-web-hosting-link", + "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", "bug_report_endpoint_url": "https://riot.im/bugreports/submit", "welcomeUserId": "@riot-bot:matrix.org", "roomDirectory": { From 95c979de9844d2ed84d8c85a7157089a066dd9e9 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 5 Mar 2019 19:20:21 +0000 Subject: [PATCH 53/60] react-sdk & js-sdk rcs --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8fb68be4e6..3ed673afc5 100644 --- a/package.json +++ b/package.json @@ -70,8 +70,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "1.0.1-rc.1", - "matrix-react-sdk": "1.0.2-rc.3", + "matrix-js-sdk": "1.0.1-rc.2", + "matrix-react-sdk": "1.0.2-rc.4", "modernizr": "^3.6.0", "prop-types": "^15.6.2", "react": "^15.6.0", From b7d2159d6068a87e5f32e68325fdc01e2392cdca Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 5 Mar 2019 19:20:57 +0000 Subject: [PATCH 54/60] v1.0.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 5920ec1610..62f2c0de87 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": "1.0.2-rc.2", + "version": "1.0.2-rc.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 3ee0789ef744876c0ec143017fd5eba25a5ff25b Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 5 Mar 2019 19:22:12 +0000 Subject: [PATCH 55/60] Prepare changelog for v1.0.2-rc.3 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e712c78fd..8eca482acf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [1.0.2-rc.3](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.3) (2019-03-05) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2-rc.2...v1.0.2-rc.3) + + * Add modular.im hosting link to electron app config + [\#9051](https://github.com/vector-im/riot-web/pull/9051) + Changes in [1.0.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.2) (2019-03-01) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2-rc.1...v1.0.2-rc.2) From 2b709c6973781d91e75ee57280864ad3884218be Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 5 Mar 2019 19:22:13 +0000 Subject: [PATCH 56/60] v1.0.2-rc.3 --- 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 3b5ba5468b..4ab05e9f03 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "riot-web", - "version": "1.0.2-rc.2", + "version": "1.0.2-rc.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3ed673afc5..4445adfc87 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.0.2-rc.2", + "version": "1.0.2-rc.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 72014c59be372ae7f1f36a06c4df5424d19663b8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Mar 2019 11:29:55 +0000 Subject: [PATCH 57/60] Released matrix-sdk & js-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4445adfc87..a5ed4290aa 100644 --- a/package.json +++ b/package.json @@ -70,8 +70,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "1.0.1-rc.2", - "matrix-react-sdk": "1.0.2-rc.4", + "matrix-js-sdk": "1.0.1", + "matrix-react-sdk": "1.0.2", "modernizr": "^3.6.0", "prop-types": "^15.6.2", "react": "^15.6.0", From ea86359c417b2d18e975a85ea367e328d7d5827c Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Mar 2019 11:31:02 +0000 Subject: [PATCH 58/60] v1.0.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 62f2c0de87..a5c0738c98 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": "1.0.2-rc.3", + "version": "1.0.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From ebf6deeed26bd4ed75902f85508d68b2f5930123 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Mar 2019 11:33:13 +0000 Subject: [PATCH 59/60] Prepare changelog for v1.0.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8eca482acf..b259dae5cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.0.2](https://github.com/vector-im/riot-web/releases/tag/v1.0.2) (2019-03-06) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2-rc.3...v1.0.2) + + * New react-sdk for minor hosting link fixes + Changes in [1.0.2-rc.3](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.3) (2019-03-05) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2-rc.2...v1.0.2-rc.3) From b6930415ce3450f674151d31b58ff3c6aa2ed024 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 6 Mar 2019 11:33:14 +0000 Subject: [PATCH 60/60] v1.0.2 --- 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 4ab05e9f03..4cae817196 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "riot-web", - "version": "1.0.2-rc.3", + "version": "1.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a5ed4290aa..355e2727b8 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.0.2-rc.3", + "version": "1.0.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {