Commit graph

28270 commits

Author SHA1 Message Date
Jason Robinson
4b43e39d2a Code review related changes
* drop room ID from jitsi widget data
* reame queryParts variable
2020-09-08 11:31:40 +03:00
Jason Robinson
d2e9ea58fd Add links to prosody openidtoken-jwt auth docs 2020-09-07 19:22:40 +03:00
Michael Telatynski
667c129ebc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785
 Conflicts:
	src/components/structures/ScrollPanel.js
	src/components/views/rooms/AppsDrawer.js
2020-09-07 14:33:57 +01:00
Weblate
20c12c99b5 Merge branch 'origin/develop' into Weblate. 2020-09-07 13:28:47 +00:00
Johnny998
a7d4128154 Translated using Weblate (Slovak)
Currently translated at 69.8% (1644 of 2355 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sk/
2020-09-07 13:28:47 +00:00
@a2sc:matrix.org
4491d5c478 Translated using Weblate (German)
Currently translated at 100.0% (2355 of 2355 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-07 13:28:46 +00:00
Michael Telatynski
80b22d1f82
Merge pull request #5158 from dkanada/patch-1
add lenny face command
2020-09-07 14:28:40 +01:00
Jason Robinson
ae83222d52 Add GetOpenIDCredentials constant to WidgetApi 2020-09-07 14:32:00 +03:00
LinAGKar
40032deb37 Translated using Weblate (Swedish)
Currently translated at 100.0% (2355 of 2355 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
2020-09-06 17:42:55 +00:00
Nikita Epifanov
865280cc35 Translated using Weblate (Russian)
Currently translated at 100.0% (2355 of 2355 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
2020-09-06 17:42:48 +00:00
XoseM
ea241bbb5e Translated using Weblate (Galician)
Currently translated at 100.0% (2355 of 2355 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/gl/
2020-09-06 17:42:48 +00:00
Priit Jõerüüt
54e08fd020 Translated using Weblate (Estonian)
Currently translated at 100.0% (2355 of 2355 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
2020-09-06 17:42:47 +00:00
Jeff Huang
c5927af11f Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2355 of 2355 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
2020-09-06 17:42:47 +00:00
Travis Ralston
db1eb89552 MSC numbers are hard to remember 2020-09-05 15:10:28 -06:00
Travis Ralston
355d8f5843 Update openid_credentials Widget API action for MSC1960 updates
We now need to send a `state` and `original_request_id` per MSC1960's recent adjustments
2020-09-05 15:06:31 -06:00
Nigel Mansell
590e2b70f9 Merge remote-tracking branch 'upstream/develop' into develop 2020-09-05 16:51:13 -04:00
Robert Swain
d25cb36bab Translated using Weblate (Swedish)
Currently translated at 94.2% (2218 of 2355 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
2020-09-05 12:00:10 +00:00
LinAGKar
b7ef80cd50 Translated using Weblate (Swedish)
Currently translated at 94.2% (2218 of 2355 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
2020-09-05 12:00:10 +00:00
J. Ryan Stinnett
217f145910 Switch to imports in backup panel 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
b484bc5e09 Rearrange backup status to always have advanced 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
cc2c179a0f Set default text colour for Settings tabs 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
19e9e0137c Reorganise backup panel so feature description is always present
This ensure the feature description is always shown at the top.
2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
e3f47525e5 Rename backup CSS classes 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
46bc6b1d14 Rename key backup to secure backup 2020-09-04 13:56:28 +01:00
Weblate
12c42ef3c2 Merge branch 'origin/develop' into Weblate. 2020-09-04 11:51:31 +00:00
J. Ryan Stinnett
7b1031d6a6
Merge pull request #5169 from matrix-org/jryans/defer-cross-signing-setup
Prep work for Settings changes with cross-signing deferral
2020-09-04 12:51:25 +01:00
Weblate
bbba4c71ff Merge branch 'origin/develop' into Weblate. 2020-09-04 11:25:52 +00:00
Michael Telatynski
a713c9763b
Merge pull request #5168 from matrix-org/t3chguy/dpsah/6785.2
Small code clean ups and tweaks
2020-09-04 12:25:46 +01:00
Michael Telatynski
f28c396b1e Fix HeaderButtons handler bindings 2020-09-04 12:14:43 +01:00
Jason Robinson
13dbfa6b85 Remove debug statement 2020-09-04 12:44:43 +03:00
Jason Robinson
baa6d8a294 Correctly template in Jitsi widget auth if such exists
Also add roomId to the widget data and URL template. It's needed by
the Element Web Jitsi code to produce auth for the Jitsi backend.
2020-09-04 12:42:46 +03:00
Weblate
e803788956 Merge branch 'origin/develop' into Weblate. 2020-09-04 08:46:08 +00:00
LinAGKar
9ff8c172ef Translated using Weblate (Swedish)
Currently translated at 93.0% (2189 of 2354 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
2020-09-04 08:46:08 +00:00
Nikita Epifanov
7c65c59238 Translated using Weblate (Russian)
Currently translated at 100.0% (2354 of 2354 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
2020-09-04 08:46:07 +00:00
Michael Telatynski
4b748b41ca
Merge pull request #5170 from matrix-org/t3chguy/fix/15091
Fix soft crash from TruncatedList in the createReactClass conversion
2020-09-04 09:46:00 +01:00
Michael Telatynski
6d811734f4 Fix soft crash from TruncatedList in the createReactClass conversion 2020-09-04 09:24:12 +01:00
Jason Robinson
a511ad6633 Add (potential) Jitsi auth type to widget data
So we don't have to fetch the auth type when joining
the conference.
2020-09-04 10:20:58 +03:00
Jason Robinson
680de2af95 Create Jitsi "openidtoken-jwt" auth compatible conference ID's
If the Jitsi server we're using for a Jitsi conference call has auth of
"openidtoken-jwt" then instead of a random human readable room ID, encode
the room ID in base32 (without padding). This can then be decoded back to
the room ID on the Jitsi end of things.
2020-09-04 10:05:47 +03:00
Jason Robinson
db2e1a9cd0 Add rfc4648 (base64/32/16) encoder to dependencies 2020-09-04 10:04:18 +03:00
Jason Robinson
5d8a082eb1 Add Jitsi auth check
Checks for auth needed by looking up a well-known file from the preferred Jitsi domain. No file existing will assume no auth.
2020-09-04 10:03:30 +03:00
Weblate
39652b0916 Merge branch 'origin/develop' into Weblate. 2020-09-03 16:22:03 +00:00
LinAGKar
9b937ecf23 Translated using Weblate (Swedish)
Currently translated at 92.7% (2182 of 2354 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
2020-09-03 16:22:03 +00:00
Michael Telatynski
e624ce11b4
Merge pull request #5157 from matrix-org/t3chguy/crc1
Remove create-react-class
2020-09-03 17:21:58 +01:00
Michael Telatynski
05c3f5c381 remove redundant key 2020-09-03 17:05:33 +01:00
J. Ryan Stinnett
4ef3ef40db Change to import 2020-09-03 16:47:56 +01:00
Michael Telatynski
bdfb77077a Fix RightPanel propTypes 2020-09-03 16:08:10 +01:00
Michael Telatynski
368571bcff Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.2 2020-09-03 16:07:37 +01:00
Weblate
85674f5c31 Merge branch 'origin/develop' into Weblate. 2020-09-03 14:54:53 +00:00
LinAGKar
cbbaae48fc Translated using Weblate (Swedish)
Currently translated at 92.4% (2176 of 2354 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
2020-09-03 14:54:53 +00:00
Szimszon
6dafbea5ca Translated using Weblate (Hungarian)
Currently translated at 100.0% (2354 of 2354 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/hu/
2020-09-03 14:54:50 +00:00