|  J. Ryan Stinnett | ae0a8b8da4 | Auto-fix lint errors | 2021-06-29 13:11:58 +01:00 | 
				
					
						|  Michael Telatynski | 49d20d2530 | consolidate the two onRoomAccountData listeners | 2021-06-22 21:22:30 +01:00 | 
				
					
						|  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 | 
				
					
						|  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 | 
				
					
						|  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 | 
				
					
						|  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 |