OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
24,103 Commits
217 Branches
562 Tags
461 MiB
Commit Graph

24103 Commits (fea219915f4a666d73259406323b185a9d5067f6)

Author SHA1 Message Date
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
Jorik Schellekens f7b3662e0b Fully appease prop types 2020-04-29 10:32:05 +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
Jorik Schellekens 2acb1663eb Appease the prop types 2020-04-29 01:01:56 +01: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
Jorik Schellekens 132a753deb Lint getDefaultValue 2020-04-28 15:55:26 +01:00
Jorik Schellekens 4e6748416c Fix i18n 2020-04-28 15:53:12 +01:00
Bruno Windels 8b8b5256be actually use timeline highlight color 2020-04-28 16:49:25 +02:00
Jorik Schellekens af8430b98a Inverted boolean 2020-04-28 15:48:54 +01:00
Jorik Schellekens 1b83faaa8d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-04-28 15:38:46 +01:00
Bruno Windels 198edb06b9 use normal accessible button, which is themed 2020-04-28 16:35:20 +02:00
Jorik Schellekens eb72245493 fix syntax error 2020-04-28 15:19:12 +01:00
Jorik Schellekens 1289367a6b Fix indentation 2020-04-28 14:31:49 +01:00
Jorik Schellekens fe326b9f08 Enfore function name capitalisation 2020-04-28 14:31:49 +01:00
Jorik Schellekens 9ca843fdcb
Correct return type in docs 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-04-28 14:27:18 +01:00
Jorik Schellekens 93f24f12dc Match filename to class 2020-04-28 14:26:08 +01:00
Jorik Schellekens 57d880ca5e Use correct name and indentation 2020-04-28 14:24:44 +01:00
Jorik Schellekens 175b5e70b6 Lint Slider 2020-04-28 14:20:49 +01:00
Jorik Schellekens 137b94703a Lint types 2020-04-28 14:20:49 +01:00
Jorik Schellekens f91613f112 Remove redundent selectors. 
Check _AppearanceUserSettingsTab
 2020-04-28 14:20:49 +01:00
Jorik Schellekens c268b98ded
Use faster lookup method 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-04-28 14:17:50 +01:00
Jorik Schellekens a8407c9508
Use purecomponent 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-04-28 14:00:15 +01:00
Weblate 255dbab482 Merge branch 'origin/develop' into Weblate. 2020-04-28 12:47:55 +00:00