OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
32,633 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

59 Commits (f18a24025a73bc1df33a755567b5b4725a8c6be5)

Author SHA1 Message Date
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