mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 22:22:03 +03:00
Code Issues Projects Releases Packages Wiki Activity
22393 commits 219 branches 562 tags 474 MiB
Commit graph

22393 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Travis Ralston
724cff6a2e Update QR code rendering to support VerificationRequests 
Makes for building the QR code easier and more common.
 2020-01-30 17:12:44 +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