OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
23,802 Commits
201 Branches
546 Tags
419 MiB
Commit Graph

23802 Commits (0b4a3d36cd1d20d8cb86eaadc28879ff438c6160)

Author SHA1 Message Date
David Baker 683d6804ca Update toast copy again 
Fixes https://github.com/vector-im/riot-web/issues/13447
 2020-04-29 19:07:10 +01:00
Priit Jõerüüt cea8f59fb3 Translated using Weblate (Estonian) 
Currently translated at 23.7% (545 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 17:48:46 +00:00
Weblate ddb4aec5ed Merge branch 'origin/develop' into Weblate. 2020-04-29 17:08:20 +00:00
David Baker c58bb2af0f
Merge pull request #4525 from matrix-org/dbkr/longtoast_is_no_longer_long 
Reduce maximum width of toasts & allow multiple lines
 2020-04-29 18:08:15 +01:00
Priit Jõerüüt 1cac7b778d Translated using Weblate (Estonian) 
Currently translated at 22.3% (513 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 17:05:12 +00:00
Bruno Windels 886b30a265 also recheck 2020-04-29 18:55:25 +02:00
Weblate b46415ce62 Merge branch 'origin/develop' into Weblate. 2020-04-29 16:42:22 +00:00
David Baker 3502b90aeb
Merge pull request #4524 from matrix-org/dbkr/sessions_there_on_login_are_old 
Treat sessions that are there when we log in as old
 2020-04-29 17:42:16 +01:00
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
David Baker 34d6eb591f Put overflows back 2020-04-29 17:38:32 +01:00
David Baker c41af152ac
Comment typo 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-04-29 17:33:18 +01:00
David Baker 13d0e26ec4 Reduce maximum width of toasts & allow multiple lines 2020-04-29 17:28:45 +01:00
David Baker a70efea69e Treat sessions that are there when we log in as old 
Use the bulk 'review' toast for sessions that existed at the time
of login, rather than considering them all to be new.

Also cheeky unrelated proptypes fix.

Fixes https://github.com/vector-im/riot-web/issues/13443
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1360
 2020-04-29 17:16:04 +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
Zoe 465442c31e fragments and i18n don't play nice together 2020-04-29 15:13:24 +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
Zoe 326d567468 Fixed the dialog height 2020-04-29 14:29:36 +01:00
Zoe 62c73146dc copy changes 2020-04-29 14:14:39 +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