Commit Graph

9931 Commits (b6dca76ad6d119a25e2c8dfc7347c9f99d8fda8e)

Author SHA1 Message Date
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
RiotRobot d4d1b957af v1.7.9 2020-10-12 13:56:01 +01:00
RiotRobot 04f95cc555 Prepare changelog for v1.7.9 2020-10-12 13:56:01 +01:00
RiotRobot 2d03ccfa57 Upgrade matrix-react-sdk to 3.6.0 2020-10-12 13:40:53 +01:00
RiotRobot ed86341ba5 Upgrade matrix-js-sdk to 8.5.0 2020-10-12 13:40:35 +01:00