Commit graph

13698 commits

Author SHA1 Message Date
Michael Telatynski
93010d34fd
Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +01:00
David Baker
7421efe8f9
Merge pull request #6136 from matrix-org/dbkr/map_phone_number_lookup_to_native
Map phone number lookup results to their native rooms
2021-06-03 19:01:46 +01:00
Germain
a36063704d
Merge pull request #6138 from matrix-org/gsouquet/containment-event
Fix mx_Event containment rules and empty read avatar row
2021-06-03 16:38:55 +01:00
David Baker
8ef95a6237 Interface dispatcher payload
& use constant in test
2021-06-03 14:38:13 +01:00
Germain
7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Michael Telatynski
4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606
 Conflicts:
	src/components/structures/RoomView.tsx
	src/components/views/right_panel/UserInfo.tsx
2021-06-03 08:42:05 +01:00
Michael Telatynski
83d223475b delint imports 2021-06-03 08:41:22 +01:00
Germain Souquet
a34f8a29f4 fix mx_Event containment rules and empty read avatar row 2021-06-03 08:41:12 +01:00
Michael Telatynski
4765216280 Merge branch 't3chguy/fix/6606' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 2021-06-03 08:36:04 +01:00
Michael Telatynski
42a3ace82a Iterate PR based on feedback 2021-06-03 08:35:12 +01:00
Michael Telatynski
53fc475539
Update src/components/views/rooms/PinnedEventTile.tsx
Co-authored-by: Travis Ralston <travisr@matrix.org>
2021-06-03 08:03:31 +01:00
David Baker
2c4fa73a45 Map phone number lookup results to their native rooms
When dialing a phone number, also look to see if there's a corresponding
native user for the resulting user, and if so, go to the native room
for that user.
2021-06-02 17:39:13 +01:00
Michael Telatynski
4290237bdf
Merge pull request #6135 from matrix-org/t3chguy/fix/17494
ignore hash/fragment when de-duplicating links for url previews
2021-06-02 15:08:41 +01:00
Germain Souquet
bc50028f70 Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-06-02 13:57:33 +01:00
Michael Telatynski
bc89cf14dd ignore hash/fragment when de-duplicating links for url previews 2021-06-02 11:53:47 +01:00
Germain
9d126c51e4
Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering 2021-06-02 11:41:59 +01:00
Germain
96f5d3af05
Merge pull request #6130 from matrix-org/gsouquet/member-list-sort 2021-06-02 11:40:52 +01:00
Germain Souquet
82fe9a5c7b remove unused import 2021-06-02 10:48:18 +01:00
Germain Souquet
d7a5547d80 use Intl.Collator over String.prototype.localeCompare for better performance 2021-06-02 10:42:17 +01:00
Michael Telatynski
a1ff060138
Merge pull request #6123 from matrix-org/t3chguy/fix/17517
Update way of checking for registration disabled
2021-06-01 15:20:21 +01:00
Michael Telatynski
4e6f1e6294 add comment 2021-06-01 15:00:59 +01:00
Germain Souquet
591314141b Add methods visibility for AutoHideScrollbar 2021-06-01 14:15:42 +01:00
Germain Souquet
73ca6b2ad0 Add passive flag to Tooltip scroll event listener 2021-06-01 14:14:02 +01:00
Germain Souquet
308ac505a8 Migrate AutoHideScrollbar to TypeScript
Also changed the way the React.RefObject is collected
2021-06-01 14:13:46 +01:00
Michael Telatynski
c6c1e09cae
Merge pull request #6126 from matrix-org/t3chguy/fix/rs5384
Fix the ability to remove avatar from a space via settings
2021-06-01 12:11:10 +01:00
Michael Telatynski
72fab80bb9
Merge pull request #6125 from matrix-org/t3chguy/fix/17521
Switch to stable endpoint/fields for MSC2858
2021-06-01 12:07:41 +01:00
J. Ryan Stinnett
173b0e9d78
Merge pull request #6117 from SimonBrandner/fix/down-arrow-edit/17491
Clear stored editor state when canceling editing using a shortcut
2021-06-01 12:07:23 +01:00
Michael Telatynski
6e74ab0cf5 Fix the ability to remove avatar from a space via settings 2021-06-01 11:11:04 +01:00
Michael Telatynski
f11a7083ae Switch to stable endpoint/fields for MSC2858 2021-06-01 11:01:09 +01:00
Michael Telatynski
e525d046c7 remove outdated TODO 2021-06-01 10:49:19 +01:00
Michael Telatynski
b2f01b8438 Respect newlines in space topics 2021-06-01 10:48:53 +01:00
Michael Telatynski
826efeaeaa Update way of checking for registration disabled
Spec says 403 + M_FORBIDDEN
2021-06-01 10:22:24 +01:00
J. Ryan Stinnett
a8b6094482
Merge pull request #5674 from churchtools/default-username
Add url param `defaultUsername` to prefill the login username field
2021-06-01 10:12:31 +01:00
Germain Souquet
d894cc6f7a Merge branch 'develop' into gsouquet/switch-rooms 2021-06-01 09:02:28 +01:00
Šimon Brandner
d72c773e2d
clearStoredEditorState when canceling editing using a shortcut
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-29 08:26:53 +02:00
Germain Souquet
fd69fce1ba guard event listener from null values 2021-05-28 17:37:29 +01:00
Germain Souquet
f10e95956b Use passive option for scroll handler 2021-05-28 14:59:14 +01:00
Germain
71b217e4a1
Merge pull request #6110 from matrix-org/gsouquet/sticky-header-sizing 2021-05-28 14:49:49 +01:00
Germain Souquet
650b683761 Reposition sticky headers when layout has changed 2021-05-28 10:31:42 +01:00
Germain Souquet
29c4d9ffd0 Restore toggle LHS logic 2021-05-28 10:03:46 +01:00
Germain Souquet
1a51ed9ffd Make breadcrumb animation run on the compositing layer 2021-05-28 09:34:08 +01:00
Michael Telatynski
890ac14090
Merge pull request #6105 from matrix-org/t3chguy/invitedialog
Avoid showing warning modals from the invite dialog after it unmounts
2021-05-27 23:07:47 +01:00
Michael Telatynski
eef15394f2 extract buildRecents return type into an interface 2021-05-27 17:00:48 +01:00
Germain Souquet
aaca71b316 Reintroduce sticky header width 2021-05-27 12:44:53 +01:00
Germain Souquet
fcae19f831 Track left panel width using ResizeObserver 2021-05-27 12:36:16 +01:00
Michael Telatynski
086ce7c621
Merge pull request #6109 from matrix-org/t3chguy/fix/17387
Fix misleading child counts in spaces
2021-05-27 12:35:00 +01:00
Michael Telatynski
526bde4d9e
Merge pull request #6090 from matrix-org/t3chguy/fix/17257
Close creation menu when expanding space panel via expand hierarchy
2021-05-27 11:41:55 +01:00
Germain Souquet
51d88062f9 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-27 10:22:16 +01:00
Michael Telatynski
d6d0922753 Fix misleading child counts in spaces 2021-05-27 10:11:28 +01:00
Germain Souquet
f31ec343f4 Use Set::size instead of Array.from()::length 2021-05-27 09:26:31 +01:00