Commit Graph

10644 Commits

Author SHA1 Message Date
Michael Telatynski
d47948fb7b Improve SSO auth flow
Use replaceState instead of a redirect to strip the loginToken
Put user into the same post-auth flows of E2ESetup
Skip UIA prompt in this post-auth flow, happy path is a server grace period
2021-01-27 12:50:14 +00:00
Weblate
a47be2236b Merge branch 'origin/develop' into Weblate. 2021-01-26 12:29:40 +00:00
@a2sc:matrix.org
49b2f37dc8 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-26 12:29:40 +00:00
RiotRobot
089afaad93 Reset matrix-react-sdk back to develop branch 2021-01-26 12:29:29 +00:00
RiotRobot
86b0f898ec Reset matrix-js-sdk back to develop branch 2021-01-26 12:29:16 +00:00
RiotRobot
e66d500b02 Merge branch 'master' into develop 2021-01-26 12:26:47 +00:00
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
Dellle
c4c51945f0 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-26 09:44:26 +00:00
Weblate
4ab84d3b59 Merge branch 'origin/develop' into Weblate. 2021-01-25 13:14:58 +00:00
Andrejs
851d8e4265 Translated using Weblate (Latvian)
Currently translated at 84.8% (28 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/lv/
2021-01-25 13:14:58 +00:00
vachan-maker
151c365fd8 Translated using Weblate (Malayalam)
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/ml/
2021-01-25 13:14:58 +00:00
J. Ryan Stinnett
f728189445
Merge pull request #16275 from vector-im/jryans/node-14-buster
Move to newer base image for Docker builds
2021-01-25 13:14:51 +00:00
J. Ryan Stinnett
b2a93c3b64 Move to newer base image for Docker builds
This updates to Node 14 (current LTS) as well as moving from Debian Stretch to
Buster for the base OS. The Debian upgrade brings along a newer Python 3.8,
which is actively supported.
2021-01-25 12:58:39 +00:00
Weblate
adac68ed13 Merge branch 'origin/develop' into Weblate. 2021-01-22 14:12:02 +00:00
David Baker
342d0474fd
Merge pull request #16236 from vector-im/dbkr/voip_user_mapper
Docs for the VoIP translate pattern option
2021-01-22 14:11:54 +00:00
David Baker
f8b9958010 Docs for the voip translate pattern option 2021-01-21 19:23:57 +00:00
Weblate
2a0a9c5f9e Merge branch 'origin/develop' into Weblate. 2021-01-20 21:41:31 +00:00
Travis Ralston
18c5d9a3a9
Merge pull request #16227 from vector-im/travis/docs-1
Fix Riot->Element in permalinkPrefix docs
2021-01-20 14:41:25 -07:00
Travis Ralston
40f2ba8205
Fix Riot->Element in permalinkPrefix docs 2021-01-20 14:39:01 -07:00
Weblate
ec3b2c99e2 Merge branch 'origin/develop' into Weblate. 2021-01-20 18:53:16 +00:00
Travis Ralston
065fb13a56
Merge pull request #16215 from vector-im/travis/jwt-server-name
Supply server_name for optional federation-capable Jitsi auth
2021-01-20 11:53:07 -07:00
Travis Ralston
5cb323feed Supply server_name for optional federation-capable Jitsi auth
See https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification/pull/3
2021-01-19 10:23:23 -07:00
Weblate
12e2200b11 Merge branch 'origin/develop' into Weblate. 2021-01-19 15:20:44 +00:00
J. Ryan Stinnett
0aa6fbe3e2
Merge pull request #16212 from vector-im/jryans/widget-api-deathmatch
Fix Widget API version confusion
2021-01-19 15:20:38 +00:00
J. Ryan Stinnett
51361acb1a Fix Widget API version confusion 2021-01-19 15:14:04 +00:00
Weblate
c0bfc4eeb3 Merge branch 'origin/develop' into Weblate. 2021-01-19 11:25:01 +00:00
XoseM
953b4675e0 Translated using Weblate (Galician)
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/gl/
2021-01-19 11:25:01 +00:00
J. Ryan Stinnett
a72ab0da04
Merge pull request #16210 from vector-im/jryans/add-langs-2021-01
Add Hebrew language
2021-01-19 11:24:55 +00:00
J. Ryan Stinnett
cdc97a220a Add Hebrew language 2021-01-19 11:16:56 +00:00
Weblate
668abba95a Merge branch 'origin/develop' into Weblate. 2021-01-18 16:09:25 +00:00
Travis Ralston
042ce153ae
Merge pull request #16177 from vector-im/travis/widget-api-update
Update widget-api to beta 11
2021-01-18 09:09:19 -07:00
Weblate
2ff3f2d577 Merge branch 'origin/develop' into Weblate. 2021-01-18 15:25:22 +00:00
RiotRobot
c5217b6d6d Reset matrix-react-sdk back to develop branch 2021-01-18 15:25:13 +00:00
RiotRobot
fff8ac231e Reset matrix-js-sdk back to develop branch 2021-01-18 15:25:01 +00:00
Weblate
0f126d88ec Merge branch 'origin/develop' into Weblate. 2021-01-18 15:24:59 +00:00
RiotRobot
b0fc8572ad Merge branch 'master' into develop 2021-01-18 15:24:48 +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
Weblate
a9abad3cfd Merge branch 'origin/develop' into Weblate. 2021-01-18 12:10:28 +00:00
J. Ryan Stinnett
4c574d63db
Merge pull request #16192 from vector-im/jryans/docker-build-develop
Fix develop Docker builds
2021-01-18 12:10:23 +00:00
J. Ryan Stinnett
8c98921842 Fix develop Docker builds
An extra step is needed for develop Docker builds after recent build process
changes. This was regressed by
https://github.com/vector-im/element-web/pull/15999.

Fixes https://github.com/vector-im/element-web/issues/16119
2021-01-18 12:01:58 +00:00
Slobodan Simić
92e55ac1c1 Translated using Weblate (Serbian)
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/sr/
2021-01-17 21:35:45 +00:00
Travis Ralston
8bdbb5c989 Update widget-api to beta 11
Consistency with https://github.com/matrix-org/matrix-react-sdk/pull/5527
2021-01-16 23:35:15 -07:00
J. Ryan Stinnett
2040ea2b82
Merge pull request #16157 from vector-im/jryans/sw-web-only
Skip the service worker for Electron
2021-01-15 12:42:14 +00:00
J. Ryan Stinnett
0bbcda09af Move into constructor 2021-01-15 12:35:42 +00:00