Commit Graph

29221 Commits (c0ce913fe01637aa26b99e3edf7ada42deb8e9bb)

Author SHA1 Message Date
Michael Telatynski 7752f92533
Merge pull request #5336 from matrix-org/t3chguy/fix/15488
Fix excessive hosting link padding
2020-10-20 11:29:13 +01:00
Weblate ce2392750a Merge branch 'origin/develop' into Weblate. 2020-10-20 10:28:38 +00:00
Priit Jõerüüt ab6cee3fba Translated using Weblate (Estonian)
Currently translated at 100.0% (2368 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2020-10-20 10:28:38 +00:00
XoseM 6217978378 Translated using Weblate (Galician)
Currently translated at 99.9% (2367 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
2020-10-20 10:28:35 +00:00
LinAGKar d0610c3a1b Translated using Weblate (Swedish)
Currently translated at 100.0% (2368 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
2020-10-20 10:28:33 +00:00
Marcelo Filho 76951ce1be Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2368 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
2020-10-20 10:28:31 +00:00
RiotRobot bd1276c56b Reset matrix-js-sdk back to develop branch 2020-10-20 11:27:33 +01:00
RiotRobot 2d5528fccd Merge branch 'master' into develop 2020-10-20 11:26:23 +01:00
RiotRobot 3b90ed0664 v3.6.1 2020-10-20 11:23:48 +01:00
RiotRobot 10fbdef6d6 Prepare changelog for v3.6.1 2020-10-20 11:23:48 +01:00
Michael Telatynski 329ded92c1 Convert resizer to Typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-20 11:03:03 +01:00
Michael Telatynski b0acae6e77 fix remaining type mismatches
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 21:13:31 +01:00
Michael Telatynski 4dd8b8d8c6 fix WidgetUtils setRoomWidget signature
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 21:02:48 +01:00
Michael Telatynski 5ee0262da2 Post-merge tidy up
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 20:56:41 +01:00
Michael Telatynski bec1d718e0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets
 Conflicts:
	src/components/views/elements/AppTile.js
	src/utils/WidgetUtils.ts
2020-10-19 20:50:16 +01:00
Michael Telatynski 16362440b3 Iterate Modal Widgets
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 20:39:43 +01:00
Michael Telatynski 00b1a03a3e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets
 Conflicts:
	src/@types/global.d.ts
	src/FromWidgetPostMessageApi.js
	src/WidgetMessaging.js
	src/widgets/WidgetApi.ts
2020-10-19 19:46:07 +01:00
Michael Telatynski 5fcdaf66cc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 18:50:02 +01:00
Michael Telatynski 4184923e5e fix default widget icons
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 18:49:56 +01:00
Michael Telatynski 1fe2eea43f Pass theme to Jitsi
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 18:47:27 +01:00
Michael Telatynski 06009df05b Update Widget paddings and background colours
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 18:47:15 +01:00
J. Ryan Stinnett bdd6287fcc
Merge pull request #5342 from matrix-org/jryans/event-lib-release
[Release] Adjust for new widget messaging APIs
2020-10-19 17:53:29 +01:00
J. Ryan Stinnett 2219419f52 Upgrade widget API 2020-10-19 17:41:04 +01:00
J. Ryan Stinnett 11199f89f4 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:38:28 +01:00
Weblate 762044b526 Merge branch 'origin/develop' into Weblate. 2020-10-19 16:31:10 +00:00
J. Ryan Stinnett 59871263ab
Merge pull request #5341 from matrix-org/jryans/event-lib
Adjust for new widget messaging APIs
2020-10-19 17:31:00 +01:00
J. Ryan Stinnett d6a166d3bf Upgrade widget API 2020-10-19 16:56:36 +01:00
J. Ryan Stinnett 7fe98b4e9d 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:42:20 +01:00
Weblate 6b5a1088d7 Merge branch 'origin/develop' into Weblate. 2020-10-19 14:52:24 +00:00
Michael Telatynski bbb11a76bc
Merge pull request #5339 from matrix-org/t3chguy/fix/15491
Fix case where sublist context menu missed an update
2020-10-19 15:52:18 +01:00
Weblate 0533c9c22d Merge branch 'origin/develop' into Weblate. 2020-10-19 14:15:43 +00:00
Besnik Bleta 23e231eb78 Translated using Weblate (Albanian)
Currently translated at 99.7% (2363 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
2020-10-19 14:15:43 +00:00
Szimszon 19884317ba Translated using Weblate (Hungarian)
Currently translated at 100.0% (2368 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2020-10-19 14:15:40 +00:00
David Baker ce47856b72
Merge pull request #5340 from matrix-org/dbkr/voip_analytics
Add analytics to VoIP
2020-10-19 15:15:30 +01:00
David Baker 88b7210f5c consistent quotes 2020-10-19 15:04:57 +01:00
David Baker 45d639d963 Add analytics to VoIP 2020-10-19 14:56:15 +01:00
Michael Telatynski fefd374a32 Fix case where sublist context menu missed an update
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 14:34:47 +01:00
Michael Telatynski 744a4abd1c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 13:08:17 +01:00
Michael Telatynski 73489b7c6d AppsDrawer watch ResizeNotifier isResizing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 13:08:11 +01:00
Michael Telatynski 47744a4344 Hide filtering microcopy when left panel is minimized
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 12:55:01 +01:00
Michael Telatynski 35d12171b1 Remove unused prop for clarity
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 12:54:53 +01:00
Michael Telatynski 9789f8cf94 Spec compliance, /search doesn't have to return results
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 12:46:55 +01:00
Michael Telatynski 30adc98a15 Fix excessive hosting link padding
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 12:34:25 +01:00
Michael Telatynski b23fbde306
Merge pull request #5335 from matrix-org/t3chguy/cherry-pick/jitsi-openidc
[Release] Fix Jitsi OpenIDC auth
2020-10-19 11:23:01 +01:00
Weblate 65c4ab3cf8 Merge branch 'origin/develop' into Weblate. 2020-10-19 10:11:29 +00:00
random 908ac46bef Translated using Weblate (Italian)
Currently translated at 99.9% (2367 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
2020-10-19 10:11:28 +00:00
Jeff Huang 9549832585 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2368 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2020-10-19 10:11:26 +00:00
Michael Telatynski 92f89b8dca
Merge pull request #5334 from matrix-org/t3chguy/fix/jitsi-openidc
Fix Jitsi OpenIDC auth
2020-10-19 11:11:17 +01:00
Michael Telatynski 596c723dea Fix Jitsi OpenIDC auth
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 11:10:39 +01:00
Michael Telatynski 81990d36b5 Fix Jitsi OpenIDC auth
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 10:49:07 +01:00