OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
23,722 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

23722 Commits (eca1187c2eba6df2bc756f1c7657c25f93c5b682)

Author SHA1 Message Date
Weblate eca1187c2e Merge branch 'origin/develop' into Weblate. 2020-04-29 16:41:45 +00:00
Louis 1f79f5ded6 Translated using Weblate (French) 
Currently translated at 99.9% (2298 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-04-29 16:41:44 +00:00
Priit Jõerüüt eebcf748e1 Translated using Weblate (Estonian) 
Currently translated at 22.2% (510 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-04-29 16:41:44 +00:00
J. Ryan Stinnett 0e371b65d1
Merge pull request #4521 from matrix-org/jryans/reset-from-access 
Allow resetting storage from the access dialog
 2020-04-29 17:41:35 +01:00
Weblate 5fd81ab6d4 Merge branch 'origin/develop' into Weblate. 2020-04-29 15:02:59 +00:00
David Baker dfb34a2e76
Merge pull request #4522 from matrix-org/dbkr/toast_copy_again 
Update (bulk) unverified device toast copy
 2020-04-29 16:02:53 +01:00
David Baker 283a15c0b3 Lint 2020-04-29 15:54:32 +01:00
David Baker 9ac4fa92fd Update (bulk) unverified device toast copy 
Fixes https://github.com/vector-im/riot-web/issues/13444
 2020-04-29 15:31:41 +01:00
Weblate 5986edbbb2 Merge branch 'origin/develop' into Weblate. 2020-04-29 14:28:35 +00:00
Priit Jõerüüt 5b2ff19f59 Translated using Weblate (Estonian) 
Currently translated at 20.5% (471 of 2298 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-04-29 14:28:35 +00:00
David Baker 1bd1e25047
Merge pull request #4519 from matrix-org/dbkr/new_device_toast_more_important 
Make new device toasts appear above review toasts
 2020-04-29 15:28:28 +01:00
J. Ryan Stinnett 65bdaa20b0 Allow resetting storage from the access dialog 
This adds a path to reset secret storage from the access dialog instead of
throwing an error.

Fixes https://github.com/vector-im/riot-web/issues/13436
 2020-04-29 15:19:09 +01:00
David Baker 325e1f9c4e Add jsdoc explaining ordering behaviour 2020-04-29 15:10:23 +01:00
David Baker 1291a63b98 Make new device toasts appear above review toasts 
...but below incoming verification toasts, which means we now need
to actually handle priority insertion correctly. Oh well.

Fixes https://github.com/vector-im/riot-web/issues/13442
 2020-04-29 14:49:30 +01:00
Weblate 70d94e2f7a Merge branch 'origin/develop' into Weblate. 2020-04-29 11:09:42 +00:00
David Baker eceb8edfbc
Merge pull request #4511 from matrix-org/dbkr/another_round_of_toast 
Separate toasts for existing & new device verification
 2020-04-29 12:09:37 +01:00
David Baker 0026e4a018
Comment typo 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-04-29 11:25:18 +01:00
Weblate 9f33e244f3 Merge branch 'origin/develop' into Weblate. 2020-04-29 10:10:52 +00:00
Jorik Schellekens 360cc332eb
Merge pull request #4477 from JorikSchellekens/joriks/toggle-bg-color 
Slightly darker toggle off bg color
 2020-04-29 11:10:47 +01:00
Weblate 205b6f8f54 Merge branch 'origin/develop' into Weblate. 2020-04-29 10:07:49 +00:00
Bruno Windels 8c28977c27
Merge pull request #4514 from JorikSchellekens/joriks/font-scaling-fixes 
Fix pill vertical align
 2020-04-29 10:07:44 +00:00
David Baker 126d81912b Remove await for some more getStoredDevice() calls 2020-04-29 11:02:22 +01: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
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
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