OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
20,024 Commits
217 Branches
561 Tags
439 MiB
Commit Graph

20024 Commits (378a82e6fb760657b5f77c1d13cad81c298af0da)

Author SHA1 Message Date
Michael Telatynski 378a82e6fb Use html-entities instead 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 22:22:09 +00:00
Michael Telatynski 4489b5a21a Escape HTML in og:description and render any html &-encoded entities 2019-12-28 20:05:55 +00:00
Travis Ralston 6ef6b5909f
Merge pull request #3787 from matrix-org/travis/membership-tile 
Fix NPE when filtering the room list
 2019-12-27 11:37:38 -07:00
Travis Ralston 98571d706f Fix NPE when searching for rooms 
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3751
 2019-12-27 11:31:15 -07:00
Michael Telatynski e9658a9e9e
Merge pull request #3782 from matrix-org/t3chguy/room_settings_alias_input 
Turn RoomAliasField into properly controlled and use in RoomSettings
 2019-12-27 17:19:26 +00:00
Michael Telatynski eac66f020f
Merge pull request #3783 from matrix-org/t3chguy/fuzzy_sort_memberlist 
fuzzy-sort MemberList
 2019-12-27 17:19:19 +00:00
Michael Telatynski aa990462ce delint 2019-12-27 17:05:51 +00:00
Michael Telatynski f9e386adaa Improve SORT_REGEX 2019-12-27 17:04:14 +00:00
Michael Telatynski c79bd791d6
Merge pull request #3786 from matrix-org/t3chguy/serialize_file_uploads 
Serialize file uploads into room to match confirmation dialog order
 2019-12-27 16:58:42 +00:00
Michael Telatynski 05911881c2
Merge pull request #3785 from matrix-org/t3chguy/search_unread_messages 
Do not show Top Unread Messages Bar and Jump to bottom button if searching
 2019-12-27 16:52:56 +00:00
Michael Telatynski 2b39f3bdf1
Merge pull request #3784 from matrix-org/t3chguy/fix_stickerPickerChevronOffset 
Fix sticker picker chevron offset calculation
 2019-12-27 16:52:46 +00:00
Michael Telatynski 4984dd6f92
Merge pull request #3781 from matrix-org/t3chguy/user_info 
Fix not being able to promote others to the same power level as your own
 2019-12-27 16:52:23 +00:00
Michael Telatynski 9bdadd2103
Merge pull request #3751 from matrix-org/t3chguy/react16_contexts_online_dot 
Room Tile DMs online/active green dot
 2019-12-27 16:50:21 +00:00
Michael Telatynski 9f948b5da3 Serialize file uploads into room to match confirmation dialog order 2019-12-27 13:59:57 +00:00
Michael Telatynski e9ebfa100f Do not show Top Unread Messages Bar and Jump to bottom button if searching 2019-12-26 20:32:25 +00:00
Michael Telatynski ed24f19a3f Fix stick picker chevron offset calculation 2019-12-26 20:12:50 +00:00
Michael Telatynski 06230e01e3 Fix End-to-End tests for RoomSettings interactivity 2019-12-26 19:36:16 +00:00
Michael Telatynski ab12288979 Add more punctuation to regex 2019-12-26 19:29:25 +00:00
Michael Telatynski e320f64ba1 fuzzy-sort MemberList 2019-12-26 19:27:04 +00:00
Michael Telatynski ebf7eb698d Turn RoomAliasField into properly controlled and use in RoomSettings 2019-12-26 18:52:57 +00:00
Michael Telatynski e95b67e101 Only show it if exactly 2 members, until we get Canonical DMs 2019-12-26 18:15:08 +00:00
Michael Telatynski 22fe0add3c Make UserOnlineDot more generic 2019-12-26 18:14:46 +00:00
Michael Telatynski 115e773317
Merge pull request #3780 from ps0305/ps0305-patch-1 
Fix spelling and grammar in README
 2019-12-26 18:05:47 +00:00
Michael Telatynski 73800c9a92 Fix UserInfo promote user inverted buttons 2019-12-26 18:04:58 +00:00
Pankaj Kumar Singh a9cae90a52 Signed-off-by Pankaj Singh <singh.pankaj@live.com 2019-12-26 23:11:17 +05:30
Travis Ralston e7eac2ec85
Merge pull request #3776 from matrix-org/travis/fix-resizer 
Reintroduce working resizer code for right panel
 2019-12-25 15:16:03 -07:00
Travis Ralston 92ea1157be Reintroduce working resizer code for right panel 
Fixes https://github.com/vector-im/riot-web/issues/11674

This re-introduces and adapted version of what was there before, but fixed for the new collapsed logic: https://github.com/matrix-org/matrix-react-sdk/pull/3703/files#diff-633a0248e235d7446a8868a9145efce2L77-L93

We no longer have a collapsedRhs variable and only set the panel when it is opened, so we can accurately track expanded/collapsed state through presence of a panel.
 2019-12-23 19:26:59 -07:00
Michael Telatynski 8c70eda517
Merge pull request #3775 from matrix-org/t3chguy/fix_TopLeftMenu_help 
Fix wrong scope binding on openHelp for TopLeftMenu
 2019-12-23 19:40:02 +00:00
Michael Telatynski 25d864c39d Fix wrong scope binding on openHelp for TopLeftMenu 2019-12-23 19:29:43 +00:00
Michael Telatynski 23b9b98f7b
Merge pull request #3774 from matrix-org/t3chguy/userinfo_tweaks 
UserInfo hide kick/mute buttons if they make no sense
 2019-12-23 18:33:05 +00:00
Michael Telatynski 0497ef228d UserInfo hide kick/mute buttons if they make no sense 2019-12-23 18:20:59 +00:00
Michael Telatynski 659644e612
Merge pull request #3773 from matrix-org/t3chguy/fix_incoming_call_dup 
Fix duplicate Incoming Call prompt on Community Invite sublist
 2019-12-23 18:10:51 +00:00
Michael Telatynski e552195701 Fix duplicate Incoming Call prompt on Community Invite sublist 2019-12-23 17:57:53 +00:00
Michael Telatynski 6e9791c950
Merge pull request #3755 from matrix-org/t3chguy/tags_changes 
Apply new design to highlighted tags and add toggle mechanic
 2019-12-23 17:18:07 +00:00
Michael Telatynski 1098fc939a
Merge pull request #3771 from matrix-org/t3chguy/ReactDOM.findDOMNode 
stop using ReactDOM.findDOMNode in componentWillUnmount, use refs
 2019-12-23 17:16:47 +00:00
Michael Telatynski 1da55c530b
Merge pull request #3772 from matrix-org/t3chguy/alts 
Add alt="" to presentational images
 2019-12-23 17:15:58 +00:00
Michael Telatynski 8018097e56 Add alt="" to presentational images 2019-12-23 14:13:56 +00:00
Michael Telatynski 207045e979 fix ReadReceiptMarker ref 2019-12-23 12:54:31 +00:00
Michael Telatynski 17f5849985 stop using ReactDOM.findDOMNode in componentWillUnmount, use refs 2019-12-23 12:24:49 +00:00
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
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
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
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