mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-25 04:05:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
21075 commits 206 branches 547 tags 601 MiB
Commit graph

21075 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
75f5326db2
Merge pull request #3932 from matrix-org/dbkr/reenable_stylelint 
Re-enable stylelint on CI
 2020-01-24 14:19:53 +00:00
David Baker
098d097922 Re-enable stylelint on CI 2020-01-24 14:03:31 +00:00
Weblate
5ed599f6d7 Merge branch 'origin/develop' into Weblate. 2020-01-24 13:54:56 +00:00
Zoe
543be90eda
Merge pull request #3931 from matrix-org/foldleft/12035-room-decoration-design-pass 
Design pass for room icons
 2020-01-24 13:54:51 +00:00
Damir Jelić
cbfde4d78f Merge branch 'poljar/seshat-filepanel' into develop 2020-01-24 14:44:24 +01:00
Weblate
b0bfef3b47 Merge branch 'origin/develop' into Weblate. 2020-01-24 13:44:01 +00:00
random
a46646105f Translated using Weblate (Italian) 
Currently translated at 100.0% (2057 of 2057 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-01-24 13:44:01 +00:00
Zoe
75da5b7944 Design pass for room icons 2020-01-24 13:37:47 +00:00
Weblate
6a1ab4fe17 Merge branch 'origin/develop' into Weblate. 2020-01-24 13:31:14 +00:00
random
be98f24051 Translated using Weblate (Italian) 
Currently translated at 98.8% (2032 of 2057 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-01-24 13:31:14 +00:00
David Baker
7de5f09f9f
Merge pull request #3928 from matrix-org/dbkr/split_out_asyncwrapper 
Split AsyncWrapper out from Modal
 2020-01-24 13:31:09 +00:00
Weblate
edc13aad82 Merge branch 'origin/develop' into Weblate. 2020-01-24 13:30:31 +00:00
random
6ebeb0a376 Translated using Weblate (Italian) 
Currently translated at 98.7% (2031 of 2057 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-01-24 13:30:31 +00:00
David Baker
330f606513
Merge pull request #3930 from matrix-org/bwindels/fixnoroom 
Fix error in verification code on develop
 2020-01-24 13:30:25 +00:00
Weblate
da2b29b6e5 Merge branch 'origin/develop' into Weblate. 2020-01-24 13:27:04 +00:00
Zoe
131aacd3ab
Merge pull request #3929 from matrix-org/zip/11840-tooltips-on-padlocks 
Seperates out the padlock icon, and adds a tooltip
 2020-01-24 13:26:59 +00:00
Damir Jelić
37f289b120 EventIndex: Add docstrings for the FilePanel methods. 2020-01-24 14:24:25 +01:00
Damir Jelić
3534cd4202 FilePanel: Add comments to explain what's going on with the event index. 2020-01-24 14:23:43 +01:00
Bruno Windels
66768416a6 dont assume the room exist ... not sure why though 2020-01-24 14:20:48 +01:00
Weblate
27ffa88ff8 Merge branch 'origin/develop' into Weblate. 2020-01-24 13:18:15 +00:00
Michael Telatynski
2c40b73ff6
Merge pull request #3910 from matrix-org/t3chguy/cross-signing-composer 
Cross Signing redesign for composer
 2020-01-24 13:18:09 +00:00
David Baker
590ff29e60 Unused import 2020-01-24 13:15:57 +00:00
David Baker
c5ecd83bc1 remove .orig file 2020-01-24 12:34:50 +00:00
David Baker
dbf1c9a02a Apparently i18n... 2020-01-24 12:34:03 +00:00
David Baker
688f7029d2 Split AsyncWrapper out from Modal 
So we can use it outside of modals & dialogs
 2020-01-24 12:28:03 +00:00
Zoe
a6fcbcacf6 Seperates out the padlock icon, and adds a tooltip 
Fixes https://github.com/vector-im/riot-web/issues/11840
 2020-01-24 12:06:21 +00:00
Weblate
f4e5b69aa3 Merge branch 'origin/develop' into Weblate. 2020-01-24 11:24:39 +00:00
Bruno Windels
b66154330c
Merge pull request #3927 from matrix-org/bwindels/fixverifyowndevice 
Fix verifying your own devices with to_device messages
 2020-01-24 11:24:33 +00:00
Weblate
423786807f Merge branch 'origin/develop' into Weblate. 2020-01-24 11:14:59 +00:00
Zoe
1d686fe49e
Merge pull request #3908 from matrix-org/zip/11935-room-list-decoration 
Room list reflects encryption state
 2020-01-24 11:14:53 +00:00
Bruno Windels
6cce65a2a5 fix lint 2020-01-24 12:08:47 +01:00
Damir Jelić
ecfecfe559 EventIndex: Fix a small style issue. 2020-01-24 12:07:03 +01:00
Zoe
395c82b1e5
Update src/components/structures/RoomView.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-24 11:04:40 +00:00
Bruno Windels
512bd4b0b2 show to_device verification in dialog, not right panel 
this also makes it work again, as the VerificationPanel doens't
know how to deal with requests that are already in PHASE_STARTED,
which was breaking verifying your own devices.
 2020-01-24 11:59:17 +01:00
Bruno Windels
2483337e89 don't use removed .event property anymore on verification request 2020-01-24 11:59:01 +01:00
Damir Jelić
029369a04b EventIndexPanel: Small style fix. 2020-01-24 11:56:43 +01:00
Damir Jelić
ee133a9c71 DisableEventIndexDialog: Remove an unused import. 2020-01-24 11:56:19 +01:00
Damir Jelić
0c3d507455 EventIndex: Cancel the crawler early after a message request. 
If we're cancelling the crawler nowadays this means that we're likely
deleting the index. Processing these messages is wasted effort in that
case so break early.
 2020-01-24 11:46:46 +01:00
Damir Jelić
ffe5d411db EventIndexPanel: Add a link to the download page of Riot Desktop. 2020-01-24 11:44:56 +01:00
Damir Jelić
38b1663755 EventIndex: Subclass the event emitter instead of putting one in a property. 2020-01-24 11:28:33 +01:00
Damir Jelić
6f919eaeec DisableEventIndexDialog: Use the correct spinner. 2020-01-24 11:27:56 +01:00
Weblate
b7c9f5307d Merge branch 'origin/develop' into Weblate. 2020-01-24 10:22:22 +00:00
Michael Telatynski
0078c2f099
Merge pull request #3914 from matrix-org/t3chguy/userinfo_scroll 
Make the entire User Info scrollable, sticky close button
 2020-01-24 10:22:17 +00:00
Damir Jelić
825b6f7b7d EventIndexPeg: Style fix for a docstring. 2020-01-24 11:16:49 +01:00
Damir Jelić
d9e933c915 EventIndex: Style fixes for the docstrings. 2020-01-24 11:15:57 +01:00
Damir Jelić
660240e2c0 EventIndexPanel: Use formatCount to format the room count. 2020-01-24 11:13:09 +01:00
Michael Telatynski
b72ab57e1b add <Tooltip/> to <E2EIcon/> 2020-01-24 10:13:03 +00:00
Damir Jelić
128c0b7300 ManageEventIndexDialog: Use formatCount to format the message and room count. 2020-01-24 11:11:53 +01:00
Damir Jelić
71024d1418 ManageEventIndexDialog: Properly indent the content of the BaseDialog. 2020-01-24 11:03:40 +01:00
Damir Jelić
cba7764784 DisableEventIndexDialog: Use the DialogButtons element for the buttons. 2020-01-24 11:00:28 +01:00