Commit graph

21418 commits

Author SHA1 Message Date
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
David Baker
5447a04f8e oops, forgot the component 2020-01-30 20:15:15 +00:00
David Baker
39e9bffe1f Make encryption events into bubble-style tiles
Factors out the verification tile stuff into encryption event
styles so we can reuse them betwen all the encryption event tiles.
Also makes the event list summary stuff even more gnarly by
putting the encryption event tile above the group. We really need
to refactor that. :/

Fixes https://github.com/vector-im/riot-web/issues/12006
2020-01-30 20:03:26 +00:00
Michael Telatynski
bc71092b81 Use Sets instead of array scans and simplify hiding of invalid users to invite
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-30 19:27:59 +00:00
Michael Telatynski
b84fd245b1 Fix room completion for invited rooms and upgraded rooms
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-30 18:03:45 +00:00
Zoe
e58b59c26e don't tell users to verify themselves in person 2020-01-30 16:41:25 +00:00
J. Ryan Stinnett
bae35c0859 Change power icon to label instead 2020-01-30 16:40:25 +00:00
J. Ryan Stinnett
ceebb7dc55 Remove unused Entities, UserTile modules 2020-01-30 16:40:25 +00:00
Zoe
f787bde80a copy 2020-01-30 16:36:57 +00:00
Weblate
c5306fd7b6 Merge branch 'origin/develop' into Weblate. 2020-01-30 16:30:24 +00:00
David Baker
8a09cfbfbd
Merge pull request #3999 from matrix-org/dbkr/user_info_black_shields
Make shields in UserInfo black if user isn't verified
2020-01-30 16:30:19 +00:00
Zoe
a9d85e1fa3 lint 2020-01-30 16:27:35 +00:00
David Baker
4f62fc16bd lint 2020-01-30 16:19:04 +00:00
Weblate
a92b14c7ab Merge branch 'origin/develop' into Weblate. 2020-01-30 16:13:00 +00:00
J. Ryan Stinnett
ddc628c804
Merge pull request #3994 from matrix-org/jryans/verify-user-text
Change verify user text
2020-01-30 16:12:55 +00:00
Zoe
4a3ea30e52 copy for verification screen 2020-01-30 16:11:05 +00:00
David Baker
77618d30fd Actually this is green because it's a link
not because the things were verified. Use the linkButton class
2020-01-30 16:08:42 +00:00
Zoe
9f5f15d1d3 Update copy when the user verifies their own devices 2020-01-30 15:59:59 +00:00
David Baker
0956d00637 Make shields in UserInfo black if user isn't verified 2020-01-30 15:59:03 +00:00
Zoe
99b04a6f70 lint 2020-01-30 15:41:26 +00:00
Zoe
49d2ed8906 ... and take action when the counter reaches zero in verification toast 2020-01-30 15:37:44 +00:00
Zoe
7e98ea79d2 Fix verification toast timeouts to not stick at 0
Fixes: https://github.com/vector-im/riot-web/issues/12038
2020-01-30 15:31:20 +00:00
Weblate
e94af1e643 Merge branch 'origin/develop' into Weblate. 2020-01-30 15:19:38 +00:00
Zoe
f6e2f3082e
Merge pull request #3996 from matrix-org/foldleft/12097-lock-login-inputs
Disable all inputs in login form while busy, not just the submit button
2020-01-30 15:19:32 +00:00
Zoe
318689f40b Disable all inputs in login form while busy, not just the submit button 2020-01-30 15:06:36 +00:00
J. Ryan Stinnett
788cb24093 Add advanced option to keep secret storage in memory for session
This adds a default-off option to keep the secret storage passphrase cached in
memory for the current session to avoid death by prompts.
2020-01-30 14:18:12 +00:00
J. Ryan Stinnett
fd5798aa87 Change verify user text 2020-01-30 13:21:51 +00:00
Weblate
e18e01217c Merge branch 'origin/develop' into Weblate. 2020-01-30 13:10:37 +00:00
Zoe
767015d19d
Merge pull request #3993 from matrix-org/foldleft/12106-round-two
fix SAS dialog width
2020-01-30 13:10:32 +00:00
Weblate
ae57feaf70 Merge branch 'origin/develop' into Weblate. 2020-01-30 13:08:47 +00:00
J. Ryan Stinnett
9c8ffb6c4e
Merge pull request #3990 from matrix-org/t3chguy/fix_composer_placeholder
Update placeholder in the composer when it gets changed
2020-01-30 13:08:42 +00:00
Zoe
4c1cc6feba fix SAS dialog width
used fixedWidth to accomplish the same goal

clean up css
2020-01-30 12:48:41 +00:00
Weblate
4de9a2074e Merge branch 'origin/develop' into Weblate. 2020-01-30 11:53:34 +00:00