Compare commits

..

84 Commits

Author SHA1 Message Date
RiotRobot 9a1b667c27 v1.7.18 2021-01-26 12:17:44 +00:00
RiotRobot b04f76dc27 Prepare changelog for v1.7.18 2021-01-26 12:17:44 +00:00
RiotRobot cd8a9e44b3 Upgrade matrix-react-sdk to 3.12.1 2021-01-26 12:13:51 +00:00
RiotRobot 5052f9bc43 Upgrade matrix-js-sdk to 9.5.1 2021-01-26 12:12:41 +00:00
RiotRobot 1da652ede3 v1.7.17 2021-01-18 15:21:57 +00:00
RiotRobot 532caff989 Prepare changelog for v1.7.17 2021-01-18 15:21:56 +00:00
RiotRobot 238ed786fd Upgrade matrix-react-sdk to 3.12.0 2021-01-18 15:19:10 +00:00
RiotRobot 3275a0d819 Upgrade matrix-js-sdk to 9.5.0 2021-01-18 15:18:38 +00:00
RiotRobot f31b3c1c18 v1.7.17-rc.1 2021-01-13 13:14:41 +00:00
RiotRobot 50fe0d26e5 Prepare changelog for v1.7.17-rc.1 2021-01-13 13:14:41 +00:00
RiotRobot 21cadb8a3b Upgrade matrix-react-sdk to 3.12.0-rc.1 2021-01-13 13:10:30 +00:00
RiotRobot 1fe8f27cf7 Upgrade matrix-js-sdk to 9.5.0-rc.1 2021-01-13 13:10:04 +00:00
J. Ryan Stinnett dd5f9f4978 Merge pull request #16131 from RiotTranslateBot/weblate-element-web-element-web
Translations update from Weblate
2021-01-13 11:56:27 +00:00
GokdenizK 66145fca93 Translated using Weblate (Turkish)
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/tr/
2021-01-09 16:35:42 +00:00
Ludwig Bald 3cd5ad910d Translated using Weblate (German)
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/de/
2021-01-09 16:35:42 +00:00
gkkulik c4531585cb Added translation using Weblate (Silesian) 2021-01-08 22:31:51 +00:00
Flat Earth Israel Association ecd8e627f2 Translated using Weblate (Hebrew)
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/he/
2021-01-07 21:05:09 +00:00
אבי טייב 96e097ebcb Translated using Weblate (Hebrew)
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/he/
2021-01-03 21:35:40 +00:00
אבי טייב 9bb657ada5 Translated using Weblate (English (United States))
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/en_US/
2021-01-03 21:35:40 +00:00
Weblate 32e953a5a6 Merge branch 'origin/develop' into Weblate. 2020-12-29 13:17:30 +00:00
Michael Telatynski 66080b5751 Merge pull request #16028 from amstan/notification-closing
webplatform: Fix notification closing
2020-12-29 13:17:22 +00:00
MadsDyrmann a728961631 Translated using Weblate (Danish)
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/da/
2020-12-28 21:35:38 +00:00
Simon 1c51100c6c Translated using Weblate (Danish)
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/da/
2020-12-28 21:35:38 +00:00
Ngô Ngọc Đức Huy b302e14554 Translated using Weblate (Vietnamese)
Currently translated at 75.7% (25 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/vi/
2020-12-26 12:35:38 +00:00
DO4TQe1jcGNLk9GvtDKqismfsIht20JBP7bps1OzQnvTDSwYSN 77482432c9 Translated using Weblate (Dutch)
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/nl/
2020-12-26 12:35:38 +00:00
Thomas Jensen a5f7d75999 Translated using Weblate (Norwegian Bokmål)
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/nb_NO/
2020-12-24 19:35:37 +00:00
Alexandru M Stan 35d1c0d980 webplatform: Fix notification closing
After a notification arrives, when the user focuses on element, the
notification never goes away (unless directly interacted with), this was a bug.

displayNotification was never returning the notification handle, which means
that matrix-react-sdk later on had no way to .close it.

Closes #16026

Signed-off-by: Alexandru M Stan <alex@hypertriangle.com>
2020-12-24 02:01:40 -08:00
Weblate 482c1b4db1 Merge branch 'origin/develop' into Weblate. 2020-12-22 13:48:37 +00:00
Sam-Apostel 750082c37d Translated using Weblate (Dutch)
Currently translated at 96.9% (32 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/
2020-12-22 13:48:37 +00:00
J. Ryan Stinnett 852b7d0b89 Merge pull request #15999 from vector-im/jryans/prepublish-only
Stop building code and types for Element layer
2020-12-22 13:48:29 +00:00
Weblate b4c8cd5a4a Merge branch 'origin/develop' into Weblate. 2020-12-21 17:50:56 +00:00
RiotRobot 3dc3d4a8d4 Reset matrix-react-sdk back to develop branch 2020-12-21 17:50:47 +00:00
RiotRobot a7a70c2246 Reset matrix-js-sdk back to develop branch 2020-12-21 17:50:35 +00:00
Weblate c395061a3d Merge branch 'origin/develop' into Weblate. 2020-12-21 17:49:46 +00:00
RiotRobot 625e001592 v1.7.16 2020-12-21 17:46:39 +00:00
RiotRobot 2861089193 Upgrade JS SDK to 9.4.1 and React SDK to 3.11.1 2020-12-21 17:43:11 +00:00
RiotRobot 872a7d9699 Prepare changelog for v1.7.16 2020-12-21 17:39:56 +00:00
RiotRobot 554a9de7c7 Upgrade matrix-react-sdk to 3.11.0 2020-12-21 17:13:43 +00:00
RiotRobot 5a5b820fe5 Upgrade matrix-js-sdk to 9.4.0 2020-12-21 17:11:53 +00:00
Priit Jõerüüt 463de7f689 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/
2020-12-20 20:35:36 +00:00
Jadran Prodan 8ba51df384 Translated using Weblate (Slovenian)
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/sl/
2020-12-20 20:35:36 +00:00
The one with the braid e31b8ce85e Added translation using Weblate (Klingon) 2020-12-20 06:03:06 +00:00
Flat Earth Israel Association a68306777d Translated using Weblate (Hebrew)
Currently translated at 60.6% (20 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/he/
2020-12-18 23:35:35 +00:00
J. Ryan Stinnett 48884c711b Cloned deps no longer need so much building 2020-12-18 15:32:56 +00:00
J. Ryan Stinnett 799a14ebc6 Stop compiling code and types
This layer is no longer published to NPM, so there is no longer any need to
prepare compiled code and types.
2020-12-18 15:29:06 +00:00
RiotRobot 6a84aa9403 Fix typo in RC dependencies 2020-12-16 16:43:59 +00:00
RiotRobot d5325e203d v1.7.16-rc.1 2020-12-16 16:40:16 +00:00
RiotRobot e097a24afb Prepare changelog for v1.7.16-rc.1 2020-12-16 16:40:16 +00:00
RiotRobot 567a4a6a1c Upgrade JS SDK to 9.4.0-rc.2 and React SDK to 3.11.0-rc.2 2020-12-16 16:36:40 +00:00
J. Ryan Stinnett 0d6f4794d0 Merge pull request #15979 from RiotTranslateBot/weblate-element-web-element-web
Translations update from Weblate
2020-12-16 11:46:37 +00:00
HelaBasa e1357879f0 Translated using Weblate (Sinhala)
Currently translated at 9.0% (3 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/si/
2020-12-16 11:42:54 +00:00
Weblate b43d6536f5 Merge branch 'origin/develop' into Weblate. 2020-12-15 17:57:24 +00:00
Hubert Chathi e0e29996e0 Update to new API from matrix-react-sdk#5483 (#15942) 2020-12-15 12:57:17 -05:00
strix aluco 9b119e3bc3 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/
2020-12-13 09:29:56 +00:00
Weblate 8c02abc88a Merge branch 'origin/develop' into Weblate. 2020-12-11 16:13:22 +00:00
J. Ryan Stinnett 7da72b219b Merge pull request #15949 from vector-im/dependabot/npm_and_yarn/ini-1.3.7
Bump ini from 1.3.5 to 1.3.7
2020-12-11 16:13:16 +00:00
dependabot[bot] 2918ee3e1b Bump ini from 1.3.5 to 1.3.7
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-11 02:56:48 +00:00
Weblate edd85ad9e3 Merge branch 'origin/develop' into Weblate. 2020-12-10 14:39:43 +00:00
J. Ryan Stinnett bf4df74c69 Merge pull request #15937 from vector-im/jryans/doc-deploy-previews
Document pull request previews
2020-12-10 14:39:37 +00:00
J. Ryan Stinnett d8408933f1 Upgrade warning severity 2020-12-10 14:29:38 +00:00
Weblate ea498d663e Merge branch 'origin/develop' into Weblate. 2020-12-09 20:04:18 +00:00
J. Ryan Stinnett b495af97e9 Merge pull request #15939 from vector-im/jryans/katex-asset-path
Improve asset path for KaTeX fonts
2020-12-09 20:04:08 +00:00
J. Ryan Stinnett c667473258 Improve asset path for KaTeX fonts
This adjusts our asset path handling to group KaTeX fonts in a more sensible way
alongside the other fonts we have. It also resolves production build issues on
Windows.

Fixes https://github.com/vector-im/element-web/issues/15911
2020-12-09 17:03:55 +00:00
J. Ryan Stinnett ec781b3ebe Document pull request previews
This documents the pull request previews we recently added when working on
https://github.com/vector-im/element-web/issues/12624.
2020-12-09 13:59:45 +00:00
Stanislav Lukeš c2e25fa427 Translated using Weblate (Czech)
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/cs/
2020-12-09 13:50:05 +00:00
Weblate 02ffbd6f32 Merge branch 'origin/develop' into Weblate. 2020-12-07 22:58:16 +00:00
Travis Ralston c41f164c75 Merge pull request #15912 from vector-im/travis/semicolon
Fix an important semicolon
2020-12-07 15:58:07 -07:00
Travis Ralston d0b9b211c9 Fix an important semicolon 2020-12-07 14:46:56 -07:00
Weblate ed255e48f9 Merge branch 'origin/develop' into Weblate. 2020-12-07 13:06:08 +00:00
RiotRobot 79303ec387 Merge remote-tracking branch 'origin/develop' into develop 2020-12-07 13:05:47 +00:00
RiotRobot 3360f02ed9 Reset matrix-react-sdk back to develop branch 2020-12-07 13:01:39 +00:00
RiotRobot c4fa2d2585 Reset matrix-js-sdk back to develop branch 2020-12-07 13:01:29 +00:00
RiotRobot c4545341ea Merge branch 'master' into develop 2020-12-07 13:00:45 +00:00
Weblate ef839c45a7 Merge branch 'origin/develop' into Weblate. 2020-12-07 12:58:09 +00:00
Jeanne Lavoie 9a8f9307fe Translated using Weblate (French)
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/fr/
2020-12-07 12:58:09 +00:00
J. Ryan Stinnett a991156608 Merge pull request #15898 from vector-im/dependabot/npm_and_yarn/highlight.js-10.4.1
Bump highlight.js from 10.1.2 to 10.4.1
2020-12-07 12:58:01 +00:00
Salamandar c67906c3c6 Translated using Weblate (French)
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/fr/
2020-12-06 20:55:24 +00:00
dependabot[bot] aed9721936 Bump highlight.js from 10.1.2 to 10.4.1
Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 10.1.2 to 10.4.1.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/master/CHANGES.md)
- [Commits](https://github.com/highlightjs/highlight.js/compare/10.1.2...10.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-04 17:36:22 +00:00
J. Ryan Stinnett 344363d29d Merge pull request #15894 from vector-im/jryans/add-gitter
Add gitter.im to room directory
2020-12-04 11:17:07 +00:00
J. Ryan Stinnett aef2ffb01b Add gitter.im to room directory 2020-12-04 11:00:38 +00:00
Michael Telatynski a63bd875bc Merge pull request #15771 from vector-im/t3chguy/socials
Extend Platform to support idpId for SSO flows
2020-12-02 15:48:56 +00:00
J. Ryan Stinnett ed05f9deae Merge pull request #15843 from vector-im/jryans/tweak-katex-css
Include KaTeX CSS as a dependency
2020-12-02 14:52:01 +00:00
J. Ryan Stinnett d8e0ea5791 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.
2020-11-27 12:18:24 +00:00
Michael Telatynski 1e1a14c9a9 Extend Platform to support idpId for SSO flows 2020-11-19 11:07:44 +00:00
30 changed files with 249 additions and 93 deletions
+54
View File
@@ -1,3 +1,57 @@
Changes in [1.7.18](https://github.com/vector-im/element-web/releases/tag/v1.7.18) (2021-01-26)
===============================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.17...v1.7.18)
* Upgrade to React SDK 3.12.1 and JS SDK 9.5.1
Changes in [1.7.17](https://github.com/vector-im/element-web/releases/tag/v1.7.17) (2021-01-18)
===============================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.17-rc.1...v1.7.17)
* Upgrade to React SDK 3.12.0 and JS SDK 9.5.0
Changes in [1.7.17-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.17-rc.1) (2021-01-13)
=========================================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.16...v1.7.17-rc.1)
* Upgrade to React SDK 3.12.0-rc.1 and JS SDK 9.5.0-rc.1
* Translations update from Weblate
[\#16131](https://github.com/vector-im/element-web/pull/16131)
* webplatform: Fix notification closing
[\#16028](https://github.com/vector-im/element-web/pull/16028)
* Stop building code and types for Element layer
[\#15999](https://github.com/vector-im/element-web/pull/15999)
Changes in [1.7.16](https://github.com/vector-im/element-web/releases/tag/v1.7.16) (2020-12-21)
===============================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.16-rc.1...v1.7.16)
* Upgrade to React SDK 3.11.1 and JS SDK 9.4.1
Changes in [1.7.16-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.16-rc.1) (2020-12-16)
=========================================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.15...v1.7.16-rc.1)
* Upgrade to React SDK 3.11.0-rc.2 and JS SDK 9.4.0-rc.2
* Translations update from Weblate
[\#15979](https://github.com/vector-im/element-web/pull/15979)
* Bump ini from 1.3.5 to 1.3.7
[\#15949](https://github.com/vector-im/element-web/pull/15949)
* Document pull request previews
[\#15937](https://github.com/vector-im/element-web/pull/15937)
* Improve asset path for KaTeX fonts
[\#15939](https://github.com/vector-im/element-web/pull/15939)
* Fix an important semicolon
[\#15912](https://github.com/vector-im/element-web/pull/15912)
* Bump highlight.js from 10.1.2 to 10.4.1
[\#15898](https://github.com/vector-im/element-web/pull/15898)
* Add gitter.im to room directory
[\#15894](https://github.com/vector-im/element-web/pull/15894)
* Extend Platform to support idpId for SSO flows
[\#15771](https://github.com/vector-im/element-web/pull/15771)
* Include KaTeX CSS as a dependency
[\#15843](https://github.com/vector-im/element-web/pull/15843)
Changes in [1.7.15](https://github.com/vector-im/element-web/releases/tag/v1.7.15) (2020-12-07)
===============================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.15-rc.1...v1.7.15)
Binary file not shown.

After

Width:  |  Height:  |  Size: 155 KiB

+33
View File
@@ -0,0 +1,33 @@
# Pull Request Previews
Pull requests to the React SDK layer (and in the future other layers as well)
automatically set up a preview site with a full deployment of Element with the
changes from the pull request added in so that anyone can easily test and review
them. This is especially useful for checking visual and interactive changes.
To access the preview site, scroll down to the bottom of the PR where the
various CI results are displayed:
![Pull request: checks section](./img/pr-checks.png)
The checks section could be collapsed at first, so you may need to click "Show
all checks" to reveal them. Look for an entry that mentions `deploy-preview`. It
may be at the end of the list, so you may need scroll a bit to see it. To access
the preview site, click the "Details" link in the deploy preview row.
**Important:** Please always use test accounts when logging into preview sites,
as they may contain unreviewed and potentially dangerous code that could damage
your account, exfiltrate encryption keys, etc.
## FAQs
### Are preview sites created for pull requests from contributors?
Yes, they are created for all PRs from any author.
### Do preview sites expire after some time period?
No, there is no expiry date, so they should remain accessible indefinitely, but
of course they obviously aren't meant to live beyond the development workflow,
so please don't rely on them for anything important. They may disappear at any
time without notice.
+3 -4
View File
@@ -73,10 +73,9 @@ functionality is:
required (though may still be useful) since we can continue tweaking
As it can be difficult to review design work from looking at just the changed
files in a PR, authors should be prepared for Design and / or Product teams to
request a link to an ad-hoc build of Element (hosted anywhere) that can be used for
the review. In the future, we [hope to automate
this](https://github.com/vector-im/element-web/issues/12624) for every PR.
files in a PR, a [preview site](./pr-previews.md) that includes your changes
will be added automatically so that anyone who's interested can try them out
easily.
Before starting work on a feature, it's best to ensure your plan aligns well
with our vision for Element. Please chat with the team in
+2 -1
View File
@@ -20,7 +20,8 @@
},
"roomDirectory": {
"servers": [
"matrix.org"
"matrix.org",
"gitter.im"
]
},
"enable_presence_by_hs_url": {
+2 -1
View File
@@ -24,7 +24,8 @@
},
"roomDirectory": {
"servers": [
"matrix.org"
"matrix.org",
"gitter.im"
]
},
"enable_presence_by_hs_url": {
+6 -9
View File
@@ -1,6 +1,6 @@
{
"name": "element-web",
"version": "1.7.15",
"version": "1.7.18",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@@ -34,16 +34,14 @@
"reskindex:watch": "reskindex -h src/header -w",
"reskindex:watch-react": "node scripts/yarn-sub.js matrix-react-sdk reskindex:watch",
"clean": "rimraf lib webapp",
"build": "yarn clean && yarn build:genfiles && yarn build:compile && yarn build:types && yarn build:bundle",
"build-stats": "yarn clean && yarn build:genfiles && yarn build:compile && yarn build:types && yarn build:bundle-stats",
"build": "yarn clean && yarn build:genfiles && yarn build:bundle",
"build-stats": "yarn clean && yarn build:genfiles && yarn build:bundle-stats",
"build:jitsi": "node scripts/build-jitsi.js",
"build:res": "node scripts/copy-res.js",
"build:genfiles": "yarn reskindex && yarn build:res && yarn build:jitsi",
"build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
"build:compile": "babel -d lib --verbose --extensions \".ts,.js,.tsx\" src",
"build:bundle": "webpack --progress --bail --mode production",
"build:bundle-stats": "webpack --progress --bail --mode production --json > webpack-stats.json",
"build:types": "tsc --emitDeclarationOnly --jsx react",
"dist": "scripts/package.sh",
"start": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n reskindex,reskindex-react,res,element-js \"yarn reskindex:watch\" \"yarn reskindex:watch-react\" \"yarn start:res\" \"yarn start:js\"",
"start:res": "yarn build:jitsi && node scripts/copy-res.js -w",
@@ -57,11 +55,11 @@
"dependencies": {
"browser-request": "^0.3.3",
"gfm.css": "^1.1.2",
"highlight.js": "^10.1.2",
"highlight.js": "^10.4.1",
"jsrsasign": "^9.1.5",
"katex": "^0.12.0",
"matrix-js-sdk": "9.3.0",
"matrix-react-sdk": "3.10.0",
"matrix-js-sdk": "9.5.1",
"matrix-react-sdk": "3.12.1",
"matrix-widget-api": "^0.1.0-beta.10",
"olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
"prop-types": "^15.7.2",
@@ -72,7 +70,6 @@
"url": "^0.11.0"
},
"devDependencies": {
"@babel/cli": "^7.7.5",
"@babel/core": "^7.7.5",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-decorators": "^7.7.4",
+1 -2
View File
@@ -77,7 +77,6 @@ dodep matrix-org matrix-js-sdk
pushd matrix-js-sdk
yarn link
yarn install
yarn build
popd
yarn link matrix-js-sdk
@@ -92,7 +91,7 @@ pushd matrix-react-sdk
yarn link
yarn link matrix-js-sdk
yarn install
yarn build
yarn reskindex
popd
yarn link matrix-react-sdk
+5 -1
View File
@@ -28,5 +28,9 @@
"Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Pro nejlepší zážitek si prosím nainstalujte prohlížeč <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, nebo <safariLink>Safari</safariLink>.",
"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.": "Můžete pokračovat v užívání vašeho současného prohlížeče, ale některé (nebo dokonce všechny) funkce nemusí fungovat a vzhled a chování aplikace nemusí být správné.",
"I understand the risks and wish to continue": "Rozumím a přesto chci pokračovat",
"Go to element.io": "Přejít na element.io"
"Go to element.io": "Přejít na element.io",
"Failed to start": "Nepovedlo se nastartovat",
"Powered by Matrix": "Běží na Matrixu",
"%(brand)s Desktop (%(platformName)s)": "%(brand)s pro desktopový počítač (%(platformName)s)",
"Missing indexeddb worker script!": "Nenačetl se skript spravující indexdb!"
}
+12 -4
View File
@@ -9,20 +9,28 @@
"Invalid JSON": "Ugyldig JSON",
"Unexpected error preparing the app. See console for details.": "Uventet fejl ved forberedelse af appen. Se konsollen for detaljer.",
"Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ugyldig konfiguration: kan kun angive en af default_server_config, default_server_name eller default_hs_url.",
"Invalid configuration: no default server specified.": "Ugyldig konfiguration: ingen standardserver angivet.",
"Invalid configuration: no default server specified.": "Ugyldig konfiguration: Ingen standardserver er angivet.",
"Sign In": "Log ind",
"Create Account": "Opret brugerkonto",
"Explore rooms": "Udforsk rum",
"Missing indexeddb worker script!": "Manglende indexeddb worker script!",
"Unable to load config file: please refresh the page to try again.": "Ikke i stand til at loade config fil: genopfrisk venligst siden for at prøve igen.",
"Unable to load config file: please refresh the page to try again.": "Ikke i stand til at indlæse konfigurationsfil: Genopfrisk venligst siden for at prøve igen.",
"Open user settings": "Åbn brugerindstillinger",
"Previous/next recently visited room or community": "Forrige/næste besøgte rum eller fællesskab",
"Go to your browser to complete Sign In": "Gå til din browser for at færdiggøre Log ind",
"Go to element.io": "Gå til element.io",
"I understand the risks and wish to continue": "Jeg forstår risikoen og ønsker at fortsætte",
"Unsupported browser": "Usupporteret browser",
"Unsupported browser": "Browser ikke understøttet",
"Open": "Åbn",
"Download Completed": "Hentning færdig",
"Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Din Element konfiguration indeholder ugyldig JSON. Løs venligst problemet og genindlæs siden.",
"Your Element is misconfigured": "Din Element er konfigureret forkert"
"Your Element is misconfigured": "Din Element er konfigureret forkert",
"Your browser can't run %(brand)s": "Din browser kan ikke køre %(brand)s",
"Powered by Matrix": "Drevet af Matrix",
"%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
"Failed to start": "Opstart mislykkedes",
"%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop %(platformName)s",
"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.": "Du kan fortsætte med at bruge din nuværende browser, men du kan opleve at visse eller alle funktioner ikke vil fungere korrekt.",
"Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Venligst installer <chromeLink>Chrome</chromeLink>,<firefoxLink>Firefox</firefoxLink> eller <safariLink>Safari</safariLink> for den bedste oplevelse.",
"%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s bruger avanceret browser funktioner som ikke er understøttet af din nuværende browser."
}
+1 -1
View File
@@ -4,7 +4,7 @@
"Unknown device": "Unbekanntes Gerät",
"You need to be using HTTPS to place a screen-sharing call.": "Du musst HTTPS nutzen um einen Anruf mit Bildschirmfreigabe durchzuführen.",
"Welcome to Element": "Willkommen bei Element",
"Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Dezentrale, verschlüsselte Chat- &amp; Kollaborationslösung unterstützt von [matrix]",
"Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Dezentrale, verschlüsselte Chat- &amp; Kollaborationslösung mittels [matrix]",
"Sign In": "Anmelden",
"Create Account": "Account erstellen",
"Explore rooms": "Erkunde Räume",
+21 -1
View File
@@ -12,5 +12,25 @@
"Invalid JSON": "Invalid JSON",
"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.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.",
"Invalid configuration: no default server specified.": "Invalid configuration: no default server specified."
"Invalid configuration: no default server specified.": "Invalid configuration: no default server specified.",
"Failed to start": "Failed to start",
"Go to element.io": "Go to element.io",
"I understand the risks and wish to continue": "I understand the risks and wish to continue",
"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.",
"Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.",
"%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s uses advanced browser features which aren't supported by your current browser.",
"Your browser can't run %(brand)s": "Your browser can't run %(brand)s",
"Unsupported browser": "Unsupported browser",
"Powered by Matrix": "Powered by Matrix",
"%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
"Go to your browser to complete Sign In": "Go to your browser to complete Sign In",
"%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
"Previous/next recently visited room or community": "Previous/next recently visited room or community",
"Open user settings": "Open user settings",
"Open": "Open",
"Download Completed": "Download Completed",
"Unable to load config file: please refresh the page to try again.": "Unable to load config file: please refresh the page to try again.",
"Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.",
"Your Element is misconfigured": "Your Element is misconfigured",
"Missing indexeddb worker script!": "Missing indexeddb worker script!"
}
+2 -2
View File
@@ -3,7 +3,7 @@
"Invalid JSON": "Vigane JSON",
"Unknown device": "Tundmatu seade",
"Invalid configuration: no default server specified.": "Vigane seadistus: vaikimisi server on määramata.",
"Unable to load config file: please refresh the page to try again.": "Seadistuste faili laadimine ei õnnestunud: uuesti proovimiseks palun lae leht uuesti.",
"Unable to load config file: please refresh the page to try again.": "Seadistuste faili laadimine ei õnnestunud: uuesti proovimiseks palun laadi leht uuesti.",
"Unexpected error preparing the app. See console for details.": "Rakenduse ettevalmistamisel tekkis ootamatu viga. Täpsema teabe leiad konsoolist.",
"Open user settings": "Ava kasutaja seadistused",
"Go to your browser to complete Sign In": "Sisselogimiseks ava oma brauser",
@@ -29,7 +29,7 @@
"Download Completed": "Allalaadimine on lõpetatud",
"Open": "Ava",
"Your Element is misconfigured": "Sinu Element on valesti seadistatud",
"Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sinu Element'i seadistustes on vigased JSON-vormingus andmed. Palun paranda see viga ja lae leht uuesti.",
"Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sinu Element'i seadistustes on vigased JSON-vormingus andmed. Palun paranda see viga ja laadi leht uuesti.",
"Your browser can't run %(brand)s": "%(brand)s ei toimi sinu brauseris",
"%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s kasutab mitmeid uusi brauseri-põhiseid tehnoloogiaid, mis ei ole veel sinu veebibrauseris toetatud.",
"Powered by Matrix": "Põhineb Matrix'il"
+1 -1
View File
@@ -4,7 +4,7 @@
"Unknown device": "Appareil inconnu",
"You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel avec partage d’écran.",
"Welcome to Element": "Bienvenue sur Element",
"Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Discussion &amp; collaboration décentralisées et chiffrées, propulsées par [matrix]",
"Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Messagerie et collaboration décentralisées et chiffrées, propulsées par [matrix]",
"Sign In": "Se connecter",
"Create Account": "Créer un compte",
"Explore rooms": "Explorer les salons",
+24 -1
View File
@@ -9,5 +9,28 @@
"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.": "תצורה שגויה: לא צוין שרת ברירת מחדל.",
"Open user settings": "פתיחת הגדרות משתמש",
"Go to your browser to complete Sign In": "עבור לדפדפן להמשך ההתחברות"
"Go to your browser to complete Sign In": "עבור לדפדפן להמשך ההתחברות",
"Explore rooms": "שיטוט בחדרים",
"Create Account": "יצירת חשבון",
"Sign In": "כניסה",
"Previous/next recently visited room or community": "הבא\\קודם חדרים וקהילות שביקרתם לאחרונה",
"Open": "פתיחה",
"Download Completed": "ההורדה הושלמה",
"Unexpected error preparing the app. See console for details.": "שגיאה לא צפויה במהלך הכנת האפליקציה. ראו קונסול לפרטים נוספים.",
"Unable to load config file: please refresh the page to try again.": "לא יכול לקרוא את קובץ ההגדרות: אנא אתחלו את הדף לנסות שנית.",
"Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "האלמנט מכיל הגדרת JSON שגויה, אנא תקנו את הבעיה ואתחלו את הדף.",
"Your Element is misconfigured": "האלמנט מוגדר באופן שגוי",
"Go to element.io": "חזור לאתר הראשי: element.io",
"I understand the risks and wish to continue": "הסיכונים מובנים לי ואני מעוניינ/ת להמשיך",
"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.": "ניתן להמשיך ולהשתמש בדפדפן זה, אך ייתכן שחלק מן התכונות והמאפיינים לא יעבדו כשורה או ייראו כשגויים.",
"Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "נא התקן את דפדפן <chromeLink>כרום</chromeLink>, <firefoxLink>פיירפוקס</firefoxLink> או <safariLink>סאפרי</safariLink> בשביל החוויה הטובה ביותר.",
"Failed to start": "כשל בהעלאת התוכנה",
"%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s משתמש בתכונות דפדפן מתקדמות שאינן נתמכות בדפדפן הנוכחי שלך.",
"Your browser can't run %(brand)s": "הדפדפן שלך לא יכול להריץ %(brand)s",
"Unsupported browser": "דפדפן לא נתמך",
"Powered by Matrix": "מופעל על ידי מטריקס",
"%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
"%(brand)s Desktop (%(platformName)s)": "%(brand)s שולחן עבודה %(platformName)s",
"The message from the parser is: %(message)s": "ההודעה מהניתוח היא: %(message)s",
"Missing indexeddb worker script!": "חסר סקריפט עובד indexeddb!"
}
+6 -1
View File
@@ -27,5 +27,10 @@
"Unable to load config file: please refresh the page to try again.": "Kan ikke laste inn konfigurasjonsfil: oppdater siden for å prøve igjen.",
"Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Ditt Element konfigurasjonen inneholder ugyldig JSON. Løs problemet og last siden på nytt.",
"Your Element is misconfigured": "Ditt Element er feilkonfigurert",
"Missing indexeddb worker script!": "Mangler indexeddb arbeiderskript!"
"Missing indexeddb worker script!": "Mangler indexeddb arbeiderskript!",
"Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Vennligst installer <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eller <safariLink>Safari</safariLink> for den beste opplevelsen.",
"%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s bruker avanserte nettleserfunksjoner som ikke støttes av din nåværende nettleser.",
"%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
"%(brand)s Desktop (%(platformName)s)": "%(brand)s Skrivebord (%(platformName)s)",
"Open": "Åpne"
}
+3 -1
View File
@@ -30,5 +30,7 @@
"Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Uw Element configuratie bevat ongeldige JSON. Gelieve het probleem te corrigeren daarna de pagina te herladen.",
"Download Completed": "Download voltooid",
"Your Element is misconfigured": "Uw Element is verkeerd geconfigureerd",
"Your browser can't run %(brand)s": "Uw browser kan %(brand)s niet draaien."
"Your browser can't run %(brand)s": "Uw browser kan %(brand)s niet draaien",
"%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s gebruikt geavanceerde functies die niet ondersteund worden in uw huidige browser.",
"Powered by Matrix": "Gebruikt Matrix technologie"
}
+4 -2
View File
@@ -1,4 +1,6 @@
{
"Unknown device": "නොදන්නා උපකරණය",
"%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)"
"Unknown device": "නොදන්නා උපාංගයකි",
"%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
"Welcome to Element": "ඉලමන්ට් වෙත සාදරයෙන් පිළිගනිමු",
"Open": "විවෘත කරන්න"
}
+1 -1
View File
@@ -8,7 +8,7 @@
"Sign In": "Prijava",
"Create Account": "Registracija",
"Explore rooms": "Raziščite sobe",
"Missing indexeddb worker script!": "Manjka skript za IndexDB!",
"Missing indexeddb worker script!": "Manjka skripta za IndexDB!",
"Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Neveljavna konfiguracija: lahko izberete samo eno izmed default_server_config, default_server_name ali default_hs_url.",
"Invalid configuration: no default server specified.": "Neveljavna konfiguracija: privzeti strežnik ni nastavljen.",
"Your Element is misconfigured": "Vaš Element je napačno nastavljen",
+1
View File
@@ -0,0 +1 @@
{}
+1
View File
@@ -0,0 +1 @@
{}
+8 -2
View File
@@ -20,11 +20,17 @@
"Unable to load config file: please refresh the page to try again.": "Yapılandırma (config) dosyası yüklenemedi: lütfen yeniden denemek için sayfayı yenileyin.",
"Download Completed": "İndirme Tamamlandı",
"Unsupported browser": "Desteklenmeyen tarayıcı",
"Your browser can't run %(brand)s": "",
"Your browser can't run %(brand)s": "Tarayıcınız %(brand)s uygulamasını çalıştıramıyor",
"%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s, kullandığınız tarayıcı tarafından desteklenmeyen, gelişmiş tarayıcı özellikleri kullanıyor.",
"Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Daha iyi bir deneyim için lütfen <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> ya da <safariLink>Safari</safariLink> tarayıcılarından birini yükleyin.",
"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.": "Şu anda kullanmış olduğunuz tarayıcınızı kullanmaya devam edebilirsiniz ancak uygulamanın sunduğu bazı ya da bütün özellikler çalışmayabilir ve deneyiminizi kötü yönde etkileyebilir.",
"I understand the risks and wish to continue": "Riskleri anlıyorum ve devam etmek istiyorum",
"Go to element.io": "element.io adresine git",
"Failed to start": "Başlatılamadı"
"Failed to start": "Başlatılamadı",
"Previous/next recently visited room or community": "Yakında ziyaret edilen önceki/sonraki oda veya topluluk",
"Powered by Matrix": "Matrix tarafından güçlendirildi",
"%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
"%(brand)s Desktop (%(platformName)s)": "%(brand)s Masaüstü (%(platformName)s)",
"Open": "Aç",
"Missing indexeddb worker script!": "Indexeddb worker kodu eksik!"
}
+1 -1
View File
@@ -7,7 +7,7 @@
"Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Децентралізований, зашифрований чат та засіб для співпраці, заснований на [matrix]",
"Sign In": "Увійти",
"Create Account": "Створити обліковий запис",
"Explore rooms": "Шукати кімнати",
"Explore rooms": "Каталог кімнат",
"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.": "Невірна конфігурація: не вказано сервер за замовчуванням.",
+15 -1
View File
@@ -12,5 +12,19 @@
"Invalid configuration: no default server specified.": "Cấu hình không hợp lệ: máy chủ mặc định không được thiết lập.",
"Sign In": "Đăng nhập",
"Create Account": "Tạo tài khoản",
"Explore rooms": "Khám phá phòng chat"
"Explore rooms": "Khám phá phòng chat",
"Download Completed": "Đã hoàn thành tải xuống",
"Go to element.io": "Đi đến element.io",
"I understand the risks and wish to continue": "Tôi hiểu các rủi ro và muốn tiếp tục",
"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.": "Bạn có thể tiếp tục sử dụng trình duyệt hiện tại của bạn, nhưng một số tính năng có thể không hoạt động và trải nghiệm ứng dụng sẽ không được chính xác.",
"Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Vui lòng cài đặt <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, hoặc <safariLink>Safari</safariLink> để có trải nghiệm tốt nhất.",
"%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s dùng tính năng cao cấp của trình duyệt không được hỗ trợ bởi trình duyệt của bạn.",
"Your browser can't run %(brand)s": "Trình duyệt của bạn không thể chạy %(brand)s",
"Unsupported browser": "Trình duyệt không được hỗ trợ",
"Go to your browser to complete Sign In": "Mở trình duyệt web để hoàn thành đăng nhập",
"%(brand)s Desktop (%(platformName)s)": "%(brand)s Máy tính để bàn (%(platformName)s)",
"Previous/next recently visited room or community": "Phòng chat hoặc cộng đồng gần đây trước/tiếp theo",
"Open user settings": "Mở cài đặt người dùng",
"Open": "Mở",
"Unable to load config file: please refresh the page to try again.": "Không thể tải tệp cấu hình: hãy làm mới trang để thử lại."
}
+1 -1
View File
@@ -236,7 +236,7 @@ async function verifyServerConfig() {
validatedConfig = AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, discoveryResult, true);
} catch (e) {
const {hsUrl, isUrl, userId} = Lifecycle.getLocalStorageSessionVars();
const {hsUrl, isUrl, userId} = await Lifecycle.getStoredSessionVars();
if (hsUrl && userId) {
console.error(e);
console.warn("A session was found - suppressing config error and using the session's homeserver");
+1 -1
View File
@@ -23,7 +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')
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";
+2 -2
View File
@@ -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: <Spinner />,
+2
View File
@@ -89,6 +89,8 @@ export default class WebPlatform extends VectorBasePlatform {
window.focus();
notification.close();
};
return notification;
}
_getVersion(): Promise<string> {
+18 -8
View File
@@ -269,12 +269,12 @@ module.exports = (env, argv) => {
options: {
esModule: false,
name: '[name].[hash:7].[ext]',
outputPath: getImgOutputPath,
outputPath: getAssetOutputPath,
publicPath: function(url, resourcePath) {
// CSS image usages end up in the `bundles/[hash]` output
// directory, so we adjust the final path to navigate up
// twice.
const outputPath = getImgOutputPath(url, resourcePath);
const outputPath = getAssetOutputPath(url, resourcePath);
return toPublicPath(path.join("../..", outputPath));
},
},
@@ -285,9 +285,9 @@ module.exports = (env, argv) => {
options: {
esModule: false,
name: '[name].[hash:7].[ext]',
outputPath: getImgOutputPath,
outputPath: getAssetOutputPath,
publicPath: function(url, resourcePath) {
const outputPath = getImgOutputPath(url, resourcePath);
const outputPath = getAssetOutputPath(url, resourcePath);
return toPublicPath(outputPath);
},
},
@@ -392,15 +392,25 @@ module.exports = (env, argv) => {
/**
* Merge assets found via CSS and imports into a single tree, while also preserving
* directories under `res`.
* directories under e.g. `res` or similar.
*
* @param {string} url The adjusted name of the file, such as `warning.1234567.svg`.
* @param {string} resourcePath The absolute path to the source file with unmodified name.
* @return {string} The returned paths will look like `img/warning.1234567.svg`.
*/
function getImgOutputPath(url, resourcePath) {
const prefix = /^.*[/\\]res[/\\]/;
const outputDir = path.dirname(resourcePath).replace(prefix, "");
function getAssetOutputPath(url, resourcePath) {
// `res` is the parent dir for our own assets in various layers
// `dist` is the parent dir for KaTeX assets
const prefix = /^.*[/\\](dist|res)[/\\]/;
if (!resourcePath.match(prefix)) {
throw new Error(`Unexpected asset path: ${resourcePath}`);
}
let outputDir = path.dirname(resourcePath).replace(prefix, "");
if (resourcePath.includes("KaTeX")) {
// Add a clearly named directory segment, rather than leaving the KaTeX
// assets loose in each asset type directory.
outputDir = path.join(outputDir, "KaTeX");
}
return path.join(outputDir, path.basename(url));
}
+18 -44
View File
@@ -2,22 +2,6 @@
# yarn lockfile v1
"@babel/cli@^7.7.5":
version "7.10.1"
resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.10.1.tgz#b6e5cd43a17b8f639442ab027976408ebe6d79a0"
integrity sha512-cVB+dXeGhMOqViIaZs3A9OUAe4pKw4SBNdMw6yHJMYR7s4TB+Cei7ThquV/84O19PdIFWuwe03vxxES0BHUm5g==
dependencies:
commander "^4.0.1"
convert-source-map "^1.1.0"
fs-readdir-recursive "^1.1.0"
glob "^7.0.0"
lodash "^4.17.13"
make-dir "^2.1.0"
slash "^2.0.0"
source-map "^0.5.0"
optionalDependencies:
chokidar "^2.1.8"
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.1", "@babel/code-frame@^7.5.5":
version "7.10.1"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.1.tgz#d5481c5095daa1c57e16e54c6f9198443afb49ff"
@@ -3269,11 +3253,6 @@ commander@^2.15.1, commander@^2.19.0, commander@^2.20.0:
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
commander@^4.0.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
commander@~2.19.0:
version "2.19.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
@@ -3386,7 +3365,7 @@ content-type@^1.0.4, content-type@~1.0.4:
resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -5402,11 +5381,6 @@ fs-minipass@^2.0.0:
dependencies:
minipass "^3.0.0"
fs-readdir-recursive@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==
fs-write-stream-atomic@^1.0.8:
version "1.0.10"
resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -5572,7 +5546,7 @@ glob2base@^0.0.12:
dependencies:
find-index "^0.1.1"
glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
version "7.1.6"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -5812,10 +5786,10 @@ hex-color-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
highlight.js@^10.1.2:
version "10.1.2"
resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.1.2.tgz#c20db951ba1c22c055010648dfffd7b2a968e00c"
integrity sha512-Q39v/Mn5mfBlMff9r+zzA+gWxRsCRKwEMvYTiisLr/XUiFI/4puWt0Ojdko3R3JCNWGdOWaA5g/Yxqa23kC5AA==
highlight.js@^10.1.2, highlight.js@^10.4.1:
version "10.4.1"
resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.1.tgz#d48fbcf4a9971c4361b3f95f302747afe19dbad0"
integrity sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==
hmac-drbg@^1.0.0:
version "1.0.1"
@@ -6211,9 +6185,9 @@ inherits@2.0.3:
integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
version "1.3.5"
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
version "1.3.7"
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
inquirer@^7.0.0:
version "7.3.2"
@@ -7925,10 +7899,10 @@ mathml-tag-names@^2.1.1:
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
matrix-js-sdk@9.3.0:
version "9.3.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.3.0.tgz#e5fa3f6cb5a56e5c5386ecf3110dc35072170dbb"
integrity sha512-rzvYJS5mMP42iQVfGokX8DgmJpTUH+k15vATyB5JyBq/3r/kP22tN78RgoNxYzrIP/R4rB4OHUFNtgGzBH2u8g==
matrix-js-sdk@9.5.1:
version "9.5.1"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.5.1.tgz#f2e27b7131a8d1a75fd2a803434e63fe672415ef"
integrity sha512-01YbRuU50BDYytTZ5fdmdoQLqOGDT2F7X6vDBrYHpdaRN2jWuLCspQlOKFJKgv73gNhw9V9jfoZN+NxuwuUpUQ==
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"
@@ -7948,10 +7922,10 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"
matrix-react-sdk@3.10.0:
version "3.10.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.10.0.tgz#07575b7dc5f12093a1dab313068673a82a939dfc"
integrity sha512-LatG4kCKKy7ybUnvpoV3p6KEMSaECBIh0alw1JisuVBMw4nAYXEIbM1kGOI0h2vBF2826YqwXGj/vEyFHr7Euw==
matrix-react-sdk@3.12.1:
version "3.12.1"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.12.1.tgz#4f527404220427328d96462bc8a0cf065b9b31bf"
integrity sha512-RM//2mm5Bh4k7XQuYjbe8u/hSgXnxGgpq4/YcKmH2hKqdg46IVyVcoPrCswtdWqt0hpO3taoORrMwpGy3QhHBQ==
dependencies:
"@babel/runtime" "^7.10.5"
await-lock "^2.0.1"
@@ -7980,7 +7954,7 @@ matrix-react-sdk@3.10.0:
katex "^0.12.0"
linkifyjs "^2.1.9"
lodash "^4.17.19"
matrix-js-sdk "9.3.0"
matrix-js-sdk "9.5.1"
matrix-widget-api "^0.1.0-beta.10"
minimist "^1.2.5"
pako "^1.0.11"