Bruno Windels
|
da52a16ff4
|
Merge pull request #4513 from matrix-org/bwindels/dontencryptfor3pids-rc
Don't enable e2ee when inviting a 3pid
|
2020-04-29 09:58:38 +00:00 |
Jorik Schellekens
|
2e7ccf6e7a
|
Fix pill vertical align
|
2020-04-29 10:57:35 +01:00 |
Weblate
|
ad6297bc8d
|
Merge branch 'origin/develop' into Weblate.
|
2020-04-29 09:57:29 +00:00 |
J. Ryan Stinnett
|
4adbfce92d
|
Merge pull request #4502 from matrix-org/jryans/set-up-button-text
Fix set up encryption toast to have use "set up" as action
|
2020-04-29 10:57:24 +01:00 |
David Baker
|
89a910c718
|
Clarify that we don't need tyo recheck
|
2020-04-29 10:55:44 +01:00 |
David Baker
|
75c680715f
|
s/unverified/new/
|
2020-04-29 10:53:36 +01:00 |
Weblate
|
f8464d03b5
|
Merge branch 'origin/develop' into Weblate.
|
2020-04-29 09:49:34 +00:00 |
Bruno Windels
|
d9469e6afe
|
Merge pull request #4509 from matrix-org/bwindels/dontencryptfor3pids
Don't enable e2ee when inviting a 3pid
|
2020-04-29 09:49:28 +00:00 |
Bruno Windels
|
c10969f520
|
enable encryption when NOT inviting 3pids
|
2020-04-29 11:46:04 +02:00 |
Bruno Windels
|
a8205d21f1
|
targets can also contain RoomMember, so take the positive case rather
|
2020-04-29 11:46:04 +02:00 |
Bruno Windels
|
be13e86b09
|
dont enable e2ee when inviting a 3pid
|
2020-04-29 11:46:04 +02:00 |
David Baker
|
6f25f2eaec
|
Add the other toast component
|
2020-04-29 10:44:51 +01:00 |
Bruno Windels
|
bb6d13781c
|
enable encryption when NOT inviting 3pids
|
2020-04-29 11:40:04 +02:00 |
Michael Telatynski
|
41dece38a4
|
iterate copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-04-29 10:35:35 +01:00 |
Michael Telatynski
|
dc7b588e02
|
fix font-size
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-04-29 10:29:33 +01:00 |
Michael Telatynski
|
246c70c6a1
|
Fix internal link styling in Security Settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-04-29 10:29:32 +01:00 |
Weblate
|
fdb799da10
|
Merge branch 'origin/develop' into Weblate.
|
2020-04-29 09:26:31 +00:00 |
Kévin C
|
b11c8c3da0
|
Translated using Weblate (French)
Currently translated at 100.0% (2297 of 2297 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
|
2020-04-29 09:26:31 +00:00 |
Jeff Huang
|
35487c9e02
|
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2297 of 2297 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
|
2020-04-29 09:26:31 +00:00 |
Michael Telatynski
|
90b0223fbd
|
Merge pull request #4510 from matrix-org/t3chguy/settings_link_styling
Fix internal link styling in Security Settings
|
2020-04-29 10:26:25 +01:00 |
Bruno Windels
|
f06a69d8cc
|
targets can also contain RoomMember, so take the positive case rather
|
2020-04-29 11:05:35 +02:00 |
Bruno Windels
|
4e98b5b4b6
|
dont enable e2ee when inviting a 3pid
|
2020-04-29 11:05:35 +02:00 |
Priit Jõerüüt
|
7339192535
|
Translated using Weblate (Estonian)
Currently translated at 20.3% (466 of 2297 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
|
2020-04-28 22:12:04 +00:00 |
Priit Jõerüüt
|
921d178df0
|
Translated using Weblate (Estonian)
Currently translated at 20.2% (465 of 2297 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
|
2020-04-28 22:09:06 +00:00 |
Priit Jõerüüt
|
aaf676705a
|
Translated using Weblate (Estonian)
Currently translated at 19.7% (453 of 2297 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
|
2020-04-28 21:57:59 +00:00 |
Priit Jõerüüt
|
aa0bb91733
|
Translated using Weblate (Estonian)
Currently translated at 18.0% (413 of 2297 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
|
2020-04-28 21:43:28 +00:00 |
Priit Jõerüüt
|
3703db2376
|
Translated using Weblate (Estonian)
Currently translated at 14.1% (323 of 2297 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
|
2020-04-28 20:09:29 +00:00 |
David Baker
|
719faed2ff
|
Separate toasts for existing & new device verification
Separate device verification toasts into ones for devices that were
there when the app loaded and a separate toast for each device that
has appeared since.
Reverts part of https://github.com/matrix-org/matrix-react-sdk/pull/4506
(clicking a device from your own UserInfo now triggers the legacy
verification flow again).
Fixes https://github.com/vector-im/riot-web/issues/13422
Fixes https://github.com/vector-im/riot-web/issues/13418
|
2020-04-28 18:35:16 +01:00 |
Michael Telatynski
|
a63dd664a1
|
fix font-size
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-04-28 17:57:32 +01:00 |
Michael Telatynski
|
32c512dbfe
|
Fix internal link styling in Security Settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-04-28 17:49:10 +01:00 |
Weblate
|
e1a0915ecc
|
Merge branch 'origin/develop' into Weblate.
|
2020-04-28 15:25:59 +00:00 |
random
|
6b28dfa50c
|
Translated using Weblate (Italian)
Currently translated at 100.0% (2297 of 2297 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
|
2020-04-28 15:25:59 +00:00 |
Bruno Windels
|
d723aa9efe
|
Merge pull request #4508 from matrix-org/bwindels/moarthemingfixes
Small custom theming fixes
|
2020-04-28 15:25:53 +00:00 |
Bruno Windels
|
8b8b5256be
|
actually use timeline highlight color
|
2020-04-28 16:49:25 +02:00 |
Bruno Windels
|
198edb06b9
|
use normal accessible button, which is themed
|
2020-04-28 16:35:20 +02:00 |
Weblate
|
255dbab482
|
Merge branch 'origin/develop' into Weblate.
|
2020-04-28 12:47:55 +00:00 |
Jorik Schellekens
|
cf05beb4b8
|
Merge pull request #4355 from JorikSchellekens/joriks/font-scaling-fixes
Fix scaling issues
|
2020-04-28 13:47:50 +01:00 |
Zoe
|
689d6735fc
|
i18n
|
2020-04-28 11:36:28 +01:00 |
Zoe
|
9d1c73348c
|
Show progress when loading keys
|
2020-04-28 11:32:51 +01:00 |
Weblate
|
87ad4c15c2
|
Merge branch 'origin/develop' into Weblate.
|
2020-04-28 10:00:58 +00:00 |
Priit Jõerüüt
|
df28baf4f4
|
Translated using Weblate (Estonian)
Currently translated at 14.0% (321 of 2296 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
|
2020-04-28 10:00:58 +00:00 |
David Baker
|
60d51a0f1e
|
Merge pull request #4506 from matrix-org/dbkr/aggregate_device_verify_toasts
Aggregate device verify toasts
|
2020-04-28 11:00:52 +01:00 |
Weblate
|
02c1090bce
|
Merge branch 'origin/develop' into Weblate.
|
2020-04-28 09:06:14 +00:00 |
Kévin C
|
0b9423f6ef
|
Translated using Weblate (French)
Currently translated at 100.0% (2296 of 2296 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
|
2020-04-28 09:06:14 +00:00 |
Remi Reuvekamp
|
41ef40a0e3
|
Translated using Weblate (Dutch)
Currently translated at 91.1% (2092 of 2296 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
|
2020-04-28 09:06:14 +00:00 |
Jeff Huang
|
dfb2c66b6c
|
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2296 of 2296 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
|
2020-04-28 09:06:13 +00:00 |
Bruno Windels
|
3d094ea542
|
Merge pull request #4503 from matrix-org/bwindels/customthemechanges
Support setting username and avatar colors in custom themes
|
2020-04-28 09:06:08 +00:00 |
Priit Jõerüüt
|
8aeeff4204
|
Translated using Weblate (Estonian)
Currently translated at 13.8% (317 of 2296 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
|
2020-04-28 09:03:30 +00:00 |
Bruno Windels
|
4978f8a2a9
|
validate hex color
|
2020-04-28 10:59:10 +02:00 |
David Baker
|
cad2f4d27d
|
Consts are constant
|
2020-04-28 09:49:03 +01:00 |