mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 11:47:23 +03:00
Code Issues Projects Releases Packages Wiki Activity
20176 commits 217 branches 561 tags 411 MiB
Commit graph

20176 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
84eb72b0e0 fix alignment 2019-12-23 11:38:52 +00:00
Michael Telatynski
afcbb218fa match padding on CustomRoomTagPanel and fix colour of Communities btn 2019-12-23 11:31:30 +00:00
Michael Telatynski
661701f7ca Merge branches 'develop' and 't3chguy/tags_changes' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/tags_changes 
 Conflicts:
	src/components/views/elements/TagTile.js
 2019-12-23 11:00:42 +00:00
Weblate
245d83af43 Merge branch 'origin/develop' into Weblate. 2019-12-21 20:59:35 +00:00
Michael Telatynski
0b62f8a62f
Merge pull request #3759 from matrix-org/t3chguy/fix_room_list_filtering 
Fix room list filtering weird case sensitivity
 2019-12-21 20:59:29 +00:00
Michael Telatynski
24a1017d6d
Fix typo in comment 2019-12-21 20:26:32 +00:00
Weblate
69a077df29 Merge branch 'origin/develop' into Weblate. 2019-12-21 17:41:10 +00:00
Weblate
652998245c Merge branch 'origin/develop' into Weblate. 2019-12-21 17:41:08 +00:00
catborise
3dcef53b93 Translated using Weblate (Turkish) 
Currently translated at 33.8% (677 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2019-12-21 17:41:08 +00:00
Peter Vágner
9a51b41846 Translated using Weblate (Slovak) 
Currently translated at 77.8% (1556 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2019-12-21 17:41:03 +00:00
David Baker
25f59ed43d
Merge pull request #3758 from matrix-org/dbkr/hide_verify_if_verified 
Don't show the 'verify' button if the user is verified
 2019-12-21 17:41:01 +00:00
Szimszon
fef19c510c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-12-21 17:40:59 +00:00
Kévin C
0e7949d73e Translated using Weblate (French) 
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-12-21 17:40:57 +00:00
Jeff Huang
21dcf65858 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-12-21 17:40:57 +00:00
David Baker
8fbd35f1e9
Merge pull request #3757 from matrix-org/dbkr/switch_to_checkdevicetrust 
Switch to using checkDeviceTrust
 2019-12-21 17:40:50 +00:00
Michael Telatynski
e936f7eb09 Fix room list filtering weird case sensitivity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-21 11:13:37 +00:00
David Baker
376bf7e213 i18n 2019-12-20 16:56:38 +00:00
David Baker
a928b33f27 Don't show the 'verify' button if the user is verified 
Which is more in keeping with the designs (and we can do this now
that the new user info panel is only enabled with cross signing).
 2019-12-20 16:51:50 +00:00
David Baker
b998e6ffe8 Switch to using checkDeviceTrust 
In the UserInfo panel. This means we now use cross-signing
verifications in the UserInfoPanel so we can see our cross-signing
verifications working!

Lots more to do here: the remaining device.isVerified() calls in
UserInfoPanel are where it needs to be switched to verifying users
rather than devices, and of course we need to replace all the calls
to device.isVerified() with checkDeviceTrust everywhere else.
 2019-12-20 11:31:11 +00:00
Michael Telatynski
3a36d61fab delint 2019-12-19 21:10:22 +00:00
Michael Telatynski
d9ea9b4ad3 Iterate to match design on Zeplin 2019-12-19 20:53:34 +00:00
Weblate
970f16df3d Merge branch 'origin/develop' into Weblate. 2019-12-19 20:32:18 +00:00
Michael Telatynski
24d0d0d596
Merge pull request #3743 from matrix-org/t3chguy/react16_contexts 
Migrate away from React Legacy contexts API
 2019-12-19 20:32:11 +00:00
Weblate
5914553718 Merge branch 'origin/develop' into Weblate. 2019-12-19 20:18:34 +00:00
David Baker
a21fdb17fd
Merge pull request #3749 from matrix-org/dbkr/keybackup_migrate 
Migrate key backups to SSSS
 2019-12-19 20:18:28 +00:00
Michael Telatynski
b2249d0561 Initial rejig 2019-12-19 20:09:05 +00:00
David Baker
b98058fc3c Add bug for removing temporary srceen 2019-12-19 19:54:44 +00:00
David Baker
822762f014 add todo 2019-12-19 19:49:36 +00:00
Weblate
93c252fd02 Merge branch 'origin/develop' into Weblate. 2019-12-19 19:25:57 +00:00
Kévin C
372512b0c4 Translated using Weblate (French) 
Currently translated at 100.0% (1998 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-12-19 19:25:57 +00:00
Michael Telatynski
a410cc004f
Merge pull request #3745 from matrix-org/t3chguy/get_rid_of_emoji_stripped_data 
Get rid of stripped-emoji.json in favour of an in-memory single source of truth
 2019-12-19 19:25:50 +00:00
David Baker
48b166f451 Pass the key backup into the right thing 2019-12-19 17:28:32 +00:00
Weblate
f716f673a8 Merge branch 'origin/develop' into Weblate. 2019-12-19 17:27:46 +00:00
David Baker
290df9f50e
Merge pull request #3753 from matrix-org/dbkr/combine_cross_sig_dm_verif_feature_flags 
Combine cross signing and verification over DM feature flags
 2019-12-19 17:27:41 +00:00
Michael Telatynski
a25bc94343 remove unused, commented line of code 2019-12-19 17:22:02 +00:00
Weblate
86af43da6d Merge branch 'origin/develop' into Weblate. 2019-12-19 17:16:15 +00:00
Michael Telatynski
ba2078e262
Merge pull request #3754 from matrix-org/t3chguy/fuzzy_filter_room_list 
apply unhomoglyph when filtering room list to fuzzify it
 2019-12-19 17:16:09 +00:00
Weblate
4ee879ec08 Merge branch 'origin/develop' into Weblate. 2019-12-19 16:58:40 +00:00
Michael Telatynski
f3802bfd05
Merge pull request #3746 from matrix-org/t3chguy/emoji_picker 
Make EmojiPicker an unmanaged Context Menu as it is too complex to be managed
 2019-12-19 16:58:34 +00:00
Michael Telatynski
1c31fd3413 Apply new design to highlighted tags and add toggle mechanic 2019-12-19 16:54:30 +00:00
Weblate
f80d6e2877 Merge branch 'origin/develop' into Weblate. 2019-12-19 16:27:24 +00:00
Michael Telatynski
a13ee490e8
Merge pull request #3750 from matrix-org/t3chguy/m_too_large 
Internationalise M_TOO_LARGE error from Synapse
 2019-12-19 16:27:17 +00:00
Michael Telatynski
e54429680b tidy up 2019-12-19 15:28:11 +00:00
David Baker
c5e7594fe9 i18n 2019-12-19 15:27:29 +00:00
Michael Telatynski
26980e2ad5 apply unhomoglyph when filtering room list to fuzzify it 2019-12-19 15:26:04 +00:00
David Baker
3d8422c88a Combine cross signing and verification over DM feature flags 
This means we can just make the new member info panel support
cross-signing exclusively rather than having to try & make it
temporarily support both
 2019-12-19 15:23:32 +00:00
Weblate
07761c6813 Merge branch 'origin/develop' into Weblate. 2019-12-19 14:39:24 +00:00
Peter Vágner
00b66b4877 Translated using Weblate (Slovak) 
Currently translated at 75.0% (1498 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2019-12-19 14:39:23 +00:00
random
1010c0a27b Translated using Weblate (Italian) 
Currently translated at 99.9% (1997 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-12-19 14:39:19 +00:00
Samu Voutilainen
3f7ea3bc66 Translated using Weblate (Finnish) 
Currently translated at 95.5% (1909 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-12-19 14:39:17 +00:00