Weblate
76baf33461
Merge branch 'origin/develop' into Weblate.
2020-01-28 22:13:34 +00:00
Michael Telatynski
c6a827995f
Merge pull request #3965 from matrix-org/t3chguy/members_button_regression
...
Passing refireParams actually prevented this from working
2020-01-28 22:13:29 +00:00
Michael Telatynski
7b5a8856a4
Passing refireParams actually prevented this from working
2020-01-28 22:06:04 +00:00
Weblate
3d816e3042
Merge branch 'origin/develop' into Weblate.
2020-01-28 22:02:25 +00:00
David Baker
8c471d6713
Merge pull request #3964 from matrix-org/dbkr/start_key_backup_in_bootstrap
...
Start new key backup in security setup flow
2020-01-28 22:02:20 +00:00
Weblate
ae8a4b678d
Merge branch 'origin/develop' into Weblate.
2020-01-28 21:53:55 +00:00
J. Ryan Stinnett
463bddb7e9
Merge pull request #3958 from mstange/fix-unread-scroll-button-hittarget-and-alignment
...
Tweak styling of the unread indicator circle.
2020-01-28 21:53:50 +00:00
Weblate
a58f9a6b07
Merge branch 'origin/develop' into Weblate.
2020-01-28 20:36:28 +00:00
Szimszon
68a22a4d64
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2075 of 2075 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-28 20:36:28 +00:00
Hubert Chathi
793ff2cccc
Hide pre-join UTDs ( #3881 )
2020-01-28 15:36:24 -05:00
Weblate
624ea505c3
Merge branch 'origin/develop' into Weblate.
2020-01-28 20:05:48 +00:00
J. Ryan Stinnett
02ba548a62
Merge pull request #3963 from matrix-org/jryans/user-info-device-id
...
Add device IDs in user info tooltips
2020-01-28 20:05:43 +00:00
J. Ryan Stinnett
32cb3b8ccb
onClick to separate line
2020-01-28 19:55:53 +00:00
David Baker
39c8a9d204
Start new key backup in security setup flow
...
Part of https://github.com/vector-im/riot-web/issues/11889
2020-01-28 19:42:09 +00:00
Weblate
85d929f694
Merge branch 'origin/develop' into Weblate.
2020-01-28 18:05:14 +00:00
David Baker
d1cbec98b7
Merge pull request #3962 from matrix-org/dbkr/better_flow_for_upgrade_on_login
...
Improve encryption upgrade on login flow
2020-01-28 18:05:09 +00:00
J. Ryan Stinnett
6fb8f6eef1
Add device IDs in user info tooltips
...
For easier device identification, add the device ID in an HTML tooltip for now.
Fixes https://github.com/vector-im/riot-web/issues/12103
2020-01-28 18:03:51 +00:00
David Baker
de295cc350
Merge remote-tracking branch 'origin/develop' into dbkr/better_flow_for_upgrade_on_login
2020-01-28 17:49:57 +00:00
Michael Telatynski
b002806639
Use DialogButtons because reusability :((
2020-01-28 17:42:39 +00:00
Travis Ralston
61b198d7f8
Merge branch 'develop' into travis/update-qr-code
2020-01-28 17:27:17 +00:00
David Baker
5e1b42b350
unused component
2020-01-28 17:21:42 +00:00
Michael Telatynski
76e61b9948
Merge branches 'develop' and 't3chguy/cs_verification_decoration' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration
2020-01-28 17:19:59 +00:00
David Baker
e1e35a53e4
i18n
2020-01-28 17:18:09 +00:00
David Baker
546acb696d
Add confirmation to skip button
...
Re-using the opt out phase which was unused
2020-01-28 17:15:50 +00:00
Michael Telatynski
58df4127d3
Update propTypes and remove todo
2020-01-28 17:14:48 +00:00
Weblate
0a67fb9a6b
Merge branch 'origin/develop' into Weblate.
2020-01-28 16:54:21 +00:00
Szimszon
6c10c1b76d
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2078 of 2078 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-28 16:54:21 +00:00
Travis Ralston
dc1405c3b3
Merge pull request #3961 from matrix-org/travis/legacy-decorators
...
Switch back to legacy decorators
2020-01-28 16:54:13 +00:00
Travis Ralston
330b489fd5
Switch back to legacy decorators
...
Empirically the build is fine with these, but it is unfortunate that we have to reply on deprecated semantics. TypeScript should help fix this.
2020-01-28 16:44:30 +00:00
David Baker
abfa593791
Make the 'encryption upgrade' flow better
...
Fixes https://github.com/vector-im/riot-web/issues/12086
2020-01-28 16:36:07 +00:00
Weblate
2dbb248598
Merge branch 'origin/develop' into Weblate.
2020-01-28 16:15:54 +00:00
Szimszon
ab8fe80d6b
Translated using Weblate (Hungarian)
...
Currently translated at 98.6% (2048 of 2077 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-28 16:15:54 +00:00
Will Hunt
cf2538fbed
Merge pull request #3894 from matrix-org/hs/bridge-info-pretty
...
Style bridge settings tab according to design
2020-01-28 16:15:49 +00:00
Half-Shot
bfaa9d56fb
prefixes
2020-01-28 16:05:27 +00:00
Half-Shot
ff532dd684
Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty
2020-01-28 16:01:50 +00:00
Damir Jelić
5cabfb63a4
EventIndex: Don't mark the event listener method docs as jsdoc comments.
2020-01-28 16:13:56 +01:00
Travis Ralston
e178135bff
Merge branch 'develop' into travis/update-qr-code
2020-01-28 15:02:50 +00:00
Weblate
e812c9c986
Merge branch 'origin/develop' into Weblate.
2020-01-28 14:50:24 +00:00
Travis Ralston
145d2bb16b
Merge pull request #3957 from matrix-org/travis/babel-skinning
...
Fix skinning and babel targets
2020-01-28 14:50:19 +00:00
Half-Shot
85bcad0ea0
Styling for Nad
2020-01-28 14:46:22 +00:00
Travis Ralston
720b9a92fe
Merge branch 'develop' into travis/babel-skinning
2020-01-28 14:41:51 +00:00
Markus Stange
9821e25e0b
Tweak styling of unread indicator circle.
...
This makes the element symmetric and reduces the size of the hit target.
With the previous styling, the mid-circle glyph was sometimes offset from the center.
Furthermore, the large font size increased the hit box of the ::after element, eating into the scroll up arrow button's hit target.
It might be a good idea to give the ::after element pointer-events:none so that the scroll up button is clickable in its entirety.
Signed-off-by: Markus Stange <mstange@themasta.com>
2020-01-28 15:35:34 +01:00
Travis Ralston
894568bf7a
Stop using deprecated stuff
2020-01-28 14:19:06 +00:00
Travis Ralston
a4778cc7e3
Remove legacy
2020-01-28 14:18:12 +00:00
Weblate
79f3b44279
Merge branch 'origin/develop' into Weblate.
2020-01-28 14:13:09 +00:00
J. Ryan Stinnett
a19cdc9077
Merge pull request #3956 from matrix-org/jryans/trigger-cs-lab-4s
...
Enable cross-signing lab when key in storage
2020-01-28 14:13:04 +00:00
Damir Jelić
948ec203c6
BaseEventIndexManager: Fix the type hints for the empty promises.
2020-01-28 15:07:29 +01:00
Damir Jelić
0b7f23fa54
EventIndex: Improve the documentation a bit.
2020-01-28 15:06:43 +01:00
Travis Ralston
d0c28adfb1
Appease the linter
2020-01-28 12:53:37 +00:00
Travis Ralston
21405b8f25
Fix skinning and babel tagets
2020-01-28 12:47:38 +00:00