OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
20,077 Commits
209 Branches
549 Tags
652 MiB
Commit Graph

20077 Commits (92fb6fcdc293267d8cbcc5ba51244610ebd646e1)

Author SHA1 Message Date
David Baker 822762f014 add todo 2019-12-19 19:49:36 +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
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
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
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
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 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 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
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
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
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
Travis Ralston 16181ff0ed Fix right panel for multiple member info viewings 
Fixes https://github.com/vector-im/riot-web/issues/11663

Member info is special because it has parameters associated with it. What was happening was the RightPanelStore was seeing that it was already on member info and deciding to hide the pane instead. What we do now is consider any phase change with parameters (such as the user to pass to member info) as a proper phase change.
 2019-12-17 09:47:06 -07:00
Michael Telatynski 3f5dc4fcdc
Merge pull request #3740 from matrix-org/t3chguy/field_validation_async_tooltip_sticks 
Fix Field validation tooltip sticking if blurred before async validation resolved
 2019-12-17 16:45:48 +00:00
Michael Telatynski 7f78f55c94 Dropdown stop keyboard propagation if key handled 2019-12-17 15:14:01 +00:00
Michael Telatynski 0c89ab9fb5
Merge pull request #3738 from matrix-org/t3chguy/null-guard-useIsEncrypted 
Fix UserInfo exploding without a room being passed to it
 2019-12-17 15:13:59 +00:00
Travis Ralston 590ef79300
Merge pull request #3737 from matrix-org/travis/room-dir 
Fix room directory maintaining and error state
 2019-12-17 08:07:12 -07:00
Michael Telatynski 0e86c2648d improve comment 2019-12-17 14:36:20 +00:00
Michael Telatynski 213bc4c3ac Fix Field validation tooltip sticking if blurred before async validation resolved 2019-12-17 14:28:18 +00:00
Michael Telatynski c1133ebfc6 null-guard useIsEncrypted 2019-12-17 14:05:51 +00:00
Michael Telatynski 0140338ac5
Merge pull request #3735 from matrix-org/t3chguy/address_picker_dialog_tab_trap 
Stop trapping tab in AddressPickerDialog
 2019-12-17 10:07:12 +00:00
Michael Telatynski 17463c401f post-merge fix 2019-12-17 09:58:04 +00:00
Michael Telatynski d7a411f588
Merge branch 'develop' into t3chguy/address_picker_dialog_tab_trap 2019-12-17 09:57:28 +00:00
Michael Telatynski 3a8ab6ec2b
Merge pull request #3736 from matrix-org/t3chguy/stop_using_deprecated_keyCode 
Stop using KeyboardEvent.keyCode as it is deprecated
 2019-12-17 09:55:13 +00:00
Travis Ralston b2a1a40961 Fix room directory maintaining and error state 
Fixes https://github.com/vector-im/riot-web/issues/11665

We weren't clearing the error from a previous lookup, which effectively prevented the UI from working after an error happened.
 2019-12-16 16:47:33 -07:00
Michael Telatynski dd216d1b3a
Merge pull request #3733 from matrix-org/t3chguy/remove_avatar_2.0 
Implement new design for uploading/removing avatars
 2019-12-16 17:25:27 +00:00
Michael Telatynski eaabe351d9 Stop trapping tab in AddressPickerDialog 2019-12-16 17:23:56 +00:00
Michael Telatynski 3b0f8233e8 delint 2019-12-16 17:22:00 +00:00
Michael Telatynski d28a892bb0 Stop using KeyboardEvent.keyCode as it is deprecated 2019-12-16 17:14:03 +00:00
Michael Telatynski 7b4ad61bea post-merge fix 2019-12-16 16:23:35 +00:00
Michael Telatynski bf06b1f379 Merge branches 'develop' and 't3chguy/remove_avatar_2.0' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/remove_avatar_2.0 
 Conflicts:
	res/css/views/settings/_ProfileSettings.scss
 2019-12-16 16:23:25 +00:00
Michael Telatynski 3ec60b1692
Merge pull request #3731 from matrix-org/t3chguy/avatar_fixes 
Fix aspect ratio on room/profile avatar preview
 2019-12-16 16:22:51 +00:00