Compare commits

..

106 Commits

Author SHA1 Message Date
RiotRobot
c431177bda v1.7.13 2020-11-09 16:39:21 +00:00
RiotRobot
c8a3901633 Prepare changelog for v1.7.13 2020-11-09 16:39:20 +00:00
RiotRobot
cefe77befc Upgrade matrix-react-sdk to 3.8.0 2020-11-09 16:36:47 +00:00
RiotRobot
fcb6444771 Upgrade matrix-js-sdk to 9.1.0 2020-11-09 16:36:00 +00:00
RiotRobot
70bbeeee3b v1.7.13-rc.1 2020-11-04 14:22:41 +00:00
RiotRobot
9baa3961aa Prepare changelog for v1.7.13-rc.1 2020-11-04 14:22:40 +00:00
RiotRobot
f759c9b0a0 Upgrade matrix-react-sdk to 3.8.0-rc.1 2020-11-04 14:19:39 +00:00
RiotRobot
156752a220 Upgrade matrix-js-sdk to 9.1.0-rc.1 2020-11-04 14:18:34 +00:00
J. Ryan Stinnett
b6dca76ad6 Merge pull request #15644 from RiotTranslateBot/weblate-element-web-element-web
Translations update from Weblate
2020-11-04 13:50:40 +00:00
Hakim Oubouali
69bdb52c02 Translated using Weblate (Central Atlas Tamazight)
Currently translated at 36.3% (12 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/tzm/
2020-11-01 16:49:53 +00:00
Joel Reis
9c94f9f1ca Translated using Weblate (Portuguese)
Currently translated at 57.5% (19 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/pt/
2020-11-01 16:49:53 +00:00
Peter C. S. Scholtens
f528301435 Translated using Weblate (Dutch)
Currently translated at 93.9% (31 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/
2020-11-01 16:49:53 +00:00
DO4TQe1jcGNLk9GvtDKqismfsIht20JBP7bps1OzQnvTDSwYSN
47c8c5507a Translated using Weblate (Dutch)
Currently translated at 93.9% (31 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/
2020-11-01 16:49:53 +00:00
Hakim Oubouali
5ae93b6916 Added translation using Weblate (Central Atlas Tamazight) 2020-10-30 20:37:53 +00:00
Weblate
90d86312e7 Merge branch 'origin/develop' into Weblate. 2020-10-30 13:09:21 +00:00
Michael Telatynski
262b856813 Merge pull request #15614 from vector-im/t3chguy/countly
Add countly experiment to develop/nightly configs
2020-10-30 13:09:13 +00:00
Michael Telatynski
a84925259f Add countly experiment to develop/nightly configs 2020-10-30 10:32:21 +00:00
Weblate
9c3325fb67 Merge branch 'origin/develop' into Weblate. 2020-10-29 03:18:34 +00:00
Travis Ralston
56761020bb Merge pull request #15592 from vector-im/travis/ui-feat/history
Add documentation for new UIFeature flag regarding room history settings
2020-10-28 21:18:25 -06:00
Weblate
6b31c14c97 Merge branch 'origin/develop' into Weblate. 2020-10-28 15:27:07 +00:00
RiotRobot
67d82f2695 Merge remote-tracking branch 'origin/develop' into develop 2020-10-28 15:26:41 +00:00
RiotRobot
35327ff6a4 Reset matrix-react-sdk back to develop branch 2020-10-28 15:24:23 +00:00
RiotRobot
a3fdb1c2a2 Reset matrix-js-sdk back to develop branch 2020-10-28 15:24:11 +00:00
Weblate
98acd1b059 Merge branch 'origin/develop' into Weblate. 2020-10-28 15:23:45 +00:00
J. Ryan Stinnett
4bff37b16c Merge pull request #15590 from vector-im/jryans/rename-docker-repo
Rename Docker repo in docs
2020-10-28 15:23:38 +00:00
RiotRobot
098d8b154b Merge branch 'master' into develop 2020-10-28 15:22:24 +00:00
RiotRobot
cc7e64375d v1.7.12 2020-10-28 15:18:19 +00:00
RiotRobot
9d6bbef04e Prepare changelog for v1.7.12 2020-10-28 15:18:19 +00:00
RiotRobot
f821b7c8bb Upgrade matrix-react-sdk to 3.7.1 2020-10-28 15:13:55 +00:00
RiotRobot
469df236d9 Upgrade matrix-js-sdk to 9.0.1 2020-10-28 15:13:31 +00:00
J. Ryan Stinnett
d64639c70a Rename Docker repo in docs
We now have a Docker repo named `element-web`, so this updates docs to match.

Fixes https://github.com/vector-im/element-web/issues/14930
2020-10-28 14:32:25 +00:00
Travis Ralston
71206e8e3d Add documentation for new UIFeature flag regarding room history settings 2020-10-27 19:23:06 -06:00
Michael Telatynski
ce44cbb2dc Merge pull request #15577 from vector-im/t3chguy/fix/jitsi-cherry-pick
[Release] Fix Jitsi regressions with custom themes
2020-10-27 12:05:09 +00:00
Michael Telatynski
be1e4552aa fix the Jitsi bg colour to not be transparent as the app colours may be anything and bleed through 2020-10-27 11:48:03 +00:00
Michael Telatynski
d297ee5c7e Fix theme variable handling with invalid values 2020-10-27 11:48:03 +00:00
Weblate
b9a7531926 Merge branch 'origin/develop' into Weblate. 2020-10-27 11:38:34 +00:00
DO4TQe1jcGNLk9GvtDKqismfsIht20JBP7bps1OzQnvTDSwYSN
5de910a9eb Translated using Weblate (Dutch)
Currently translated at 87.8% (29 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/
2020-10-27 11:38:34 +00:00
Michael Telatynski
dda3779ad8 Merge pull request #15575 from vector-im/t3chguy/fix/jitsi
Fix Jitsi regressions with custom themes
2020-10-27 11:38:26 +00:00
Michael Telatynski
0bdf979c46 fix the Jitsi bg colour to not be transparent as the app colours may be anything and bleed through 2020-10-27 11:26:41 +00:00
Michael Telatynski
7c895bd8c0 Fix theme variable handling with invalid values 2020-10-27 11:26:41 +00:00
Weblate
fe98a8b0c2 Merge branch 'origin/develop' into Weblate. 2020-10-26 17:22:32 +00:00
RiotRobot
90d5c202c6 Reset matrix-react-sdk back to develop branch 2020-10-26 17:22:22 +00:00
RiotRobot
d8a7af0e7e Reset matrix-js-sdk back to develop branch 2020-10-26 17:22:11 +00:00
Weblate
7fe1acfd91 Merge branch 'origin/develop' into Weblate. 2020-10-26 17:22:09 +00:00
John
e9b7b36c87 Translated using Weblate (Greek)
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/el/
2020-10-26 17:22:09 +00:00
RiotRobot
6cef14e6cc v1.7.11 2020-10-26 17:19:01 +00:00
RiotRobot
212e4f831f Prepare changelog for v1.7.11 2020-10-26 17:19:00 +00:00
RiotRobot
059366f07a Upgrade matrix-react-sdk to 3.7.0 2020-10-26 17:00:07 +00:00
RiotRobot
40384ffe42 Upgrade matrix-js-sdk to 9.0.0 2020-10-26 16:58:20 +00:00
MamasLT
5a9cc764c6 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/
2020-10-23 19:49:50 +00:00
RiotRobot
13330c5b8c v1.7.11-rc.1 2020-10-21 15:30:41 +01:00
RiotRobot
beb98e9ebb Prepare changelog for v1.7.11-rc.1 2020-10-21 15:30:40 +01:00
RiotRobot
9856978d0a Upgrade matrix-react-sdk to 3.7.0-rc.2 2020-10-21 15:25:48 +01:00
RiotRobot
d005d1f1c6 Upgrade matrix-react-sdk to 3.7.0-rc.1 2020-10-21 14:48:47 +01:00
RiotRobot
6f6c6d7b75 Upgrade matrix-js-sdk to 9.0.0-rc.1 2020-10-21 14:47:40 +01:00
J. Ryan Stinnett
dae2f6c442 Merge pull request #15516 from vector-im/jryans/translate-rename
Update Weblate URL
2020-10-21 13:38:38 +01:00
J. Ryan Stinnett
33c93e55c6 Merge pull request #15517 from RiotTranslateBot/weblate-element-web-element-web
Translations update from Weblate
2020-10-21 13:37:46 +01:00
J. Ryan Stinnett
4d2e4d30ca Update translation project names 2020-10-21 13:23:38 +01:00
J. Ryan Stinnett
6420120dd4 Update Weblate URL 2020-10-21 13:16:43 +01:00
Weblate
c5ba9de9c7 Merge branch 'origin/develop' into Weblate. 2020-10-21 11:41:44 +00:00
Michael Telatynski
e391eea779 Merge pull request #15499 from vector-im/t3chguy/feat/widgets
Jitsi accept theme variable and restyle
2020-10-21 12:41:36 +01:00
Weblate
66a20f5356 Merge branch 'origin/develop' into Weblate. 2020-10-20 14:11:27 +00:00
J. Ryan Stinnett
36bd39fd21 Merge pull request #15506 from vector-im/jryans/release-disable-editor
Skip editor confirmation of upgrades
2020-10-20 15:11:20 +01:00
J. Ryan Stinnett
78dd07cbfd Skip editor confirmation of upgrades
In practice, the upgrades are always fine, and this editor prompt just adds
delays.
2020-10-20 11:57:02 +01:00
Weblate
ab5c00e8c4 Merge branch 'origin/develop' into Weblate. 2020-10-20 10:47:21 +00:00
RiotRobot
a4e28cce88 Reset matrix-react-sdk back to develop branch 2020-10-20 11:46:35 +01:00
RiotRobot
68c4d005f1 Reset matrix-js-sdk back to develop branch 2020-10-20 11:46:24 +01:00
RiotRobot
588566cae7 v1.7.10 2020-10-20 11:40:08 +01:00
RiotRobot
847c15b2cd Prepare changelog for v1.7.10 2020-10-20 11:40:07 +01:00
RiotRobot
2716629642 Upgrade matrix-react-sdk to 3.6.1 2020-10-20 11:38:05 +01:00
J. Ryan Stinnett
74b0200337 Merge pull request #15497 from vector-im/jryans/events-lib-release
[Release] Adjust for new widget messaging APIs
2020-10-20 10:11:14 +01:00
Michael Telatynski
593a56e2d7 Jitsi accept theme variable and restyle
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 19:40:53 +01:00
J. Ryan Stinnett
55153ba7d2 Shake lock file 2020-10-19 17:46:36 +01:00
J. Ryan Stinnett
2d97ff4eba Upgrade widget API 2020-10-19 17:46:35 +01:00
J. Ryan Stinnett
ea4985819f Adjust for new widget messaging APIs
As part of changing to the `events` package, the API surface changed slightly.

Related to https://github.com/vector-im/element-web/issues/15493
2020-10-19 17:45:26 +01:00
Weblate
231e87aca2 Merge branch 'origin/develop' into Weblate. 2020-10-19 16:31:12 +00:00
J. Ryan Stinnett
69c7d08941 Merge pull request #15495 from vector-im/jryans/events-lib
Adjust for new widget messaging APIs
2020-10-19 17:31:04 +01:00
J. Ryan Stinnett
06aa5a9aa9 Shake lock file 2020-10-19 17:08:07 +01:00
J. Ryan Stinnett
0f76c858ac Upgrade widget API 2020-10-19 16:57:18 +01:00
J. Ryan Stinnett
dfb1579625 Adjust for new widget messaging APIs
As part of changing to the `events` package, the API surface changed slightly.

Related to https://github.com/vector-im/element-web/issues/15493
2020-10-19 16:43:55 +01:00
Slavi Pantaleev
94ffd69ce4 Translated using Weblate (Bulgarian)
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/bg/
2020-10-19 10:04:34 +00:00
Knugi
325ddbf5ca Translated using Weblate (Chinese (Traditional))
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/zh_Hant/
2020-10-19 10:04:34 +00:00
TR_SLimey
477886551d Translated using Weblate (Polish)
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/pl/
2020-10-19 10:04:34 +00:00
Weblate
19ce3c99a0 Merge branch 'origin/develop' into Weblate. 2020-10-16 19:15:22 +00:00
Travis Ralston
b8662b43d8 Merge pull request #15479 from denzs/develop
Use HTTPS_PROXY environment variable for downloading external_api.min…
2020-10-16 13:15:15 -06:00
Travis Ralston
44bf49d414 Update scripts/build-jitsi.js 2020-10-16 13:15:08 -06:00
Travis Ralston
d1a6b656bc Don't fatally end the Jitsi widget when it's not being used as a widget 2020-10-16 13:05:14 -06:00
Sebastian Denz
7f4f9b2cf1 Use HTTPS_PROXY environment variable for downloading external_api.min.js if set 2020-10-16 14:48:28 +02:00
Weblate
e71180bf11 Merge branch 'origin/develop' into Weblate. 2020-10-16 11:27:38 +00:00
J. Ryan Stinnett
acca9005a9 Merge pull request #15475 from vector-im/jryans/doc-customisations
Document customisation points
2020-10-16 12:27:30 +01:00
J. Ryan Stinnett
4053d598f8 Update README.md link 2020-10-16 11:32:57 +01:00
J. Ryan Stinnett
f37b63a6cb Fix file extension
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-10-16 11:22:28 +01:00
J. Ryan Stinnett
7793f07c81 Document customisation points
https://github.com/matrix-org/matrix-react-sdk/pull/5327 adds a concept of
"customisation points" to keep custom functionality contained. This adds some
general guidance on how to use them.
2020-10-15 18:01:38 +01:00
Weblate
8fd92b43ed Merge branch 'origin/develop' into Weblate. 2020-10-14 22:37:12 +00:00
Travis Ralston
c2a9157258 Merge pull request #15466 from vector-im/travis/jitsi-popout-fix
Don't fatally end the Jitsi widget when it's not being used as a widget
2020-10-14 16:36:59 -06:00
Travis Ralston
917a85ead9 Don't fatally end the Jitsi widget when it's not being used as a widget 2020-10-14 16:16:08 -06:00
Weblate
3daec2a422 Merge branch 'origin/develop' into Weblate. 2020-10-14 07:57:22 +00:00
TR_SLimey
427328f934 Translated using Weblate (Polish)
Currently translated at 90.9% (30 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.riot.im/projects/element-web/element-web/pl/
2020-10-14 07:57:22 +00:00
Damir Jelić
0507cd2d90 electron-platform: Use camel case for the user/device id. 2020-10-13 17:04:40 +02:00
Damir Jelić
5350c5e551 electron-platform: Pass the user/devce id pair when initializing the event index. 2020-10-13 16:36:38 +02:00
Weblate
97314f2c9e Merge branch 'origin/develop' into Weblate. 2020-10-12 13:00:06 +00:00
RiotRobot
f8e84c42ad Reset matrix-react-sdk back to develop branch 2020-10-12 13:59:58 +01:00
RiotRobot
fd2895eb40 Reset matrix-js-sdk back to develop branch 2020-10-12 13:59:47 +01:00
Weblate
dc73505c84 Merge branch 'origin/develop' into Weblate. 2020-10-12 12:59:28 +00:00
Marcelo Filho
4ee538117b Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (33 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.riot.im/projects/element-web/element-web/pt_BR/
2020-10-10 19:05:21 +00:00
Marcelo Filho
3402236a0c Translated using Weblate (Portuguese)
Currently translated at 42.4% (14 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.riot.im/projects/element-web/element-web/pt/
2020-10-10 19:05:21 +00:00
24 changed files with 243 additions and 63 deletions

View File

@@ -1,3 +1,72 @@
Changes in [1.7.13](https://github.com/vector-im/element-web/releases/tag/v1.7.13) (2020-11-09)
===============================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.13-rc.1...v1.7.13)
* Upgrade to React SDK 3.8.0 and JS SDK 9.1.0
Changes in [1.7.13-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.13-rc.1) (2020-11-04)
=========================================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.12...v1.7.13-rc.1)
* Upgrade to React SDK 3.8.0-rc.1 and JS SDK 9.1.0-rc.1
* Translations update from Weblate
[\#15644](https://github.com/vector-im/element-web/pull/15644)
* Add countly experiment to develop/nightly configs
[\#15614](https://github.com/vector-im/element-web/pull/15614)
* Add documentation for new UIFeature flag regarding room history settings
[\#15592](https://github.com/vector-im/element-web/pull/15592)
* Rename Docker repo in docs
[\#15590](https://github.com/vector-im/element-web/pull/15590)
* Fix Jitsi regressions with custom themes
[\#15575](https://github.com/vector-im/element-web/pull/15575)
Changes in [1.7.12](https://github.com/vector-im/element-web/releases/tag/v1.7.12) (2020-10-28)
===============================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.11...v1.7.12)
* Upgrade to React SDK 3.7.1 and JS SDK 9.0.1
* [Release] Fix Jitsi regressions with custom themes
[\#15577](https://github.com/vector-im/element-web/pull/15577)
Changes in [1.7.11](https://github.com/vector-im/element-web/releases/tag/v1.7.11) (2020-10-26)
===============================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.11-rc.1...v1.7.11)
* Upgrade to React SDK 3.7.0 and JS SDK 9.0.0
Changes in [1.7.11-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.11-rc.1) (2020-10-21)
=========================================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.10...v1.7.11-rc.1)
* Upgrade to React SDK 3.7.0-rc.2 and JS SDK 9.0.0-rc.1
* Update Weblate URL
[\#15516](https://github.com/vector-im/element-web/pull/15516)
* Translations update from Weblate
[\#15517](https://github.com/vector-im/element-web/pull/15517)
* Jitsi accept theme variable and restyle
[\#15499](https://github.com/vector-im/element-web/pull/15499)
* Skip editor confirmation of upgrades
[\#15506](https://github.com/vector-im/element-web/pull/15506)
* Adjust for new widget messaging APIs
[\#15495](https://github.com/vector-im/element-web/pull/15495)
* Use HTTPS_PROXY environment variable for downloading external_api.min…
[\#15479](https://github.com/vector-im/element-web/pull/15479)
* Document customisation points
[\#15475](https://github.com/vector-im/element-web/pull/15475)
* Don't fatally end the Jitsi widget when it's not being used as a widget
[\#15466](https://github.com/vector-im/element-web/pull/15466)
* electron-platform: Pass the user/devce id pair when initializing the event
index.
[\#15455](https://github.com/vector-im/element-web/pull/15455)
Changes in [1.7.10](https://github.com/vector-im/element-web/releases/tag/v1.7.10) (2020-10-20)
===============================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.9...v1.7.10)
* [Release] Adjust for new widget messaging APIs
[\#15497](https://github.com/vector-im/element-web/pull/15497)
* Upgrade to React SDK 3.6.1
Changes in [1.7.9](https://github.com/vector-im/element-web/releases/tag/v1.7.9) (2020-10-12)
=============================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.9-rc.1...v1.7.9)

View File

@@ -2,7 +2,7 @@
FROM node:12 as builder
# Support custom branches of the react-sdk and js-sdk. This also helps us build
# images of riot-web develop.
# images of element-web develop.
ARG USE_CUSTOM_SDKS=false
ARG REACT_SDK_REPO="https://github.com/matrix-org/matrix-react-sdk.git"
ARG REACT_SDK_BRANCH="master"

View File

@@ -129,14 +129,14 @@ Running from Docker
The Docker image can be used to serve element-web as a web server. The easiest way to use
it is to use the prebuilt image:
```bash
docker run -p 80:80 vectorim/riot-web
docker run -p 80:80 vectorim/element-web
```
To supply your own custom `config.json`, map a volume to `/app/config.json`. For example,
if your custom config was located at `/etc/element-web/config.json` then your Docker command
would be:
```bash
docker run -p 80:80 -v /etc/element-web/config.json:/app/config.json vectorim/riot-web
docker run -p 80:80 -v /etc/element-web/config.json:/app/config.json vectorim/element-web
```
To build the image yourself:
@@ -333,7 +333,7 @@ To add a new translation, head to the [translating doc](docs/translating.md).
For a developer guide, see the [translating dev doc](docs/translating-dev.md).
[<img src="https://translate.riot.im/widgets/element-web/-/multi-auto.svg" alt="translationsstatus" width="340">](https://translate.riot.im/engage/element-web/?utm_source=widget)
[<img src="https://translate.element.io/widgets/element-web/-/multi-auto.svg" alt="translationsstatus" width="340">](https://translate.element.io/engage/element-web/?utm_source=widget)
Triaging issues
===============

View File

@@ -192,3 +192,5 @@ Currently, the following UI feature flags are supported:
useful if accounts are managed externally.
* `UIFeature.advancedEncryption` - Whether or not advanced encryption options are shown to the
user.
* `UIFeature.roomHistorySettings` - Whether or not the room history settings are shown to the user.
This should only be used if the room history visibility options are managed by the server.

34
docs/customisations.md Normal file
View File

@@ -0,0 +1,34 @@
# Customisations
Element Web and the React SDK support "customisation points" that can be used to
easily add custom logic specific to a particular deployment of Element Web.
An example of this is the [security customisations
module](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/customisations/Security.ts).
This module in the React SDK only defines some empty functions and their types:
it does not do anything by default.
To make use of these customisation points, you will first need to fork Element
Web so that you can add your own code. Even though the default module is part of
the React SDK, you can still override it from the Element Web layer:
1. Copy the default customisation module to
`element-web/src/customisations/YourNameSecurity.ts`
2. Edit customisations points and make sure export the ones you actually want to
activate
3. Tweak the Element build process to use the customised module instead of the
default by adding this to end of the `plugins` array in `webpack.config.js`:
```js
new webpack.NormalModuleReplacementPlugin(
/src\/customisations\/Security.ts/,
path.resolve(__dirname, 'src/customisations/YourNameSecurity.ts'),
),
```
If we add more customisation modules in the future, we'll likely improve these
steps to remove the need for build changes like the above.
By isolating customisations to their own module, this approach should remove the
chance of merge conflicts when updating your fork, and thus simplify ongoing
maintenance.

View File

@@ -6,27 +6,27 @@
- Be able to understand English
- Be able to understand the language you want to translate Element into
## Step 0: Join #riotweb-translations:matrix.org
## Step 0: Join #element-translations:matrix.org
1. Come and join https://matrix.to/#/#riotweb-translations:matrix.org
1. Come and join https://matrix.to/#/#element-translations:matrix.org
2. Read scrollback and/or ask if anyone else is working on your language, and co-ordinate if needed. In general little-or-no coordination is needed though :)
## Step 1: Preparing your Weblate Profile
1. Head to https://translate.riot.im and register either via Github or email
1. Head to https://translate.element.io and register either via Github or email
2. After registering check if you got an email to verify your account and click the link (if there is none head to step 1.4)
3. Log into weblate
4. Head to https://translate.riot.im/accounts/profile/ and select the languages you know and maybe another language you know too.
6. Head to https://translate.riot.im/accounts/profile/#subscriptions and select Element Web as Project
4. Head to https://translate.element.io/accounts/profile/ and select the languages you know and maybe another language you know too.
6. Head to https://translate.element.io/accounts/profile/#subscriptions and select Element Web as Project
## How to check if your language already is being translated
Go to https://translate.riot.im/projects/riot-web/ and visit the 2 sub-projects.
Go to https://translate.element.io/projects/element-web/ and visit the 2 sub-projects.
If your language is listed go to Step 2a and if not go to Step 2b
## Step 2a: Helping on existing languages.
1. Head to one of the projects listed https://translate.riot.im/projects/riot-web/
1. Head to one of the projects listed https://translate.element.io/projects/element-web/
2. Click on the ``translate`` button on the right side of your language
3. Fill in the translations in the writeable field. You will see the original English string and the string of your second language above.
@@ -34,7 +34,7 @@ Head to the explanations under Steb 2b
## Step 2b: Adding a new language
1. Go to one of the projects listed https://translate.riot.im/projects/riot-web/
1. Go to one of the projects listed https://translate.element.io/projects/element-web/
2. Click the ``Start new translation`` button at the bottom
3. Select a language
4. Start translating like in 2a.3

View File

@@ -18,6 +18,10 @@
"siteId": 1,
"policyUrl": "https://element.io/cookie-policy"
},
"countly": {
"url": "https://try.count.ly",
"appKey": "8abf1ee15646bc884556b82e5053857904264b66"
},
"roomDirectory": {
"servers": [
"matrix.org"

View File

@@ -1,7 +1,7 @@
{
"name": "riot-web",
"productName": "Riot",
"version": "1.7.9",
"version": "1.7.13",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@@ -60,9 +60,9 @@
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
"jsrsasign": "^9.1.5",
"matrix-js-sdk": "8.5.0",
"matrix-react-sdk": "3.6.0",
"matrix-widget-api": "^0.1.0-beta.2",
"matrix-js-sdk": "9.1.0",
"matrix-react-sdk": "3.8.0",
"matrix-widget-api": "^0.1.0-beta.5",
"olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
"prop-types": "^15.7.2",
"react": "^16.9.0",
@@ -139,6 +139,7 @@
"postcss-strip-inline-comments": "^0.1.5",
"rimraf": "^2.4.3",
"shell-escape": "^0.2.0",
"simple-proxy-agent": "^1.1.0",
"stylelint": "^12.0.1",
"terser-webpack-plugin": "^2.3.0",
"typescript": "^3.7.3",

View File

@@ -38,9 +38,7 @@ do
echo "Upgrading $i to $latestver..."
yarn add -E $i@$latestver
git add -u
# The `-e` flag opens the editor and gives you a chance to check
# the upgrade for correctness.
git commit -m "Upgrade $i to $latestver" -e
git commit -m "Upgrade $i to $latestver"
fi
fi
done

View File

@@ -7,6 +7,7 @@ const fs = require("fs");
const path = require("path");
const mkdirp = require("mkdirp");
const fetch = require("node-fetch");
const ProxyAgent = require("simple-proxy-agent");
console.log("Making webapp directory");
mkdirp.sync("webapp");
@@ -14,7 +15,13 @@ mkdirp.sync("webapp");
// curl -s https://jitsi.riot.im/libs/external_api.min.js > ./webapp/jitsi_external_api.min.js
console.log("Downloading Jitsi script");
const fname = path.join("webapp", "jitsi_external_api.min.js");
fetch("https://jitsi.riot.im/libs/external_api.min.js").then(res => {
const options = {};
if (process.env.HTTPS_PROXY) {
options.agent = new ProxyAgent(process.env.HTTPS_PROXY, {tunnel: true});
}
fetch("https://jitsi.riot.im/libs/external_api.min.js", options).then(res => {
const stream = fs.createWriteStream(fname);
return new Promise((resolve, reject) => {
res.body.pipe(stream);

View File

@@ -0,0 +1 @@
../../docs/customisations.md

View File

@@ -31,5 +31,6 @@
"Download Completed": "Свалянето завърши",
"Open": "Отвори",
"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 използва модерни функции на браузъра, които не се поддържат от Вашия.",
"Powered by Matrix": "Базирано на Matrix"
}

View File

@@ -29,5 +29,8 @@
"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": "Αποτυχία έναρξης"
"Failed to start": "Αποτυχία έναρξης",
"%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
"%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
"Missing indexeddb worker script!": "Απουσία indexeddb worker script!"
}

View File

@@ -31,5 +31,6 @@
"Open": "Atidaryti",
"Your browser can't run %(brand)s": "Jūsų naršyklė negali paleisti %(brand)s",
"%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s naudoja išplėstines naršyklės funkcijas, kurių jūsų dabartinė naršyklė nepalaiko.",
"Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Geriausiam veikimui suinstaliuokite <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, arba <safariLink>Safari</safariLink>."
"Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Geriausiam veikimui suinstaliuokite <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, arba <safariLink>Safari</safariLink>.",
"Powered by Matrix": "Veikia su Matrix"
}

View File

@@ -7,7 +7,7 @@
"Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Gedecentraliseerd en versleuteld chatten &amp; samenwerken dankzij [matrix]",
"Sign In": "Aanmelden",
"Create Account": "Account aanmaken",
"Explore rooms": "Gesprekken ontdekken",
"Explore rooms": "Kamers verkennen",
"Unexpected error preparing the app. See console for details.": "Er is een onverwachte fout opgetreden bij het voorbereiden van de app. Zie de console voor details.",
"Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuratiefout: kan slechts één van default_server_config, default_server_name, of default_hs_url opgeven.",
"Invalid configuration: no default server specified.": "Configuratie ongeldig: geen standaardserver opgegeven.",
@@ -22,8 +22,13 @@
"%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
"Unsupported browser": "Niet-ondersteunde browser",
"Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installeer <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, of <safariLink>Safari</safariLink> voor de beste gebruikservaring.",
"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 kunt uw huidige browser blijven gebruiken, maar sommige of alle features zouden niet kunnen werken en de uitstraling van het programma kan verkeerd zijn.",
"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 kunt uw huidige browser blijven gebruiken, maar sommige of alle functies zouden niet kunnen werken en de uitstraling van het programma kan verkeerd zijn.",
"I understand the risks and wish to continue": "Ik begrijp de risico's en wil verder gaan",
"Go to element.io": "Ga naar element.io",
"Failed to start": "Opstarten gefaald"
"Failed to start": "Opstarten mislukt",
"Open": "Open",
"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."
}

View File

@@ -25,5 +25,11 @@
"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.": "Możesz kontynuować używanie obecnej przeglądarki, lecz niektóre lub wszystkie funkcje mogą nie działać oraz wygląd aplikacji może być niepoprawny.",
"I understand the risks and wish to continue": "Rozumiem ryzyko i chcę kontynuować",
"Go to element.io": "Przejdź do element.io",
"Failed to start": "Nie udało się wystartować"
"Failed to start": "Nie udało się wystartować",
"Download Completed": "Pobieranie Zakończone",
"Open": "Otwórz",
"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"
}

View File

@@ -3,7 +3,7 @@
"powered by Matrix": "powered by Matrix",
"Unknown device": "Dispositivo desconhecido",
"You need to be using HTTPS to place a screen-sharing call.": "Necessita de estar a usar HTTPS para poder iniciar uma chamada com partilha de ecrã.",
"Welcome to Element": "Bem-vindo ao Element",
"Welcome to Element": "Boas-vindas ao Element",
"Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat descentralizado, encriptado &amp; colaborativo powered by [matrix]",
"The message from the parser is: %(message)s": "A mensagem do parser é: %(message)s",
"Invalid JSON": "JSON inválido",
@@ -13,5 +13,10 @@
"Sign In": "Iniciar sessão",
"Create Account": "Criar conta",
"Explore rooms": "Explorar rooms",
"Go to your browser to complete Sign In": "Abra o seu navegador para completar o inicio de sessão"
"Go to your browser to complete Sign In": "Abra o seu navegador para completar o inicio de sessão",
"Open": "Abrir",
"Download Completed": "Transferência concluída",
"Unable to load config file: please refresh the page to try again.": "Não foi possível carregar o ficheiro de configuração: atualize a página para tentar novamente.",
"Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "A configuração do Element contém um JSON inválido. Corrija o problema e recarregue a página.",
"Your Element is misconfigured": "O Element está configurado incorretamente"
}

View File

@@ -3,7 +3,7 @@
"powered by Matrix": "oferecido por Matrix",
"Unknown device": "Aparelho desconhecido",
"You need to be using HTTPS to place a screen-sharing call.": "Você precisa usar HTTPS para compartilhar a tela durante uma chamada.",
"Welcome to Element": "Seja bem-vinda(o) a Element",
"Welcome to Element": "Boas-vindas ao Element",
"Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo construído com [matrix]",
"Sign In": "Entrar",
"Create Account": "Criar Conta",

14
src/i18n/strings/tzm.json Normal file
View File

@@ -0,0 +1,14 @@
{
"Create Account": "Ssenflul amiḍan",
"Download Completed": "Ittusmed wagam",
"Powered by Matrix": "Ittusker s Matrix",
"Sign In": "Kcem",
"Go to your browser to complete Sign In": "Ddu ɣer umessara fad ad tsemded azemmem",
"Welcome to Element": "Azul g Element",
"Go to element.io": "Ddu ɣer element.io",
"%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
"Unknown device": "Allal arussin",
"Open user settings": "Ṛẓem tisɣal n unessemres",
"Dismiss": "Nexxel",
"Open": "Ṛẓem"
}

View File

@@ -32,5 +32,5 @@
"Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Element 的配置中包含無效JSON請更正錯誤並重新加載網頁。",
"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使用的高級特性。",
"Powered by Matrix": "威力本源 Matrix"
"Powered by Matrix": " Matrix 提供"
}

View File

@@ -23,11 +23,19 @@ limitations under the License.
src: url('~matrix-react-sdk/res/fonts/Nunito/Nunito-Regular.ttf') format('truetype');
}
$fg-color: #edf3ff;
$dark-fg: #edf3ff;
$dark-bg: #363c43;
$light-fg: #2e2f32;
$light-bg: #fff;
body {
font-family: Nunito, Arial, Helvetica, sans-serif;
background-color: #181b21;
color: $fg-color;
background-color: $dark-bg;
color: $dark-fg;
}
body.theme-light {
background-color: $light-bg;
color: $light-fg;
}
body, html {
@@ -82,7 +90,7 @@ body, html {
&::before {
content: '';
background-size: contain;
background-color: $fg-color;
background-color: $dark-fg;
mask-repeat: no-repeat;
mask-position: center;
mask-image: url("~matrix-react-sdk/res/img/element-icons/call/video-call.svg");
@@ -93,3 +101,7 @@ body, html {
margin: 0 auto; // center
}
}
body.theme-light .icon::before {
background-color: $light-fg;
}

View File

@@ -67,6 +67,11 @@ let meetApi: any; // JitsiMeetExternalAPI
// out into a browser.
const parentUrl = qsParam('parentUrl', true);
const widgetId = qsParam('widgetId', true);
const theme = qsParam('theme', true);
if (theme) {
document.body.classList.add(`theme-${theme.replace(" ", "_")}`);
}
// Set this up as early as possible because Element will be hitting it almost immediately.
let readyPromise: Promise<[void, void]>;
@@ -76,7 +81,7 @@ let meetApi: any; // JitsiMeetExternalAPI
widgetApi.requestCapabilities(VideoConferenceCapabilities);
readyPromise = Promise.all([
new Promise<void>(resolve => {
widgetApi.once<CustomEvent<IWidgetApiRequest>>(`action:${ElementWidgetActions.ClientReady}`, ev => {
widgetApi.once(`action:${ElementWidgetActions.ClientReady}`, ev => {
ev.preventDefault();
widgetApi.transport.reply(ev.detail, {});
resolve();
@@ -88,7 +93,7 @@ let meetApi: any; // JitsiMeetExternalAPI
]);
widgetApi.start();
} else {
throw new Error("No parent URL or no widget ID");
console.warn("No parent URL or no widget ID - assuming no widget API is available");
}
// Populate the Jitsi params now
@@ -113,7 +118,7 @@ let meetApi: any; // JitsiMeetExternalAPI
// TODO: register widgetApi listeners for PTT controls (https://github.com/vector-im/riot-web/issues/12795)
widgetApi.addEventListener(`action:${ElementWidgetActions.HangupCall}`,
widgetApi.on(`action:${ElementWidgetActions.HangupCall}`,
(ev: CustomEvent<IWidgetApiRequest>) => {
if (meetApi) meetApi.executeCommand('hangup');
widgetApi.transport.reply(ev.detail, {}); // ack

View File

@@ -140,8 +140,8 @@ class SeshatIndexManager extends BaseEventIndexManager {
return this._ipcCall('supportsEventIndexing');
}
async initEventIndex(): Promise<void> {
return this._ipcCall('initEventIndex');
async initEventIndex(userId: string, deviceId: string): Promise<void> {
return this._ipcCall('initEventIndex', userId, deviceId);
}
async addEventToIndex(ev: MatrixEvent, profile: MatrixProfile): Promise<void> {

View File

@@ -4778,10 +4778,10 @@ eventemitter3@^4.0.0:
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384"
integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==
events@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"
integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==
events@^3.0.0, events@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
eventsource@^1.0.7:
version "1.0.7"
@@ -7898,10 +7898,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@8.5.0:
version "8.5.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.5.0.tgz#02d77e0e95fe32dcc74e0a94707f9103badfdca5"
integrity sha512-RJCqK/QkesL+63rX4C4mShEFw/ZR20D1UMw1RKY8pQhv1/7Skz+v5BTv/UCqG45E3rRYMarNOwy13CZ+yq33FA==
matrix-js-sdk@9.1.0:
version "9.1.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.1.0.tgz#51a3240f6545c0ae42ca0db0c579d17476b0ca94"
integrity sha512-4swrPb93qF2lid9mqzCDPMIvUlgS/MIUVxxD0EfNQoapdekFtnf7pMimYs+lMpRk3VDfa01FEsUu1k0q8O+Utw==
dependencies:
"@babel/runtime" "^7.11.2"
another-json "^0.2.0"
@@ -7921,10 +7921,10 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"
matrix-react-sdk@3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.6.0.tgz#fbac180f8a8681bd7ca80de915dc25bf225fdac8"
integrity sha512-14/Qo6zS6daPtNNVVhL2Uk6Z/k/KWGw4fsE3U4aVA1dupyOaPnEvPAjkvuRh3kzRI8b5sjXJvQCL/tuoxeInLg==
matrix-react-sdk@3.8.0:
version "3.8.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.8.0.tgz#9ce1e80e6b7d6926c92215632f7ec1ed32a44cc7"
integrity sha512-8tPKs30LqXHLj0iKQvkO9P7Fwk9ux1UmdbvB775iH+auxTgyG721EMlXn3tgBpk/rmIikfhPEMCEM0m6nUPn4g==
dependencies:
"@babel/runtime" "^7.10.5"
await-lock "^2.0.1"
@@ -7951,8 +7951,8 @@ matrix-react-sdk@3.6.0:
is-ip "^2.0.0"
linkifyjs "^2.1.9"
lodash "^4.17.19"
matrix-js-sdk "8.5.0"
matrix-widget-api "^0.1.0-beta.3"
matrix-js-sdk "9.1.0"
matrix-widget-api "^0.1.0-beta.5"
minimist "^1.2.5"
pako "^1.0.11"
parse5 "^5.1.1"
@@ -7982,15 +7982,12 @@ matrix-react-test-utils@^0.2.2:
resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.2.2.tgz#c87144d3b910c7edc544a6699d13c7c2bf02f853"
integrity sha512-49+7gfV6smvBIVbeloql+37IeWMTD+fiywalwCqk8Dnz53zAFjKSltB3rmWHso1uecLtQEcPtCijfhzcLXAxTQ==
matrix-widget-api@^0.1.0-beta.2:
version "0.1.0-beta.2"
resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.2.tgz#367da1ccd26b711f73fc5b6e02edf55ac2ea2692"
integrity sha512-q5g5RZN+RRjM4HmcJ+LYoQAYrB1wzyERmoQ+LvKbTV/+9Ov36Kp0QEP8CleSXEd5WLp6bkRlt60axDaY6pWGmg==
matrix-widget-api@^0.1.0-beta.3:
version "0.1.0-beta.3"
resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.3.tgz#356965ca357172ee056e3fd86fd96879b059a114"
integrity sha512-j7nxdhLQfdU6snsdBA29KQR0DmT8/vl6otOvGqPCV0OCHpq1312cP79Eg4JzJKIFI3A76Qha3nYx6G9/aapwXg==
matrix-widget-api@^0.1.0-beta.5:
version "0.1.0-beta.5"
resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.5.tgz#dd7f24a177aa590d812bd4e92e2c3ac225c5557e"
integrity sha512-J3GBJtVMFuEM/EWFylc0IlkPjdgmWxrkGYPaZ0LSmxp+OlNJxYfnWPR6F6HveW+Z8C1i0vq+BTueofSqKv2zDg==
dependencies:
events "^3.2.0"
md5.js@^1.3.4:
version "1.3.5"
@@ -11288,6 +11285,13 @@ simple-get@^3.0.3:
once "^1.3.1"
simple-concat "^1.0.0"
simple-proxy-agent@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/simple-proxy-agent/-/simple-proxy-agent-1.1.0.tgz#974cd1130dd32554775e2d4caeb70d701f7ca8b3"
integrity sha512-amJaLagzNELaNNB2UXdXiORVbbU/RC4yRwtGvF4cttJheTm4JvL2fZ1SfuLU952XC7TLamYdgzzJtWUbGM6Jcw==
dependencies:
socks "^2.3.2"
simple-swizzle@^0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
@@ -11388,6 +11392,14 @@ socks-proxy-agent@^4.0.0:
agent-base "~4.2.1"
socks "~2.3.2"
socks@^2.3.2:
version "2.4.4"
resolved "https://registry.yarnpkg.com/socks/-/socks-2.4.4.tgz#f1a3382e7814ae28c97bb82a38bc1ac24b21cca2"
integrity sha512-7LmHN4IHj1Vpd/k8D872VGCHJ6yIVyeFkfIBExRmGPYQ/kdUkpdg9eKh9oOzYYYKQhuxavayJHTnmBG+EzluUA==
dependencies:
ip "^1.1.5"
smart-buffer "^4.1.0"
socks@~2.3.2:
version "2.3.3"
resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3"