OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
21,724 Commits
214 Branches
561 Tags
463 MiB
Commit Graph

21724 Commits (e63370799ee8f8defdf343d2e8a220b43b6968cf)

Author SHA1 Message Date
Weblate a84a7f9271 Merge branch 'origin/develop' into Weblate. 2020-01-31 16:23:56 +00:00
Kévin C aa35fc4273 Translated using Weblate (French) 
Currently translated at 100.0% (2098 of 2098 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-31 16:23:56 +00:00
David Baker 9d343a4705
Merge pull request #4018 from matrix-org/dbkr/truncate_sas 
Truncate SAS emoji labels to fit
 2020-01-31 16:23:50 +00:00
David Baker 29024c5172 Truncate SAS emoji labels to fit 
This keeps the layout of the emoji fixed as much as possible.

Other changes:
 * Fix width of each emoji container to static 52px
 * Bump minimum width of right panel from 250px to 264px to match the
   width in the figma
 * Use normal font-weight for labels as per design
 * Smaller vertical gap between emojis, again to match design
 2020-01-31 15:28:58 +00:00
Weblate 7d418e16ff Merge branch 'origin/develop' into Weblate. 2020-01-31 15:13:24 +00:00
J. Ryan Stinnett 2584772bfb
Merge pull request #4017 from matrix-org/jryans/e2e-copy-changes 
Apply copy edits to security setup flow
 2020-01-31 15:13:18 +00:00
Weblate 0c6170fc24 Merge branch 'origin/develop' into Weblate. 2020-01-31 15:12:59 +00:00
Kévin C fcfac9b6ed Translated using Weblate (French) 
Currently translated at 99.9% (2106 of 2107 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-31 15:12:59 +00:00
J. Ryan Stinnett 16f72140b9
Merge pull request #4016 from matrix-org/jryans/verif-status-text 
Fix user trust text to match what was checked
 2020-01-31 15:12:52 +00:00
J. Ryan Stinnett d5811cad28 Change UI auth title for cross-signing 2020-01-31 15:04:51 +00:00
Weblate 141aa989bb Merge branch 'origin/develop' into Weblate. 2020-01-31 14:48:02 +00:00
Kévin C 7234925fa0 Translated using Weblate (French) 
Currently translated at 98.6% (2077 of 2107 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-31 14:48:01 +00:00
Jeff Huang 2d61a9d392 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2107 of 2107 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-31 14:47:56 +00:00
David Baker 501a310e8e
Merge pull request #4015 from matrix-org/dbkr/hold_me_closer_tiny_padlock 
Fix size of invite only icon
 2020-01-31 14:47:49 +00:00
J. Ryan Stinnett 0fad5a62b4 Fix user trust text to match what was checked 
This fixes the unverified users status text to omit devices since they haven't
been checked.

Fixes https://github.com/vector-im/riot-web/issues/12176
 2020-01-31 14:06:57 +00:00
David Baker 2dbceca8b3 Fix size of invite only icon 
So it doesn't become tiny with long room names

Fixes https://github.com/vector-im/riot-web/issues/12168
 2020-01-31 13:46:42 +00:00
Weblate 251fed9c52 Merge branch 'origin/develop' into Weblate. 2020-01-31 13:44:18 +00:00
Jeff Huang dacf900a9f Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.4% (2093 of 2106 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-31 13:44:18 +00:00
J. Ryan Stinnett 11008cfabf
Merge pull request #4013 from matrix-org/jryans/padlock-flag 
Add temporary feature flag to control padlocks
 2020-01-31 13:44:12 +00:00
Weblate 7b95b3a36b Merge branch 'origin/develop' into Weblate. 2020-01-31 13:30:18 +00:00
David Baker 85489c4ec5
Merge pull request #4014 from matrix-org/dbkr/theme_is_login_override 
Add an override for the theme
 2020-01-31 13:30:12 +00:00
Weblate e3f9de0cf4 Merge branch 'origin/develop' into Weblate. 2020-01-31 13:22:28 +00:00
J. Ryan Stinnett 636b3696ed
Merge pull request #4011 from matrix-org/jryans/comp-sec-title 
Add title to complete security loading
 2020-01-31 13:22:22 +00:00
David Baker cb9362456f remove setter 2020-01-31 13:18:01 +00:00
David Baker 2d9b111680 Add an override for the theme 
So we can force the light theme on unthemeable pages like the login
& complete security page.

Fixes https://github.com/vector-im/riot-web/issues/12149
Fixes https://github.com/vector-im/riot-web/issues/12157
 2020-01-31 12:28:14 +00:00
J. Ryan Stinnett 02cada7cc6 First pass of copy changes 2020-01-31 12:15:19 +00:00
J. Ryan Stinnett b64ba1dbbf Add temporary feature flag to control padlocks 
This default on feature flag will help in case we want to trial padlocks on vs.
off this weekend.

Fixes https://github.com/vector-im/riot-web/issues/12166
 2020-01-31 11:09:49 +00:00
Weblate 0447501c3b Merge branch 'origin/develop' into Weblate. 2020-01-31 11:06:01 +00:00
David Baker 630507304a
Merge pull request #4012 from matrix-org/dbkr/just_one_zxcvbn_suggestion 
Only display the first zxcvbn warning/suggestion
 2020-01-31 11:05:54 +00:00
Weblate 9e92d2ab1c Merge branch 'origin/develop' into Weblate. 2020-01-31 11:00:20 +00:00
David Baker c111d70deb
Merge pull request #4009 from matrix-org/dbkr/log_exceptions_other_than_cancel 
Log exceptions from accessSecretStorage
 2020-01-31 11:00:16 +00:00
David Baker 96d5fb5ce3 Only display the first zxcvbn warning/suggestion 
As per comment

Fixes https://github.com/vector-im/riot-web/issues/12150
 2020-01-31 10:59:35 +00:00
J. Ryan Stinnett 1a95a1d4ba Add title to complete security loading 2020-01-31 10:47:58 +00:00
Weblate 025adb0a6f Merge branch 'origin/develop' into Weblate. 2020-01-31 10:46:02 +00:00
J. Ryan Stinnett 19ab395c18
Merge pull request #3995 from matrix-org/jryans/4s-in-mem 
Add advanced option to keep secret storage in memory for session
 2020-01-31 10:45:57 +00:00
David Baker ea7f160950 lint 2020-01-31 10:38:20 +00:00
Zoe af0598bbcb double-check user verification 2020-01-31 10:37:40 +00:00
David Baker 26c9b64c3b Log exceptions from accessSecretStorage 
Rather than ignoring everything assuming the user cancelled
 2020-01-31 10:35:05 +00:00
Weblate 5ab707bd8b Merge branch 'origin/develop' into Weblate. 2020-01-31 10:20:18 +00:00
J. Ryan Stinnett 68b2454920
Merge pull request #4006 from matrix-org/jryans/user-list-deco 
Add shields to member list, move power label to text
 2020-01-31 10:20:13 +00:00
Weblate e9426680be Merge branch 'origin/develop' into Weblate. 2020-01-31 10:20:10 +00:00
Jeff Huang fe33e2664f Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.2% (2086 of 2102 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-31 10:20:09 +00:00
David Baker 24075dc248
Merge pull request #4005 from matrix-org/dbkr/encryption_events 
Make encryption events into bubble-style tiles
 2020-01-31 10:20:03 +00:00
J. Ryan Stinnett 31476737ea Enforce a max width on power labels 2020-01-31 10:11:34 +00:00
Zoe 36d7b8e3ed don't close in UI, a js-sdk event will do that 2020-01-31 09:59:24 +00:00
David Baker d0ab37ac50 Only say the room is encrypted if it actually is 2020-01-31 09:58:21 +00:00
Weblate 2e65ec2c58 Merge branch 'origin/develop' into Weblate. 2020-01-31 09:58:05 +00:00
Jeff Huang eb02c60abe Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.3% (2083 of 2098 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-31 09:58:05 +00:00
Zoe 585a38cd45
Merge pull request #4000 from matrix-org/foldleft/12038-copy 
Update copy when the user verifies their own devices
 2020-01-31 09:57:52 +00:00
BobVul fde30577e4 Fix escaped markdown passing backslashes through 
Fixes https://github.com/vector-im/riot-web/issues/11230

Signed-off-by: Bob Rao <bob+git@vulpin.com>
 2020-01-31 12:33:57 +11:00