mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 12:11:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
38183 commits 219 branches 562 tags 474 MiB
Commit graph

148 commits

Author SHA1 Message Date
Michael Telatynski
6e3c647109 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 
 Conflicts:
	package.json
	src/components/views/spaces/SpacePanel.tsx
	src/i18n/strings/en_EN.json
	src/stores/SpaceStore.tsx
	yarn.lock
 2021-06-22 21:15:53 +01:00
Michael Telatynski
cd04fb76dc Fix type error 2021-06-22 18:01:29 +01:00
Michael Telatynski
59052b1eb7
Merge pull request #6199 from matrix-org/t3chguy/fix/17665 2021-06-22 17:46:57 +01:00
Michael Telatynski
e3e6b74272 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665 
 Conflicts:
	src/stores/SpaceStore.tsx
 2021-06-22 17:38:05 +01:00
Michael Telatynski
59258585b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5 2021-06-22 17:28:19 +01:00
Michael Telatynski
233e2aa425 Fix bugs identified by the typescripting 2021-06-18 16:22:31 +01:00
Michael Telatynski
cee294f5a7 iterate PR 2021-06-16 09:23:06 +01:00
Michael Telatynski
a75fb98fbc Fix some NPEs 2021-06-16 09:07:55 +01:00
Michael Telatynski
b4fbc791bb Add experimental options to the Spaces beta 2021-06-16 09:01:13 +01:00
Michael Telatynski
a63d9220d2 Clear outstanding TODOs 2021-06-15 08:26:46 +01:00
Michael Telatynski
a4fa2779d4 Iterate lexicographic ordering implementation 2021-06-11 10:33:00 +01:00
Michael Telatynski
21fc386317 Move over to new lexicographic string sorting 2021-06-10 11:40:10 +01:00
Michael Telatynski
271f544637 Stash 2021-06-07 08:59:57 +01:00
Michael Telatynski
e334ce8192 First cut of space panel drag-and-drop ordering 2021-06-03 08:32:36 +01:00
Michael Telatynski
079a5c10ad Respect space ordering field in m.tag for top level spaces 2021-06-02 16:43:38 +01:00
Michael Telatynski
63ae84a72e Wire space switch shortcut via dispatcher to prevent app load explosion due to skinning 2021-05-24 18:23:04 +01:00
Michael Telatynski
e984a4f0cd rejig the code to make types happy 2021-05-20 20:12:28 +01:00
Michael Telatynski
073127aa3c Fix handling of via servers for suggested rooms 2021-05-20 18:47:12 +01:00
Jaiwanth
bf2d26ef21 Modify to navigate only on notification dots click 2021-05-20 11:23:00 +05:30
Michael Telatynski
e18120f412 Show DMs in space for invited members too, to match Android impl 2021-05-19 08:55:56 +01:00
Michael Telatynski
a48d786547 Update space order field validity requirements to match msc update 2021-05-14 22:59:03 +01:00
Jaiwanth
3e8863fc9a Adjust behaviour for the home space 2021-05-11 13:03:45 +05:30
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
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
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
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
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
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
286463606c Spaces fix edge cases around automatic space switching around room navigation 2021-04-29 13:52:48 +01:00
Michael Telatynski
f18a24025a
Merge branch 'develop' into t3chguy/fix/17022 2021-04-27 11:16:02 +01:00
Michael Telatynski
751568cef2 Disable spaces context switching for when exploring a space 2021-04-26 14:55:11 +01:00
Michael Telatynski
203425c8de Test and fix space store wrongly treating room invites as space invites 2021-04-26 08:37:45 +01:00
Michael Telatynski
3bb6edbda7 Fix accepting invite edge case where it wouldn't show the newly joined space 2021-04-25 09:24:26 +01:00
Michael Telatynski
98851f8e64 Text space switching behaviour and fix invalid space edge case 2021-04-24 11:32:55 +01:00
Michael Telatynski
da46e90896 Fix SpaceStore reset behaviour 2021-04-24 11:32:12 +01:00
Michael Telatynski
f85d3643ee Test and fix subspace invite receipt behaviour 2021-04-24 11:31:52 +01:00
Michael Telatynski
f5ab75cfdd Fix automatic space switching behaviour to prioritise canonical parents 2021-04-23 14:45:34 +01:00
Michael Telatynski
320ff7b870 Fix invites relating to a space not showing in the space 2021-04-23 13:41:42 +01:00
Michael Telatynski
86a30a2ad5 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17022 2021-04-23 10:05:45 +01:00
Michael Telatynski
1075756929 add more tests 2021-04-23 09:55:30 +01:00
Michael Telatynski
ba9cfa0942
Merge pull request #5902 from matrix-org/t3chguy/fix/17020 
Show invites to spaces at the top of the space panel
 2021-04-22 14:32:48 +01:00
Michael Telatynski
3fb4b6258a
Merge pull request #5899 from matrix-org/t3chguy/spaces-stability 
Improve edge cases with spaces context switching
 2021-04-22 14:30:35 +01:00
Michael Telatynski
e219fe082a Tweak context switching edge case for space invites 2021-04-22 12:08:54 +01:00
Michael Telatynski
7efd4a43a5 Show space invites at the top of the space panel 2021-04-22 12:07:58 +01:00
Michael Telatynski
28fa1cb44c Reset space contexts as some users may have loops stuck in their local storage 2021-04-22 09:05:02 +01:00
Michael Telatynski
b64b956aa4 when automatically switching space to match room fall back to the home space 2021-04-22 08:39:16 +01:00
Michael Telatynski
ec0612f70d Fix spaces notification dots wrongly including upgraded (hidden) rooms 2021-04-22 08:31:26 +01:00
Michael Telatynski
e1ba04716e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces-stability 
 Conflicts:
	src/stores/SpaceStore.tsx
 2021-04-22 08:24:19 +01:00
Michael Telatynski
ee80c27b2b Improve edge cases with spaces context switching 2021-04-22 08:22:11 +01:00
Michael Telatynski
8373b0e69c
Merge pull request #5893 from matrix-org/t3chguy/fix/16978 
Fix spaces filtering sometimes lagging behind or behaving oddly
 2021-04-21 09:20:18 +01:00
Michael Telatynski
bae47bbd79
Merge pull request #5894 from matrix-org/t3chguy/fix/17026 
Fix issue with spaces context switching looping and breaking
 2021-04-21 09:11:26 +01:00
Michael Telatynski
ecd9b8d6de Fix issue with spaces context switching looping and breaking 2021-04-21 09:01:22 +01:00
Šimon Brandner
9b81f5b4a0
Add a comment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-20 16:11:34 +02:00
Šimon Brandner
3adb2635ba
Revert "Remove unnecessary check" 
This reverts commit 08c0f0a67e.

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-20 15:40:32 +02:00
Michael Telatynski
ace8d59a2a Fix Spaces NPE when a room with no tags gains its first tag 2021-04-20 13:12:28 +01:00
Šimon Brandner
4344ff9097
Update src/stores/SpaceStore.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-04-20 13:31:50 +02:00
Šimon Brandner
d4ca087c2e
Make getLastViewedRoomsStorageKey() make sense 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-20 13:24:23 +02:00
Šimon Brandner
1934c4a32f
Add getLastViewedRoomsStorageKey() 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-20 12:39:11 +02:00
Šimon Brandner
f9292c364c
Check if we are joined 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-20 12:25:56 +02:00
Šimon Brandner
08c0f0a67e
Remove unnecessary check 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-20 12:22:25 +02:00
Šimon Brandner
a3d0ccf306
Merge branch 'develop' into spaces/context-switching 2021-04-20 12:06:59 +02:00
Michael Telatynski
344e4b6c5b Trigger lazy loading when filtering using spaces 
so that the filtered DMs are correct
 2021-04-19 16:15:24 +01:00
Michael Telatynski
bf33775a14 Fix space store wrongly switching to a non-space filter 2021-04-12 11:45:22 +01:00
Šimon Brandner
d68afcc4ce
Use else if 
Maybe it looks a little nicer, I don't know

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-26 13:52:41 +01:00
Šimon Brandner
a707524aad
Delete comment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-26 13:49:01 +01:00
Šimon Brandner
f62e2c0042
Use compound keys 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-26 13:44:51 +01:00
Šimon Brandner
f64008e239
Check if room is defined 
Sometimes it isn't and that leads to errors. We can't use ? here because we also use !

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-26 13:39:16 +01:00
Michael Telatynski
aff05eff48 Fix suggested room vanishing when you peek it 2021-03-26 11:48:31 +00:00
Šimon Brandner
65ef2b845e
Go to /#/home if there is no saved room 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-26 08:18:49 +01:00
Šimon Brandner
7e425ce939
Empty object if nothing saved 
This isn't nice but I'll rework this soon anyway

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-26 08:18:49 +01:00
Šimon Brandner
efb8c89433
Don't save if isSpaceRoom() 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-26 08:18:42 +01:00
Šimon Brandner
c26da1bce6
Use this.activeSpace 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-26 07:58:09 +01:00
Šimon Brandner
e39f7caf59
Don't export as we don't need to 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-26 07:55:52 +01:00
Šimon Brandner
2dcb60b489
Move persisting of last viewed into SpaceStore 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-26 07:54:27 +01:00
Šimon Brandner
67dcb3a448
If no roomId was saved go to space home 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-25 20:51:21 +01:00
Šimon Brandner
ef3d87f8e8
First implementation of context switching 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-25 20:44:15 +01:00
Michael Telatynski
1b22cc8f6d delint 2021-03-25 17:41:26 +00:00
Michael Telatynski
a2fe964a31 Fix case where room list did not show DM when user joined space after filtering 2021-03-25 17:37:39 +00:00
Michael Telatynski
a61f4c1811 Auto-select space if joined whilst being viewed 2021-03-24 20:01:21 +00:00
Michael Telatynski
d873791369 update comments 2021-03-24 14:01:24 +00:00
Michael Telatynski
796bfd851d Fix left spaces not disappearing from the space panel 2021-03-22 17:47:48 +00:00
Michael Telatynski
2b4c670b89 Fix favourites not showing up in home until a refresh 2021-03-19 13:20:30 +00:00
Michael Telatynski
c6f6d24b32 Iterate space creation and previews 2021-03-19 13:20:30 +00:00
Michael Telatynski
1cfeb36927 Update suggested room on join 2021-03-09 13:41:37 +00:00
Michael Telatynski
6a5efad142 Show suggested rooms from the selected space 2021-03-08 15:52:21 +00:00
Michael Telatynski
ab4220b20d Defer auto-joining within spaces and switch to using suggested 2021-03-04 13:04:58 +00:00
Michael Telatynski
d1a75885a7 Protect onAction dispatch handler on the SpaceStore with Spaces disabled 2021-03-02 15:35:02 +00:00
Michael Telatynski
7030c636f0 Initial Space Store for keeping track of space hierarchies from sync 2021-02-25 16:36:35 +00:00