mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 19:51:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
22632 commits 219 branches 562 tags 474 MiB
Commit graph

22632 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
a7913f4fe5
Merge pull request #4266 from matrix-org/travis/config-wrapper 
Support sending config and ready events to capable widgets (Jitsi)
 2020-03-25 08:26:01 -06:00
Zoe
b7013c6f5d
Merge pull request #4273 from matrix-org/foldleft/12704-key-requests 
If cached keys are present in the key backup dialog, use them
 2020-03-25 11:58:24 +00:00
Zoe
936a4a0022 lint 2020-03-25 11:47:07 +00:00
Zoe
8b2ae3e20f If cached keys are present in the key backup dialog, use them 2020-03-25 11:41:59 +00:00
Bruno Windels
8521ed1a45
Merge pull request #4265 from ThobyV/thobyv/hide-formatbar-onEnter-highlighted-message 
Fix formatbar not hidden on highlighted message sent
 2020-03-25 09:01:36 +00:00
thobyv-kismat
b817c06c6e fix failing linter tests 2020-03-24 19:09:50 +01:00
thobyv-kismat
91b9a04ede refactor:consider checking if no placeholder 2020-03-24 19:00:43 +01:00
Travis Ralston
7ea61e4105 Appease the linter 2020-03-24 10:05:57 -06:00
Travis Ralston
bdcb65de77 Support and send the config over to capable widgets 
For https://github.com/vector-im/riot-web/pull/12845
 2020-03-24 09:55:54 -06:00
Travis Ralston
26bda5933b
Merge pull request #4252 from matrix-org/travis/jitsi-mobile 
Support Jitsi conferences sent/received on Riot Mobile and older Riot Webs
 2020-03-24 08:56:22 -06:00
David Baker
b5ea91f44c
Merge pull request #4263 from matrix-org/dbkr/unify_cross_signing_checks 
Use unified function to check cross-signing is ready
 2020-03-24 13:34:27 +00:00
David Baker
8f0e5f76af Merge remote-tracking branch 'origin/develop' into dbkr/unify_cross_signing_checks 2020-03-24 13:27:12 +00:00
David Baker
0fce57f891 Probably OK for debugging info to access private stuff 2020-03-24 13:13:28 +00:00
David Baker
96ec18a662
Merge pull request #4242 from matrix-org/dbkr/symmetric-ssss-migrate 
Migration to symmetric SSSS
 2020-03-24 13:12:24 +00:00
David Baker
5e1a46c656 Update for new name 2020-03-24 13:03:07 +00:00
thobyv-kismat
d7953dfa6d fix formatbar not hidden on highlighted message sent 2020-03-24 13:09:06 +01:00
David Baker
d6d15bc5c7 Add secret storage outdated section to advanced 2020-03-24 11:17:33 +00:00
David Baker
99f12a695d
Merge pull request #4262 from matrix-org/dbkr/priority_toasts 
Always display verification request toasts on top
 2020-03-24 09:51:35 +00:00
Bruno Windels
edd84ffd3a
Merge pull request #4249 from matrix-org/bwindels/assumemethodswhentodevice 
Fix: assume SAS is supported when starting request with .start
 2020-03-23 19:39:43 +00:00
David Baker
b05e704524 Use staic dialog 2020-03-23 19:04:59 +00:00
David Baker
629d85c938 No, it's fine 2020-03-23 19:01:30 +00:00
Michael Telatynski
8839383e16
Merge pull request #4261 from matrix-org/t3chguy/no_e2ee_logout 
Fix logout when Olm failed to load.
 2020-03-23 18:50:33 +00:00
David Baker
281bc09c9a Use unified function to check cross-signing is ready 
Fixes mismatches where the Cross signing panel would say cross
signing was not ready but no toasts would appear.

Fixes https://github.com/vector-im/riot-web/issues/12796
Fixes https://github.com/vector-im/riot-web/issues/12798
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1279
 2020-03-23 18:36:37 +00:00
Travis Ralston
f7bf0d013c Support sending and receiving v1 Jitsi widgets 
Fixes https://github.com/vector-im/riot-web/issues/12816
Fixes https://github.com/vector-im/riot-web/issues/12814
 2020-03-23 10:18:30 -06:00
Travis Ralston
b8ef736038
Merge pull request #4251 from matrix-org/travis/jitsi-name 
Improve naming of Jitsi conferences
 2020-03-23 09:55:02 -06:00
David Baker
eae690f3ef Always display verification request toasts on top 
As they're interactive and time-sensitive.

Fixes https://github.com/vector-im/riot-web/issues/12141
 2020-03-23 15:52:59 +00:00
Michael Telatynski
a5806d93aa
Merge pull request #4245 from matrix-org/t3chguy/user_id_matrix_to 
Handle matrix.to user permalink in-room rather than solo
 2020-03-23 15:08:17 +00:00
Michael Telatynski
1469690835 Fix logout when Olm failed to load. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-23 14:48:55 +00:00
Bruno Windels
cef1fd55b2
Merge pull request #4260 from matrix-org/bwindels/filtercanon-altaliases 
Fix: filter room list (again) by canonical and alternative aliases
 2020-03-23 12:48:03 +00:00
Bruno Windels
51c78809e6 filter room list by canonical and alternative aliases 2020-03-23 12:34:23 +01:00
Damir Jelić
097a34e58b Merge branch 'poljar/file-panel-logging' into develop 2020-03-23 12:34:08 +01:00
David Baker
470cb2c05e
Merge pull request #4259 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-03-23 10:07:26 +00:00
Weblate
7ea0f3d122 Merge branch 'origin/develop' into Weblate. 2020-03-23 09:37:26 +00:00
catborise
00b9435f7f Translated using Weblate (Turkish) 
Currently translated at 77.5% (1724 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-03-23 09:37:26 +00:00
call_xz
fe7084e854 Translated using Weblate (Japanese) 
Currently translated at 54.7% (1217 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2020-03-23 09:37:24 +00:00
Michael Telatynski
535345a7fa
Merge pull request #4258 from matrix-org/t3chguy/soft_crash 
Migrate RoomView to React Contexts in the hope for better temporal stability
 2020-03-23 09:37:17 +00:00
Weblate
afd42a1d04 Merge branch 'origin/develop' into Weblate. 2020-03-22 18:56:11 +00:00
J. A. Durieux
093213a41e Translated using Weblate (Dutch) 
Currently translated at 95.5% (2124 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-03-22 18:56:11 +00:00
Slavi Pantaleev
cccdf03d64 Translated using Weblate (Bulgarian) 
Currently translated at 83.4% (1855 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-03-22 18:56:11 +00:00
Osoitz
94cda51f97 Translated using Weblate (Basque) 
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-03-22 18:56:09 +00:00
Michael Telatynski
2df06800cc
Merge pull request #4256 from matrix-org/t3chguy/patch-1 
Update WidgetUtils.js fix Jitsi path
 2020-03-22 18:56:00 +00:00
Michael Telatynski
a8861f8893 add await for _clearStorage 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-22 09:47:00 +00:00
Michael Telatynski
27ec81f1a2 Migrate RoomView to React Contexts in the hope for better temporal stability 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-22 09:41:14 +00:00
Michael Telatynski
8822bb06f1
Update WidgetUtils.js 2020-03-22 02:14:50 +00:00
Weblate
8a67e6f50f Merge branch 'origin/develop' into Weblate. 2020-03-21 17:35:08 +00:00
catborise
c417245945 Translated using Weblate (Turkish) 
Currently translated at 76.5% (1701 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-03-21 17:35:08 +00:00
Travis Ralston
c17c47d88b
Remove null check that was fixed in another PR 
See https://github.com/matrix-org/matrix-react-sdk/pull/4255
 2020-03-21 11:35:07 -06:00
Karol Kosek
4c08bd6bad Translated using Weblate (Polish) 
Currently translated at 60.6% (1348 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2020-03-21 17:35:06 +00:00
Nils J. Haugen
7520c75b41 Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 48.3% (1074 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
 2020-03-21 17:35:05 +00:00
@a2sc:matrix.org
610daf5e6b Translated using Weblate (German) 
Currently translated at 75.5% (1679 of 2224 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-21 17:35:05 +00:00