Commit graph

4995 commits

Author SHA1 Message Date
Robin Townsend
c39d9649ba Merge branch 'develop' into improved-forwarding-ui 2021-05-10 13:38:02 -04:00
Michael Telatynski
70d7a59ea2
Merge pull request #5969 from matrix-org/t3chguy/fix/17044.1
Switch the Home Space out for an All rooms space
2021-05-10 16:26:05 +01:00
Robin Townsend
7fa81766db Remove old forwarding code
This has been replaced by ForwardDialog.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-08 21:11:06 -04:00
Michael Telatynski
6338ced8a3
Merge pull request #5977 from matrix-org/t3chguy/fix/17176
Iterate Spaces admin UX around room management
2021-05-07 11:47:45 +01:00
Michael Telatynski
6137162786 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17044.1
 Conflicts:
	src/stores/room-list/RoomListStore.ts
2021-05-07 10:40:07 +01:00
Michael Telatynski
4079b03ae0 Bring back filter all spaces behaviour 2021-05-07 10:39:35 +01:00
Michael Telatynski
6f28964b49
Merge pull request #5979 from matrix-org/t3chguy/spaces-logs
Guard all isSpaceRoom calls behind the labs flag
2021-05-07 10:28:14 +01:00
Michael Telatynski
d9912651d6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176
 Conflicts:
	src/components/structures/SpaceRoomDirectory.tsx
2021-05-06 13:06:50 +01:00
Michael Telatynski
d47eecbd24 Make button sizes more consistent and fix untrapped behaviour of join button leaking to parent 2021-05-06 13:05:58 +01:00
J. Ryan Stinnett
683aec1066
Merge pull request #5833 from SimonBrandner/feed
Support for multiple streams (not MSC3077)
2021-05-06 11:20:09 +01:00
Michael Telatynski
9518e4d415 Guard all isSpaceRoom calls behind the labs flag 2021-05-05 23:59:07 +01:00
Michael Telatynski
68210b1415
Merge pull request #5963 from matrix-org/t3chguy/fix/17119
Update space ordering behaviour to match updates in MSC
2021-05-05 22:26:45 +01:00
Michael Telatynski
650933096a Iterate Spaces admin UX around room management 2021-05-05 17:25:29 +01:00
Michael Telatynski
886959f32d port rate limiting code over to space creation wizard's add existing rooms 2021-05-05 11:54:14 +01:00
Michael Telatynski
a70be45b6e Experiment switching the Home Space out for an All rooms space 2021-05-04 18:26:49 +01:00
Michael Telatynski
ac61c8eca8 Adhere to updated sort order for space children 2021-05-04 12:27:27 +01:00
Jaiwanth
54e139a6ad Generate previews when the room tile is maximised 2021-05-03 23:17:10 +05:30
Michael Telatynski
8dbcc85249
Merge pull request #5944 from matrix-org/t3chguy/fix/17043
Inhibit sending RR when context switching to a room
2021-04-30 15:13:18 +01:00
Michael Telatynski
39ccecab03
Merge pull request #5950 from matrix-org/t3chguy/fix/17117
Prevent room list keyboard handling from landing focus on hidden nodes
2021-04-30 12:55:27 +01:00
Michael Telatynski
0008ef7ab1
Merge pull request #5942 from matrix-org/t3chguy/fix/16998
Make the text filter search all spaces instead of just the selected one
2021-04-30 12:53:38 +01:00
Michael Telatynski
43410835a3 Prevent room list keyboard handling from landing focus on hidden nodes 2021-04-30 11:53:56 +01:00
Šimon Brandner
2e62b18617
Revert some changes to avoid re-translation
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-30 12:30:14 +02:00
Šimon Brandner
c6bd2c7d67
Fix some more formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 20:18:26 +02:00
Šimon Brandner
5913203dc6
Merge branch 'develop' into fix-indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 20:08:14 +02:00
Šimon Brandner
232b87a3b4
Improve formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 19:57:02 +02:00
Michael Telatynski
73abe51fb9 actually use the new state 2021-04-29 16:46:21 +01:00
Michael Telatynski
62198601d2 Tweak room list filter placeholder and results copy for spaces 2021-04-29 16:40:08 +01:00
Michael Telatynski
e390c3c732 Inhibit sending RR when context switching to a room 2021-04-29 09:37:21 +01:00
Michael Telatynski
9f8955fb6c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
2021-04-28 22:49:36 +01:00
Travis Ralston
b90c845fcb
Revert "Fixes the two Todays problem in Redaction" 2021-04-28 10:07:22 -06:00
Travis Ralston
e53b3b6634
Merge pull request #5917 from DantrazTrev/Redact
Fixes the two Todays problem in Redaction
2021-04-28 09:51:43 -06:00
Travis Ralston
baef98253e
Merge pull request #5920 from aaronraimist/page-up-down
Fix page up/down scrolling only half a page
2021-04-28 09:51:36 -06:00
Šimon Brandner
551e8ecb8d
Merge branch 'develop' into feed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 10:52:23 +02:00
Ayush PS
e2ce699130 Fixed linting warnings in MessagePanel.js 2021-04-28 10:02:20 +05:30
Šimon Brandner
46bfbbadf9
Enable indent rule and fix indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 17:23:27 +02:00
Travis Ralston
b9bd83ad41 Handle possible edge case with getting stuck in "unsent messages" bar
Just in case we're not cleaning up the isResending state properly, here's a catch all.

Unrelated to https://github.com/vector-im/element-web/issues/17078 (this code doesn't affect the js-sdk error the author is seeing)
2021-04-27 08:58:18 -06:00
J. Ryan Stinnett
dd8abb0206
Merge pull request #5912 from matrix-org/jryans/convert-flow-to-ts
Convert some Flow-typed files to TypeScript
2021-04-27 13:44:47 +01:00
Michael Telatynski
13a5d06e29
Merge pull request #5926 from matrix-org/t3chguy/fix/17067
Fix issues with space hierarchy in layout and with incompatible servers
2021-04-27 11:21:15 +01:00
Šimon Brandner
a220b8b572
Wire up AudioFeedArrayForCall
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 11:59:08 +02:00
Michael Telatynski
915f8b3c9c Scale all mxc thumbs using device pixel ratio for hidpi
as we are notoriously bad at doing it everywhere we ought to, like the TopLeftMenu avatar
2021-04-26 18:25:49 +01:00
Michael Telatynski
43b43dc685 tidy up code 2021-04-26 16:11:07 +01:00
Michael Telatynski
a8711dcce9 useSpaceSummary return error for incompatible server notice 2021-04-26 16:06:42 +01:00
J. Ryan Stinnett
cddcedcce2 Merge remote-tracking branch 'origin/develop' into jryans/convert-flow-to-ts 2021-04-26 15:57:28 +01:00
J. Ryan Stinnett
b8a915bb76 Tweak private / underscores for fields and methods 2021-04-26 14:02:53 +01:00
Michael Telatynski
8656212eb9 Space creation prompt user to add existing rooms instead of creating new ones 2021-04-26 12:41:04 +01:00
Ayush PS
123482952a Fixed linting errors 2021-04-26 15:01:39 +05:30
Aaron Raimist
ac486c847e
Try 0.9
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-04-26 01:10:04 -05:00
Aaron Raimist
e5f0119f66
Fix page up/page down scrolling only half a page
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-04-25 23:18:12 -05:00
Ayush PS
9a11b346c9 To fix the Redaction error and a few improvements 2021-04-24 18:09:34 +05:30
J. Ryan Stinnett
d7e6f4b4b5 Add basic types 2021-04-23 17:05:50 +01:00