Commit graph

1436 commits

Author SHA1 Message Date
Jaiwanth
1974d47e4e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room 2021-05-11 11:24:35 +05:30
Jaiwanth
07a952a1bb
Update src/stores/SpaceStore.tsx
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-11 11:01:28 +05:30
Jaiwanth
14f94c3883
Remove excessive null check
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-05-11 10:41:31 +05:30
Robin Townsend
c39d9649ba Merge branch 'develop' into improved-forwarding-ui 2021-05-10 13:38:02 -04:00
Germain Souquet
17f4945323 Merge branch 'develop' into gsouquet/cache-decrypt 2021-05-10 17:34:44 +01:00
Germain Souquet
f1a6f6fd7f make breadcrumb room events decryption more idiomatic 2021-05-10 15:48:39 +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
Germain Souquet
5bd4120920 Decrypt breadcrumb events for better UX 2021-05-07 12:58:37 +01:00
Michael Telatynski
f0e61e6286 short circuit automatic switch to related space behaviour and fix tests 2021-05-07 11:08:18 +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
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
202dfd4521
Merge pull request #5976 from matrix-org/t3chguy/fix/17153
Improve performance of search all spaces and space switching
2021-05-05 22:13:05 +01:00
Michael Telatynski
2b703e8574 tweak code style 2021-05-05 17:30:14 +01:00
Michael Telatynski
01fa25f3fa
Merge pull request #5968 from matrix-org/t3chguy/fix/17044
Only aggregate DM notifications on the Space Panel in the Home Space
2021-05-05 16:35:07 +01:00
Michael Telatynski
7f396bedd0 add comment 2021-05-05 15:59:02 +01:00
Michael Telatynski
4279e99e4c Improve performance of search all spaces and space switching 2021-05-05 15:29:04 +01:00
Jaiwanth
49b61d512f Replicate same behaviour for the home space 2021-05-05 13:46:40 +05:30
Jaiwanth
d3fc047b58 Handle home space 2021-05-05 13:24:06 +05:30
Jaiwanth
bcd1005e3c Check truthiness of space 2021-05-05 13:01:14 +05:30
Jaiwanth
73b9ad41da Navigate to room with maximum notifications when clicked on already selected space 2021-05-05 12:38:44 +05:30
Michael Telatynski
2bf931b9d3
Merge pull request #5945 from matrix-org/t3chguy/fix/17085
Fix newly joined room appearing under the wrong space
2021-05-04 21:57:43 +01:00
Michael Telatynski
69604480fd Add comment 2021-05-04 21:17:15 +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
48237949ad Only aggregate DM notifications on the Space Panel in the Home Space 2021-05-04 16:44:29 +01:00
Michael Telatynski
ac61c8eca8 Adhere to updated sort order for space children 2021-05-04 12:27:27 +01:00
Michael Telatynski
e9f59ed093
Merge pull request #5943 from matrix-org/t3chguy/fix/17082
Sort rooms in the add existing to space dialog based on recency
2021-05-04 10:57:23 +01:00
Travis Ralston
903cc77f39 Appease the linter 2021-05-03 21:53:23 -06:00
Travis Ralston
e04490284d Support UI for MSC2876: Widgets reading events from rooms
MSC: https://github.com/matrix-org/matrix-doc/pull/2876
Fixes https://github.com/vector-im/element-web/issues/15747
Requires https://github.com/matrix-org/matrix-widget-api/pull/34
2021-05-03 21:50:25 -06:00
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
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
Š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
286463606c Spaces fix edge cases around automatic space switching around room navigation 2021-04-29 13:52:48 +01:00
Michael Telatynski
7552801103 Room List respect the prefilter for new rooms 2021-04-29 09:48:23 +01:00
Michael Telatynski
e390c3c732 Inhibit sending RR when context switching to a room 2021-04-29 09:37:21 +01:00
Michael Telatynski
bed52319bc Sort rooms in the add existing to space dialog based on recency 2021-04-28 23:39:24 +01:00
Michael Telatynski
efb9b71900 Make the text filter search all spaces instead of just the selected one 2021-04-28 23:18:42 +01:00
Michael Telatynski
08e0f15006
Merge pull request #5936 from matrix-org/t3chguy/fix/17084
Fix joining room using via servers regression
2021-04-28 17:09:22 +01:00
Michael Telatynski
27731ac25b tidy 2021-04-28 09:07:02 +01:00
Michael Telatynski
5966fade0b Fix joining room using via servers regression 2021-04-28 09:04:02 +01:00
Travis Ralston
c2bcdae8a9 Switch global var to the store for easier debugging 2021-04-27 23:04:49 -06:00
Š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
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
f18a24025a
Merge branch 'develop' into t3chguy/fix/17022 2021-04-27 11:16:02 +01:00
Michael Telatynski
62f8c9aab9
Merge pull request #5924 from matrix-org/t3chguy/fix/17069
Disable spaces context switching for when exploring a space
2021-04-27 09:45:58 +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
25e4feeb38 Add more types in WidgetEchoStore 2021-04-26 15:38:43 +01:00
Travis Ralston
ddb8947c15
Merge pull request #5897 from matrix-org/travis/error-states
Improve message error states
2021-04-26 08:16:26 -06:00