PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
20335 commits 1 branch 0 tags 338 MiB
Commit graph

20335 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Michael Telatynski
709b2eed7c Add bunch of null-guards and similar to fix React Errors/complaints 2019-12-19 15:10:54 +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
Michael Telatynski
29523000dc
Merge pull request #3748 from matrix-org/t3chguy/avatar_userinfo 
Replace UserInfo avatar with <MemberAvatar/> for fallback logic
 2019-12-19 14:39:11 +00:00
Michael Telatynski
db069b9602 delint 2019-12-19 14:33:46 +00:00
Michael Telatynski
6c1944359e Add RoomTile online indicator to DMs 2019-12-19 14:29:46 +00:00
Michael Telatynski
3678e64f5d Internationalise M_TOO_LARGE error from Synapse 2019-12-19 13:25:43 +00:00
Michael Telatynski
66783dff9e Fix scaling of the avatar in UserInfo 2019-12-19 12:27:25 +00:00
David Baker
6851ad04b6 Migrate key backups to SSSS 
If there's a key backup set up when we bootstrap SSSS, use its key
for SSSS and add the key backup key as a passthrough secret.

Requires https://github.com/matrix-org/matrix-js-sdk/pull/1128
Fixes https://github.com/vector-im/riot-web/issues/11210
 2019-12-19 11:26:20 +00:00
Michael Telatynski
4fe0150944 Regen yarn.lock 2019-12-19 10:51:55 +00:00
Michael Telatynski
affc8b8459 Merge branches 'develop' and 't3chguy/jest' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/jest 
 Conflicts:
	yarn.lock
 2019-12-19 10:50:14 +00:00
Michael Telatynski
3196655524 Replace UserInfo avatar with <MemberAvatar/> for fallback logic 2019-12-19 10:42:47 +00:00
Michael Telatynski
a1df87a375 Make EmojiPicker an unmanaged Context Menu as it is too complex to be managed 2019-12-19 07:23:05 +00:00
David Baker
a5d5569af4 Translated using Weblate (Japanese) 
Currently translated at 59.3% (1184 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2019-12-18 21:46:59 +00:00
Michael Telatynski
d35b01b63a Get rid of stripped-emoji.json in favour of an in-memory single truth source 2019-12-18 15:40:19 +00:00
Michael Telatynski
513ec30ef1 Fix tests v2 2019-12-17 18:02:45 +00:00
Michael Telatynski
f3ca4c0b7c fix tests 2019-12-17 17:54:19 +00:00
Travis Ralston
38e75aaae0
Merge pull request #3722 from matrix-org/travis/babel7 
[BREAKING] Refactor the entire build process for babel@7 and TypeScript (chunk 1 of many)
 2019-12-17 10:44:20 -07:00
Weblate
ce995d1a1e Merge branch 'origin/develop' into Weblate. 2019-12-17 17:39:47 +00:00
Michael Telatynski
f30e919f9e
Merge pull request #3741 from matrix-org/t3chguy/dropdown_keyboard_propagation 
Dropdown stop keyboard propagation if key handled
 2019-12-17 17:39:41 +00:00
Michael Telatynski
da4d72b3c4 delint 2019-12-17 17:34:03 +00:00
Michael Telatynski
b094f0fe47 delint 2019-12-17 17:31:29 +00:00
Michael Telatynski
937b32663c Migrate away from Legacy React Contexts 2019-12-17 17:26:12 +00:00
Weblate
7811bd8859 Merge branch 'origin/develop' into Weblate. 2019-12-17 17:02:41 +00:00
Travis Ralston
1a44f01f0a
Merge pull request #3742 from matrix-org/travis/rp-memberinfo 
Fix right panel for multiple member info viewings
 2019-12-17 10:02:35 -07:00
Michael Telatynski
2e8d66fa36 Null-guard member mention pills for rooms you have left (notif panel) 2019-12-17 16:54:59 +00:00