mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-28 13:38:29 +03:00
Code Issues Projects Releases Packages Wiki Activity
28186 commits 209 branches 547 tags 615 MiB
Commit graph

28186 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
87b72de25f
Merge pull request #5176 from matrix-org/t3chguy/dpsah/6785.4 
Fix WatchManager for global room watchers and tidy widget code a little
 2020-09-08 15:24:10 +01:00
Weblate
042bff9d08 Merge branch 'origin/develop' into Weblate. 2020-09-08 14:23:42 +00:00
Michael Telatynski
a80bcaa292
Merge pull request #5174 from matrix-org/t3chguy/fix/15100 
Fix permalink local linkification to not strip via servers
 2020-09-08 15:23:38 +01:00
Weblate
9c9d375d31 Merge branch 'origin/develop' into Weblate. 2020-09-08 14:16:55 +00:00
Jason Robinson
75518254fb
Merge pull request #5173 from matrix-org/jaywink/jitsi-openidjwt-auth 
Support creation of Jitsi widgets with "openidtoken-jwt" auth
 2020-09-08 17:16:50 +03:00
Michael Telatynski
1b99c11b11 tidy 2020-09-08 15:09:45 +01:00
Michael Telatynski
5c3c8cfb06 Make Travis an ounce happier 2020-09-08 15:07:16 +01:00
Weblate
66b42c6860 Merge branch 'origin/develop' into Weblate. 2020-09-08 14:03:10 +00:00
Michael Telatynski
73b8493fe8
Merge pull request #5177 from matrix-org/t3chguy/fix/15115 
Fix create-react-class regression.
 2020-09-08 15:03:03 +01:00
Weblate
63abeefc54 Merge branch 'origin/develop' into Weblate. 2020-09-08 13:20:42 +00:00
LinAGKar
abaf470261 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2356 of 2356 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
 2020-09-08 13:20:41 +00:00
Travis Ralston
5c878ddfdd
Merge pull request #5172 from matrix-org/travis/widgets/msc1960-1 
Update openid_credentials Widget API action for MSC1960 updates
 2020-09-08 07:20:35 -06:00
Michael Telatynski
99cd2dceec Fix create-react-class regression. 
Can't call setState in c'tor
 2020-09-08 12:07:24 +01:00
Michael Telatynski
48d9c94c88 Extract editWidget into WidgetUtils 2020-09-08 11:12:14 +01:00
Michael Telatynski
b75e2aa299 WidgetEchoStore improve update event to include roomId and widgetId 2020-09-08 11:01:55 +01:00
Michael Telatynski
07f7ff6831 Fix WatchManager global room watchers 2020-09-08 11:01:36 +01:00
Jason Robinson
3af0d33e3b Make a few fields readonly 
As they're only set in the constructor.
 2020-09-08 13:00:00 +03:00
Jason Robinson
c19336591e Add OpenID token request flow to WidgetApi 
As per MSC1960.
 2020-09-08 12:59:05 +03:00
Michael Telatynski
d0c716d61c Fix permalink local linkification to not strip via servers 2020-09-08 10:26:37 +01:00
Weblate
9d51ad7472 Merge branch 'origin/develop' into Weblate. 2020-09-08 08:47:19 +00:00
LinAGKar
8e76031871 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2356 of 2356 strings)

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

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
 2020-09-08 08:47:19 +00:00
@a2sc:matrix.org
72901ad88c Translated using Weblate (German) 
Currently translated at 100.0% (2356 of 2356 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
 2020-09-08 08:47:18 +00:00
Priit Jõerüüt
b2292241f1 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2356 of 2356 strings)

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

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-09-08 08:47:18 +00:00
Michael Telatynski
ddba5c6223
Merge pull request #5138 from matrix-org/t3chguy/dpsah/6785 
Allow persistent resizing of the widget app drawer
 2020-09-08 09:47:11 +01:00
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
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
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