Commit graph

5124 commits

Author SHA1 Message Date
Michael Telatynski
5d0d81e79a not sure how I butchered this merge conflict resolution this much. 2021-06-03 19:37:26 +01:00
Michael Telatynski
93010d34fd
Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +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
Michael Telatynski
42a3ace82a Iterate PR based on feedback 2021-06-03 08:35:12 +01:00
Germain Souquet
bc50028f70 Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-06-02 13:57:33 +01:00
Germain
9d126c51e4
Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering 2021-06-02 11:41:59 +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
308ac505a8 Migrate AutoHideScrollbar to TypeScript
Also changed the way the React.RefObject is collected
2021-06-01 14:13:46 +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
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
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
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
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
Germain
b8a7d5d730
Better Set handling
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-05-27 09:23:56 +01:00
Germain Souquet
fbb6a42d86 fix reading Set length 2021-05-27 09:05:51 +01:00
Germain Souquet
2d15d66df8 Listen to home server sync update to remove pending rooms 2021-05-27 08:58:11 +01:00
Germain Souquet
be22a325f6 Prevent having duplicates in pending room state 2021-05-27 08:57:27 +01:00
Germain Souquet
c7c6a818f0 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-26 09:51:27 +01:00
Michael Telatynski
231e39a965 Fix accessing currentState on an invalid joinedRoom 2021-05-25 17:26:43 +01:00
Michael Telatynski
830ad47e87
Merge pull request #6097 from matrix-org/t3chguy/allSettled
Remove Promise allSettled polyfill as js-sdk uses it directly
2021-05-25 17:11:06 +01:00
Michael Telatynski
c1f397dcf7 delint 2021-05-25 16:20:23 +01:00
Michael Telatynski
17bbbff479 Remove Promise allSettled polyfill as its widespread enough now and js-sdk uses it directly 2021-05-25 16:12:34 +01:00
Michael Telatynski
59f4c728c9 Initial cut of Pinned event card in the right panel 2021-05-25 16:10:44 +01:00
Germain Souquet
b09dd8f1f8 remove unused values 2021-05-25 14:54:27 +01:00
Germain Souquet
7303166924 fix sticky headers when results num get displayed 2021-05-25 13:53:20 +01:00
Michael Telatynski
152c178ea9 Convert NotificationPanel to Typescript 2021-05-25 12:15:37 +01:00
Michael Telatynski
170b11d130 Convert RightPanel to Typescript 2021-05-25 12:13:16 +01:00
Germain
1751b4ba43
Merge pull request #6092 from matrix-org/gsouquet/window-dimensions-reflow 2021-05-25 12:00:08 +01:00
Michael Telatynski
5980528f30
Merge pull request #6089 from matrix-org/t3chguy/fix/17336
Use local room state to render space hierarchy if the room is known
2021-05-25 11:59:09 +01:00
Germain Souquet
f156c2db15 prevent reflow in app when accessing window dimensions 2021-05-25 10:28:43 +01:00
Germain Souquet
ac93cc514f Prevent layout trashing when resizing the window 2021-05-25 10:28:20 +01:00
David Schilling
5c674365d3 Add url param defaultUsername to prefill the login username field
Signed-off-by: David Schilling <dschilling@churchtools.de>
2021-05-25 10:39:33 +02:00