From 1e1a14c9a932ac719f7697702661240be46e992e Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Nov 2020 11:07:44 +0000 Subject: [PATCH 1/6] Extend Platform to support idpId for SSO flows --- src/vector/platform/ElectronPlatform.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx index 64835a00d4..5f9603e4b3 100644 --- a/src/vector/platform/ElectronPlatform.tsx +++ b/src/vector/platform/ElectronPlatform.tsx @@ -503,9 +503,9 @@ export default class ElectronPlatform extends VectorBasePlatform { return url; } - startSingleSignOn(mxClient: MatrixClient, loginType: "sso" | "cas", fragmentAfterLogin: string) { + startSingleSignOn(mxClient: MatrixClient, loginType: "sso" | "cas", fragmentAfterLogin: string, idpId?: string) { // this will get intercepted by electron-main will-navigate - super.startSingleSignOn(mxClient, loginType, fragmentAfterLogin); + super.startSingleSignOn(mxClient, loginType, fragmentAfterLogin, idpId); Modal.createTrackedDialog('Electron', 'SSO', InfoDialog, { title: _t("Go to your browser to complete Sign In"), description: , From 6e7826f41672e6b5f42ae39d355bb20b3e3749af Mon Sep 17 00:00:00 2001 From: m4sk1n Date: Tue, 24 Nov 2020 07:42:15 +0000 Subject: [PATCH 2/6] Translated using Weblate (Polish) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/pl/ --- src/i18n/strings/pl.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json index 707418edb0..4c9329cf0c 100644 --- a/src/i18n/strings/pl.json +++ b/src/i18n/strings/pl.json @@ -31,5 +31,6 @@ "Your browser can't run %(brand)s": "Twoja przeglądarka nie obsługuje %(brand)s", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s używa zaawansowanych funkcji przeglądarki, które nie są dostępne w twojej przeglądarce.", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfiguracja Elementa zawiera niepoprawny JSON. Popraw konfiguracje i odśwież stronę.", - "Your Element is misconfigured": "Element jest nieprawidłowo skonfigurowany" + "Your Element is misconfigured": "Element jest nieprawidłowo skonfigurowany", + "Powered by Matrix": "Zasilane przez Matrix" } From 58445efdde195bc5f3a16bf3d17b339f0794ab12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=A0=D1=83=D1=80=D0=B5=D0=BD?= =?UTF-8?q?=D0=BA=D0=BE?= Date: Tue, 24 Nov 2020 08:35:56 +0000 Subject: [PATCH 3/6] Translated using Weblate (Ukrainian) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/uk/ --- src/i18n/strings/uk.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json index fe57f2f679..8151a78bd6 100644 --- a/src/i18n/strings/uk.json +++ b/src/i18n/strings/uk.json @@ -2,35 +2,35 @@ "Dismiss": "Відхилити", "powered by Matrix": "працює на Matrix", "Unknown device": "Невідомий пристрій", - "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 щоб зробити виклик із спільним доступом до екрану.", "Welcome to Element": "Ласкаво просимо до Element", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Децентралізована, зашифрована балачка та засіб для співробітництва, що працює на [matrix]", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Децентралізований, зашифрований чат та засіб для співпраці, заснований на [matrix]", "Sign In": "Увійти", "Create Account": "Створити обліковий запис", "Explore rooms": "Шукати кімнати", - "Unexpected error preparing the app. See console for details.": "Неочікувана помилка при готуванні програми. Дивіться деталі у виводі консолі.", + "Unexpected error preparing the app. See console for details.": "Неочікувана помилка при підготовці програми. Дивіться деталі у виводі консолі.", "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Невірна конфігурація: можна вказати лише default_server_config, default_server_name або default_hs_url.", - "Invalid configuration: no default server specified.": "Невірна конфігурація: не вказано усталений сервер.", - "The message from the parser is: %(message)s": "Аналізатор повідомляє: %(message)s", + "Invalid configuration: no default server specified.": "Невірна конфігурація: не вказано сервер за замовчуванням.", + "The message from the parser is: %(message)s": "Повідомлення від аналізатора : %(message)s", "Invalid JSON": "Хибний JSON", - "Unsupported browser": "Непідтримуваний переглядач", + "Unsupported browser": "Непідтримуваний браузер", "Please install Chrome, Firefox, or Safari for the best experience.": "Для найкращих вражень від користування встановіть, будь ласка, Chrome, Firefox, або Safari.", - "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Ви можете продовжити, користуючись вашим поточним переглядачем, але деякі функції можуть не працювати, а застосунок може виглядати неправильно.", + "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Ви можете продовжити, користуючись вашим поточним браузером, але деякі функції можуть не працювати, а застосунок може виглядати неправильно.", "I understand the risks and wish to continue": "Я усвідомлюю ризик і бажаю продовжити", "Go to element.io": "Перейти на element.io", "Failed to start": "Запуск не вдався", "Download Completed": "Завантаження завершено", - "Missing indexeddb worker script!": "Відсутній скрипт воркеру для IndexedDB!", - "Your Element is misconfigured": "Ваш Element налаштовано неправильно", + "Missing indexeddb worker script!": "Відсутній робочий сценарій IndexedDB!", + "Your Element is misconfigured": "Ваш Element налаштовано невірно", "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Ваша конфігурація Element містить хибний JSON. Виправте проблему та оновіть сторінку.", - "Unable to load config file: please refresh the page to try again.": "Неможливо завантажити файл конфігурації. Оновіть, будь ласка, сторінку.", + "Unable to load config file: please refresh the page to try again.": "Неможливо завантажити файл конфігурації. Оновіть, будь ласка, сторінку, щоб спробувати знову.", "Open": "Відкрити", - "Open user settings": "Відкрити користувацькі налаштування", + "Open user settings": "Відкрити налаштування користувача", "Previous/next recently visited room or community": "Попередня/наступна нещодавно відвідана кімната чи спільнота", "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)", - "Go to your browser to complete Sign In": "Перейдіть у ваш переглядач щоб завершити входження", + "Go to your browser to complete Sign In": "Перейдіть у ваш браузер щоб завершити вхід", "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", "Powered by Matrix": "Працює на Matrix", "Your browser can't run %(brand)s": "Ваш переглядач неспроможний запустити %(brand)s", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s використовує передові властивості, які ваш переглядач не підтримує." + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s використовує передові властивості, які ваш браузер не підтримує." } From 899bcc067f397b624000ec76e9381a0c5d97bc58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= Date: Tue, 24 Nov 2020 21:55:52 +0000 Subject: [PATCH 4/6] Translated using Weblate (Estonian) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/et/ --- src/i18n/strings/et.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json index 8b6dc8d1d1..7ebc431212 100644 --- a/src/i18n/strings/et.json +++ b/src/i18n/strings/et.json @@ -15,7 +15,7 @@ "Previous/next recently visited room or community": "Eelmine/järgmine hiljuti kasutatud jututuba või kogukond", "You need to be using HTTPS to place a screen-sharing call.": "Ekraani jagava kõne jaoks pead kasutama HTTPS-ühendust.", "powered by Matrix": "põhineb Matrix'il", - "Welcome to Element": "Tere tulemast Element kasutajaks", + "Welcome to Element": "Tere tulemast kasutama suhtlusrakendust Element", "Sign In": "Logi sisse", "Create Account": "Loo konto", "%(brand)s Desktop (%(platformName)s)": "%(brand)s'i töölauaversioon (%(platformName)s)", From d8e0ea57913af416c20626cdf930d465f4cb07bd Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 27 Nov 2020 12:18:24 +0000 Subject: [PATCH 5/6] Include KaTeX CSS as a dependency This changes the KaTeX CSS inclusion to function just like the other bits of the CSS that we import from dependencies. --- package.json | 1 + src/vector/index.ts | 1 + webpack.config.js | 3 --- yarn.lock | 51 ++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 48 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 61bbdd762a..071a508642 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^10.1.2", "jsrsasign": "^9.1.5", + "katex": "^0.12.0", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.10", diff --git a/src/vector/index.ts b/src/vector/index.ts index a88c1d068d..a3a7bbb90c 100644 --- a/src/vector/index.ts +++ b/src/vector/index.ts @@ -23,6 +23,7 @@ limitations under the License. // in webpack.config.js require('gfm.css/gfm.css'); require('highlight.js/styles/github.css'); +require('katex/dist/katex.css') // These are things that can run before the skin loads - be careful not to reference the react-sdk though. import {parseQsFromFragment} from "./url_utils"; diff --git a/webpack.config.js b/webpack.config.js index 326e48e2ef..2b540f7bbb 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -41,9 +41,6 @@ module.exports = (env, argv) => { "jitsi": "./src/vector/jitsi/index.ts", "usercontent": "./node_modules/matrix-react-sdk/src/usercontent/index.js", - // CSS for LaTeX maths outout - "katex": "./node_modules/matrix-react-sdk/node_modules/katex/dist/katex.min.css", - // CSS themes "theme-legacy": "./node_modules/matrix-react-sdk/res/themes/legacy-light/css/legacy-light.scss", "theme-legacy-dark": "./node_modules/matrix-react-sdk/res/themes/legacy-dark/css/legacy-dark.scss", diff --git a/yarn.lock b/yarn.lock index 6ba37f1e80..759f8b93cd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3010,6 +3010,18 @@ chardet@^0.7.0: resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== +cheerio@^1.0.0-rc.3: + version "1.0.0-rc.3" + resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6" + integrity sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA== + dependencies: + css-select "~1.2.0" + dom-serializer "~0.1.1" + entities "~1.1.1" + htmlparser2 "^3.9.1" + lodash "^4.15.0" + parse5 "^3.0.1" + chokidar@^1.6.0: version "1.7.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" @@ -3252,7 +3264,7 @@ commander@2.17.x: resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== -commander@^2.15.1, commander@^2.20.0: +commander@^2.15.1, commander@^2.19.0, commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -3617,7 +3629,7 @@ css-select-base-adapter@^0.1.1: resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== -css-select@^1.1.0: +css-select@^1.1.0, css-select@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg= @@ -4108,12 +4120,20 @@ dom-serializer@0, dom-serializer@^0.2.1: domelementtype "^2.0.1" entities "^2.0.0" +dom-serializer@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" + integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA== + dependencies: + domelementtype "^1.3.0" + entities "^1.1.1" + domain-browser@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== -domelementtype@1, domelementtype@^1.3.1: +domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== @@ -5905,7 +5925,7 @@ html-webpack-plugin@^3.2.0: toposort "^1.0.0" util.promisify "1.0.0" -htmlparser2@^3.10.0, htmlparser2@^3.3.0: +htmlparser2@^3.10.0, htmlparser2@^3.3.0, htmlparser2@^3.9.1: version "3.10.1" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== @@ -7491,6 +7511,13 @@ jsx-ast-utils@^2.4.1: array-includes "^3.1.1" object.assign "^4.1.0" +katex@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/katex/-/katex-0.12.0.tgz#2fb1c665dbd2b043edcf8a1f5c555f46beaa0cb9" + integrity sha512-y+8btoc/CK70XqcHqjxiGWBOeIL8upbS0peTPXTvgrh21n1RiWWcIpSWM+4uXq+IAgNh9YYQWdc7LVDPDAEEAg== + dependencies: + commander "^2.19.0" + killable@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" @@ -7726,6 +7753,11 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= +lodash@^4.15.0: + version "4.17.20" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" + integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== + lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19, lodash@^4.17.3, lodash@^4.17.5, lodash@^4.2.1: version "4.17.19" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" @@ -7917,13 +7949,14 @@ matrix-mock-request@^1.2.3: "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.9.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/1db130b8f0a77ebf442e8ff7ca5f2a379d176ea9" + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/826466179aeeaf0a678e2d820f45031e6ab51dd0" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" blueimp-canvas-to-blob "^3.27.0" browser-encrypt-attachment "^0.3.0" browser-request "^0.3.3" + cheerio "^1.0.0-rc.3" classnames "^2.2.6" commonmark "^0.29.1" counterpart "^0.18.6" @@ -7942,6 +7975,7 @@ matrix-mock-request@^1.2.3: highlight.js "^10.1.2" html-entities "^1.3.1" is-ip "^2.0.0" + katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.19" matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" @@ -9030,6 +9064,13 @@ parse5@5.1.1, parse5@^5.1.1: resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== +parse5@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c" + integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA== + dependencies: + "@types/node" "*" + parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" From 078a1223b2bba9b0a7d7717b115251ddf81835c0 Mon Sep 17 00:00:00 2001 From: MamasLT Date: Sat, 28 Nov 2020 18:42:15 +0000 Subject: [PATCH 6/6] Translated using Weblate (Lithuanian) Currently translated at 100.0% (33 of 33 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/lt/ --- src/i18n/strings/lt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json index 3932a2416e..f5a7826b59 100644 --- a/src/i18n/strings/lt.json +++ b/src/i18n/strings/lt.json @@ -18,7 +18,7 @@ "Missing indexeddb worker script!": "Trūksta indexeddb worker skripto!", "Unable to load config file: please refresh the page to try again.": "Nepavyko įkelti konfigūracijos failo: atnaujinkite puslapį, kad pabandytumėte dar kartą.", "Previous/next recently visited room or community": "Ankstesnis/sekantis neseniai lankytas kambarys ar bendruomenė", - "%(brand)s Desktop (%(platformName)s)": "%(brand)s Kompiuteriui (%(platformName)s)", + "%(brand)s Desktop (%(platformName)s)": "%(brand)s Kompiuteryje (%(platformName)s)", "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", "Unsupported browser": "Nepalaikoma naršyklė", "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Jūs galite toliau naudotis savo dabartine naršykle, bet kai kurios arba visos funkcijos gali neveikti ir programos išvaizda bei sąsaja gali būti neteisingai rodoma.",