OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
21,451 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

21451 Commits (5267dbf44aa3a1aa88bb610ac3f2831cd3231f1a)

Author SHA1 Message Date
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
Stasiek Michalski bf9f473ed9 Add a class for styling room directory permissions 
Fixes vector-im/riot-web#11174
 2020-01-31 00:09:08 +01:00
Weblate 29ad4baea6 Merge branch 'origin/develop' into Weblate. 2020-01-30 22:43:25 +00:00
J. Ryan Stinnett 6f6d6b096a Ensure QR code, verified hero are centered 2020-01-30 22:43:14 +00:00
J. Ryan Stinnett 5c4b91457e Fix tests 2020-01-30 22:28:56 +00:00
J. Ryan Stinnett 673fb792e5 Remove unused power level icons 2020-01-30 22:09:57 +00:00
J. Ryan Stinnett 3ef7e5113b Move power label to right of name 
The power label is shown to the right of the name, but hidden on hover.

Part of https://github.com/vector-im/riot-web/issues/11940
 2020-01-30 22:09:57 +00:00
J. Ryan Stinnett 5933bd15b1 Remove strange size change on member hover 
Unclear why this is here, but removing as it feels quite glitchy, esp on
matrix.org where there's no second line to print.
 2020-01-30 21:46:49 +00:00
J. Ryan Stinnett 57c4293fc6 Add verification status icons to room members 
This displays verification status on each room member tile using the same shield
logic as elsewhere.

Part of https://github.com/vector-im/riot-web/issues/11940
 2020-01-30 21:38:40 +00:00
Weblate 246a4406c9 Merge branch 'origin/develop' into Weblate. 2020-01-30 21:16:56 +00:00
Michael Telatynski b98b0fe478
Merge pull request #4004 from matrix-org/t3chguy/invite 
Use Sets instead of array scans and simplify hiding of invalid users when inviting
 2020-01-30 21:16:51 +00:00
Weblate 813114390f Merge branch 'origin/develop' into Weblate. 2020-01-30 21:16:12 +00:00
Michael Telatynski 3a9acb55e7
Merge pull request #4003 from matrix-org/t3chguy/room_complete 
Fix room completion for invited rooms and upgraded rooms
 2020-01-30 21:16:06 +00:00
Michael Telatynski 7db6f89a9f hmm, there were two things using the client :(( 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-30 21:07:32 +00:00
Michael Telatynski 1e09399dd6 delint and collapse two consecutive filter operations 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-30 21:01:55 +00:00
Michael Telatynski 7e45979e00 change order of if or conditions as micro-optimization 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-30 20:59:30 +00:00
David Baker 58d16fea7d lint 2020-01-30 20:59:27 +00:00
David Baker d56de6a673 i18n again 2020-01-30 20:52:37 +00:00
David Baker f84795ebae Remove now unused code from TextForEvent 2020-01-30 20:50:12 +00:00
David Baker 5760e71318 i18n 2020-01-30 20:50:06 +00:00
David Baker 2332cdb5d8
full stop 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-30 20:47:46 +00:00