Commit Graph

31256 Commits

Author SHA1 Message Date
Michael Telatynski
d06f61393d
Merge pull request #5603 from matrix-org/t3chguy/cherrypick/5602
[Release] Fix RoomView re-mounting breaking peeking
2021-02-01 13:01:04 +00:00
Michael Telatynski
741b3f76ee
Merge pull request #5593 from SimonBrandner/fix-collapsing-of-left-panel
Fix saving the collapsed state of the left panel
2021-02-01 12:50:37 +00:00
Michael Telatynski
5a49cbf51a
Merge pull request #5600 from weeman1337/fix-e2et-run-out
Fix app-url hint in the e2e-test run script output
2021-02-01 12:47:12 +00:00
Michael Telatynski
077ceeb20d Fix RoomView re-mounting breaking peeking
Because as of React 16 order of unmount & re-mount is undefined
this was causing the possibility of the unmount running after
the willMount of the replacement RoomView, upsetting the state
of the singleton inside the js-sdk.
2021-02-01 12:29:11 +00:00
Michael Telatynski
72263a4a56
Merge pull request #5602 from matrix-org/t3chguy/peeking
Fix RoomView re-mounting breaking peeking
2021-02-01 12:26:42 +00:00
J. Ryan Stinnett
50452d52ff
Merge pull request #5592 from matrix-org/jryans/opt-room-id
Tweak a few room ID checks
2021-02-01 10:54:29 +00:00
J. Ryan Stinnett
89b835dd20
Merge pull request #5575 from matrix-org/jryans/no-event-pills
Remove pills from event permalinks with text
2021-02-01 10:53:22 +00:00
Michael Telatynski
53334de5a9 Fix RoomView re-mounting breaking peeking
Because as of React 16 order of unmount & re-mount is undefined
this was causing the possibility of the unmount running after
the willMount of the replacement RoomView, upsetting the state
of the singleton inside the js-sdk.
2021-01-31 16:09:11 +00:00
Michael Weimann
9b54aba4c0
fix timestamp width if there is a 2e2 indicator bar
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-01-31 11:11:34 +01:00
Michael Weimann
0660371461
fix typo in end-to-end-test run script output
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-01-31 09:53:15 +01:00
Šimon Brandner
8a50b7bcbb
Properly handle closing encryption panel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-30 10:22:11 +01:00
Šimon Brandner
73ab074219
Properly handle closing the panel while verifying
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-30 10:22:04 +01:00
Šimon Brandner
1360f551ce
Back button should send you to member info
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-30 08:54:08 +01:00
Šimon Brandner
4cf03e4c10
Added optional refireParams
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-30 08:51:26 +01:00
Šimon Brandner
eee6a509c7
Close button should always close the panel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-30 08:04:25 +01:00
RiotRobot
7494a94908 v3.13.0-rc.1 2021-01-29 17:28:26 +00:00
RiotRobot
9bb906f5d4 Prepare changelog for v3.13.0-rc.1 2021-01-29 17:28:25 +00:00
RiotRobot
815a126b56 Upgrade matrix-js-sdk to 9.6.0-rc.1 2021-01-29 17:23:17 +00:00
J. Ryan Stinnett
b24e64f6fe
Merge pull request #5597 from RiotTranslateBot/weblate-element-web-matrix-react-sdk
Translations update from Weblate
2021-01-29 17:14:46 +00:00
Priit Jõerüüt
34c198a2ed Translated using Weblate (Estonian)
Currently translated at 100.0% (2739 of 2739 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-01-29 17:13:00 +00:00
@a2sc:matrix.org
1715705643 Translated using Weblate (German)
Currently translated at 100.0% (2739 of 2739 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-01-29 17:12:57 +00:00
Weblate
f0a83b24df Merge branch 'origin/develop' into Weblate. 2021-01-29 16:40:42 +00:00
J. Ryan Stinnett
b39fdaae45
Merge pull request #5596 from matrix-org/jryans/hybrid-from-config
Support managed hybrid widgets from config
2021-01-29 16:40:36 +00:00
J. Ryan Stinnett
f8192a8314 Support managed hybrid widgets from config
This adds additional support to the managed hybrid widget experiment to also
support pulling the build URL from Element config.
2021-01-29 16:26:34 +00:00
Weblate
d25e13148e Merge branch 'origin/develop' into Weblate. 2021-01-29 16:03:28 +00:00
J. Ryan Stinnett
3f89da9b8f
Merge pull request #5594 from matrix-org/jryans/hybrid-call-widget
Add managed hybrid call widgets when supported
2021-01-29 16:03:20 +00:00
Weblate
1e8d2693f4 Merge branch 'origin/develop' into Weblate. 2021-01-29 15:49:18 +00:00
@a2sc:matrix.org
efc74b507d Translated using Weblate (German)
Currently translated at 99.8% (2734 of 2738 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-01-29 15:49:18 +00:00
J. Ryan Stinnett
873b173025
Merge pull request #5595 from matrix-org/jryans/mobile-guide-text
Tweak mobile guide toast copy
2021-01-29 15:49:03 +00:00
J. Ryan Stinnett
0cb1d1dc95 Tweak mobile guide toast copy 2021-01-29 15:30:13 +00:00
J. Ryan Stinnett
2c313e0c5e Add managed hybrid call widgets when supported
If your homeserver is configured with an experiment `widget_build_url`, this
will take over the functionality of the call buttons and turn them into a
general widget installer.
2021-01-29 14:45:25 +00:00
Jason Robinson
4ee6016084 Some cleanup 2021-01-29 15:55:14 +02:00
Weblate
ae8a5d13e2 Merge branch 'origin/develop' into Weblate. 2021-01-29 13:29:03 +00:00
waclaw66
1819aecffd Translated using Weblate (Czech)
Currently translated at 100.0% (2737 of 2737 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-01-29 13:29:03 +00:00
Michael Telatynski
62712159f6
Merge pull request #5578 from matrix-org/t3chguy/sso_fixes
Improve SSO auth flow
2021-01-29 13:28:53 +00:00
Michael Telatynski
0eb0d242d5
Apply suggestions from code review
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-01-29 13:05:09 +00:00
Michael Telatynski
0167c3cefb Iterate SSO auth ux styling 2021-01-29 13:04:05 +00:00
Šimon Brandner
9c5af8b61e
Fix collapsing of the left panel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-29 13:19:09 +01:00
Michael Telatynski
1eb88c988c Add tooltips to mini sso buttons 2021-01-29 12:05:15 +00:00
Michael Telatynski
2c2cf4c073 Update google branding 2021-01-29 11:42:34 +00:00
dangwynne
dc81496c3b add optional chaining operator 2021-01-29 11:31:21 +00:00
Weblate
096b13ea81 Merge branch 'origin/develop' into Weblate. 2021-01-29 11:18:16 +00:00
J. Ryan Stinnett
b8e3908ee2
Merge pull request #5586 from matrix-org/jryans/maybe-mobile
Add optional mobile guide toast
2021-01-29 11:18:08 +00:00
J. Ryan Stinnett
c9a6214256 Tweak a few room ID checks 2021-01-29 11:15:30 +00:00
Weblate
71a0788b74 Merge branch 'origin/develop' into Weblate. 2021-01-29 10:38:24 +00:00
J. Ryan Stinnett
241955f7c2
Merge pull request #5588 from 2580ayush2580/ayush25807
Fix invisible text after logging out in the dark theme
2021-01-29 10:38:17 +00:00
Weblate
7698ba3bb1 Merge branch 'origin/develop' into Weblate. 2021-01-29 10:26:48 +00:00
Michael Telatynski
e839ac0f06
Merge pull request #5591 from SimonBrandner/fix-escape-to-quit-reply
Fix escape for cancelling replies
2021-01-29 10:26:42 +00:00
Ayush Kumar
6b56d0b987 change value #2e2f32 to -primary-color 2021-01-29 15:54:40 +05:30
Weblate
b596f17b1d Merge branch 'origin/develop' into Weblate. 2021-01-29 10:13:23 +00:00