Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								00a3f5d469 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494  
							
							 
							
							
							
						 
						
							2021-07-08 13:29:10 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								9c67679b35 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile  
							
							 
							
							
							
						 
						
							2021-07-08 13:30:57 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								4a6af5a4d7 
								
							
								 
							
						 
						
							
							
								
								fix test missing required prop  
							
							 
							
							
							
						 
						
							2021-07-07 18:12:31 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								209cafb1f5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6308  from SimonBrandner/burn-sdk-get-comp-with-fire  
							
							 
							
							
							
						 
						
							2021-07-07 16:30:54 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								5fb7dbee3e 
								
							
								 
							
						 
						
							
							
								
								Do not generate a lockfile when running in CI  
							
							 
							
							
							
						 
						
							2021-07-07 16:11:47 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								06284fe73d 
								
							
								 
							
						 
						
							
							
								
								Update e2e tests  
							
							 
							
							
							
						 
						
							2021-07-06 12:05:06 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								04c923bd75 
								
							
								 
							
						 
						
							
							
								
								fix tests by including client field on the Room stub and stubbing getJoinedMemberCount  
							
							 
							
							
							
						 
						
							2021-07-06 11:35:56 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								9d8acd1af0 
								
							
								 
							
						 
						
							
							
								
								stub getJoinRule  
							
							 
							
							
							
						 
						
							2021-07-06 10:44:09 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								0ca4a958f7 
								
							
								 
							
						 
						
							
							
								
								fix getCapabilities stub  
							
							 
							
							
							
						 
						
							2021-07-06 10:34:50 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								3301763f12 
								
							
								 
							
						 
						
							
							
								
								stub getCapabilities in tests  
							
							 
							
							
							
						 
						
							2021-07-06 10:19:33 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								b36a727a09 
								
									
								
							
								 
							
						 
						
							
							
								
								Fourth batch of burning  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-02 18:15:05 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								b17d72c399 
								
							
								 
							
						 
						
							
							
								
								fix duplicate import  
							
							 
							
							
							
						 
						
							2021-07-02 14:54:10 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								b014763cd2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-02 13:14:14 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								82119a08f7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into t3chguy/ts/11  
							
							 
							
							
							
						 
						
							2021-07-02 11:03:54 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								80f5232217 
								
							
								 
							
						 
						
							
							
								
								Comply with new member-delimiter-style rule  
							
							 
							
							... 
							
							
							
							Just `eslint --fix` with rule from
https://github.com/matrix-org/eslint-plugin-matrix-org/pull/9  in place 
							
						 
						
							2021-07-01 23:23:03 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								88f691776f 
								
							
								 
							
						 
						
							
							
								
								Use sleep from js-sdk as no point duplicating it  
							
							 
							
							
							
						 
						
							2021-07-01 22:55:27 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								08176beb58 
								
							
								 
							
						 
						
							
							
								
								Kill mock-clock  
							
							 
							
							... 
							
							
							
							We already import sinon's one in UserActivitytest, so use that here too. 
							
						 
						
							2021-07-01 21:52:15 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								543fe6382d 
								
							
								 
							
						 
						
							
							
								
								Fix linting in tests  
							
							 
							
							... 
							
							
							
							Or in the case of one test, disbale just the one rule it breaks 
							
						 
						
							2021-07-01 20:54:04 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ee9be5438e 
								
							
								 
							
						 
						
							
							
								
								eslint --fix  
							
							 
							
							
							
						 
						
							2021-07-01 20:43:05 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								e768ecb3d0 
								
							
								 
							
						 
						
							
							
								
								Typescript conversion of Composer components and more  
							
							 
							
							
							
						 
						
							2021-06-30 13:01:26 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								ae0a8b8da4 
								
							
								 
							
						 
						
							
							
								
								Auto-fix lint errors  
							
							 
							
							
							
						 
						
							2021-06-29 13:11:58 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								71116bfa27 
								
							
								 
							
						 
						
							
							
								
								Migrate to `eslint-plugin-matrix-org`  
							
							 
							
							... 
							
							
							
							This migrates to the new plugin form of our custom ESLint configs. As part of
this, some packages are de-duplicated, configs streamlined, etc. 
							
						 
						
							2021-06-29 12:51:13 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								b60c2c5d55 
								
							
								 
							
						 
						
							
							
								
								Fix e2e test right panel back behaviour  
							
							 
							
							
							
						 
						
							2021-06-29 10:37:30 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								53a6089cc9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6268  from matrix-org/gsouquet/upgrade-puppeteer  
							
							 
							
							
							
						 
						
							2021-06-28 10:28:56 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								96857ab7f7 
								
							
								 
							
						 
						
							
							
								
								Fix end-to-end tests rejectToast  
							
							 
							
							
							
						 
						
							2021-06-28 09:01:04 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								2672516b6a 
								
							
								 
							
						 
						
							
							
								
								Upgrade puppeteer to use newer version of Chrome  
							
							 
							
							
							
						 
						
							2021-06-25 14:47:16 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								0df6200dd0 
								
									
								
							
								 
							
						 
						
							
							
								
								Convert MemberList-test to TS  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-23 16:00:13 +02:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								c316eb841a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6179  from aaronraimist/open-local-addresses  
							
							 
							
							... 
							
							
							
							Open local addresses section by default when there are no existing local addresses 
							
						 
						
							2021-06-22 14:48:02 -06: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
							
						 
						
							 
							
							
								
								
							
							
								
							
								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
							
						 
						
							 
							
							
							
								
							
								8a3dc1bbdf 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2021-06-18 17:56:18 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								f96c366aa4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-18 17:07:43 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								35e68b8aa5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665  
							
							 
							
							
							
						 
						
							2021-06-17 15:45:32 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								017e0ba40f 
								
							
								 
							
						 
						
							
							
								
								fix more private field accesses in tests  
							
							 
							
							
							
						 
						
							2021-06-17 15:23:29 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								949532c297 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile  
							
							 
							
							
							
						 
						
							2021-06-17 15:53:25 +02:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								48e090abcc 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary comment  
							
							 
							
							
							
						 
						
							2021-06-17 10:20:43 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								e7fde2686f 
								
							
								 
							
						 
						
							
							
								
								remove unused imports  
							
							 
							
							
							
						 
						
							2021-06-16 12:12:00 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								9f8d04ab9a 
								
							
								 
							
						 
						
							
							
								
								Fix passing variable down to evaluate context  
							
							 
							
							
							
						 
						
							2021-06-16 11:39:04 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								bceee7978e 
								
							
								 
							
						 
						
							
							
								
								improve naming of tests  
							
							 
							
							
							
						 
						
							2021-06-16 09:30:47 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								9e20e5dfc4 
								
							
								 
							
						 
						
							
							
								
								mock new settings in tests  
							
							 
							
							
							
						 
						
							2021-06-16 09:14:07 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								19cae42161 
								
							
								 
							
						 
						
							
							
								
								Benchmark multiple common user scenario  
							
							 
							
							
							
						 
						
							2021-06-15 15:06:00 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								7310d35d7f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/benchmark-tracking  
							
							 
							
							
							
						 
						
							2021-06-15 11:45:11 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a63d9220d2 
								
							
								 
							
						 
						
							
							
								
								Clear outstanding TODOs  
							
							 
							
							
							
						 
						
							2021-06-15 08:26:46 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								66fce64ee0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282  
							
							 
							
							... 
							
							
							
							 Conflicts:
	package.json
	yarn.lock 
							
						 
						
							2021-06-14 21:39:06 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								91df392a2a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5880  from SimonBrandner/show-username  
							
							 
							
							
							
						 
						
							2021-06-14 21:34:01 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								2879b9086c 
								
							
								 
							
						 
						
							
							
								
								Use alphabet from js-sdk  
							
							 
							
							
							
						 
						
							2021-06-14 21:32:11 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								8fd72fcf79 
								
							
								 
							
						 
						
							
							
								
								Iterate algorithm, base it on new js-sdk string lib  
							
							 
							
							
							
						 
						
							2021-06-14 21:28:32 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								7000176572 
								
							
								 
							
						 
						
							
							
								
								Add workflow steps to track measurements  
							
							 
							
							
							
						 
						
							2021-06-14 14:53:22 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								4af2675e23 
								
							
								 
							
						 
						
							
							
								
								stash bigint support  
							
							 
							
							
							
						 
						
							2021-06-14 14:37:05 +01:00  
						
					 
				
					
						
							
							
								 
								Aaron Raimist
							
						 
						
							 
							
							
								
								
							
							
								
							
								b8458c0ae3 
								
									
								
							
								 
							
						 
						
							
							
								
								fix test maybe  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2021-06-11 23:58:20 -05:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								3d4411390f 
								
							
								 
							
						 
						
							
							
								
								write a shedload more tests  
							
							 
							
							
							
						 
						
							2021-06-11 16:28:07 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								37484e3fc4 
								
							
								 
							
						 
						
							
							
								
								Add TextEncoder polyfill for test run  
							
							 
							
							
							
						 
						
							2021-06-11 12:33:02 +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  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								fdda534053 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into feature/call-event-tile  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-09 19:23:14 +02:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								6e0a908c59 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/react-17  
							
							 
							
							
							
						 
						
							2021-06-09 12:01:35 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								d492ee4d8a 
								
							
								 
							
						 
						
							
							
								
								Update Enzyme adapter name  
							
							 
							
							
							
						 
						
							2021-06-09 11:57:29 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								8334a2ba60 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6143  from robintown/hide-events-perf  
							
							 
							
							
							
						 
						
							2021-06-09 09:13:56 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								692200b9c5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6145  from matrix-org/dependabot/npm_and_yarn/test/end-to-end-tests/ws-6.2.2  
							
							 
							
							... 
							
							
							
							Bump ws from 6.2.1 to 6.2.2 in /test/end-to-end-tests 
							
						 
						
							2021-06-08 14:08:24 -06:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								bf77a4a2ab 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into show-username  
							
							 
							
							
							
						 
						
							2021-06-08 17:14:42 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								432373a00e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5999  from robintown/improved-forwarding-ui  
							
							 
							
							
							
						 
						
							2021-06-08 10:52:06 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								b97867271b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							 
							
							
							
						 
						
							2021-06-07 19:09:36 -04:00  
						
					 
				
					
						
							
							
								 
								Aaron Raimist
							
						 
						
							 
							
							
							
								
							
								9fdbd4c120 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into share-room  
							
							 
							
							
							
						 
						
							2021-06-07 17:00:44 -05:00  
						
					 
				
					
						
							
							
								 
								Aaron Raimist
							
						 
						
							 
							
							
								
								
							
							
								
							
								773af6c7be 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix test  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2021-06-07 16:54:53 -05:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								025148d9fc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into show-username  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-07 19:37:22 +02:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								e891d18fa2 
								
							
								 
							
						 
						
							
							
								
								Add my email to my copyright notices  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-05 21:41:28 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								a06306d560 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							 
							
							
							
						 
						
							2021-06-05 11:04:17 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								0f64f4d692 
								
							
								 
							
						 
						
							
							
								
								Fix MessagePanel tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-05 10:49:44 -04:00  
						
					 
				
					
						
							
							
								 
								dependabot[bot]
							
						 
						
							 
							
							
								
								
							
							
								
							
								c24b239478 
								
									
								
							
								 
							
						 
						
							
							
								
								Bump ws from 6.2.1 to 6.2.2 in /test/end-to-end-tests  
							
							 
							
							... 
							
							
							
							Bumps [ws](https://github.com/websockets/ws ) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/commits )
---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com> 
							
						 
						
							2021-06-05 13:36:25 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								31604c13c0 
								
							
								 
							
						 
						
							
							
								
								Lint the typescript tests  
							
							 
							
							... 
							
							
							
							Turns out we hadn't told eslint to lint .ts in tests/
Also fix all the lint errors, including removing a use of assert that
had randomly crept in. 
							
						 
						
							2021-06-04 16:52:50 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								8c533c7f8b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile  
							
							 
							
							
							
						 
						
							2021-06-04 08:09:31 +02:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								12e013508d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6132  from matrix-org/travis/ts-mtxcli  
							
							 
							
							... 
							
							
							
							Adapt for js-sdk MatrixClient conversion to TS 
							
						 
						
							2021-06-04 00:07:22 -06:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								6eb33ac730 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-04 07:49:05 +02:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								7421efe8f9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6136  from matrix-org/dbkr/map_phone_number_lookup_to_native  
							
							 
							
							... 
							
							
							
							Map phone number lookup results to their native rooms 
							
						 
						
							2021-06-03 19:01:46 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								8ef95a6237 
								
							
								 
							
						 
						
							
							
								
								Interface dispatcher payload  
							
							 
							
							... 
							
							
							
							& use constant in test 
							
						 
						
							2021-06-03 14:38:13 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								7f83590846 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6079  from matrix-org/gsouquet/switch-rooms  
							
							 
							
							
							
						 
						
							2021-06-03 08:44:01 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								1c92e31683 
								
									
								
							
								 
							
						 
						
							
							
								
								Add missing license header  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-02 19:27:57 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								e0572acb14 
								
									
								
							
								 
							
						 
						
							
							
								
								Write tests for CallEventGrouper  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-02 19:22:22 +02:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2c4fa73a45 
								
							
								 
							
						 
						
							
							
								
								Map phone number lookup results to their native rooms  
							
							 
							
							... 
							
							
							
							When dialing a phone number, also look to see if there's a corresponding
native user for the resulting user, and if so, go to the native room
for that user. 
							
						 
						
							2021-06-02 17:39:13 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								da13ec16f3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 't3chguy/fix/17529' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282  
							
							 
							
							
							
						 
						
							2021-06-02 12:42:55 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								d7a5547d80 
								
							
								 
							
						 
						
							
							
								
								use Intl.Collator over String.prototype.localeCompare for better performance  
							
							 
							
							
							
						 
						
							2021-06-02 10:42:17 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								5b2dacd99e 
								
							
								 
							
						 
						
							
							
								
								Adapt for js-sdk MatrixClient conversion to TS  
							
							 
							
							... 
							
							
							
							For https://github.com/matrix-org/matrix-js-sdk/pull/1718  
							
						 
						
							2021-06-01 21:36:28 -06:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								992861a1cd 
								
							
								 
							
						 
						
							
							
								
								Fix forward dialog tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-01 20:36:28 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								56714525f2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							 
							
							
							
						 
						
							2021-06-01 17:28:55 -04:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								0b7d3f007a 
								
							
								 
							
						 
						
							
							
								
								Remove react-beautiful-dnd  
							
							 
							
							
							
						 
						
							2021-06-01 17:35:31 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f11a7083ae 
								
							
								 
							
						 
						
							
							
								
								Switch to stable endpoint/fields for MSC2858  
							
							 
							
							
							
						 
						
							2021-06-01 11:01:09 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								c7c6a818f0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/switch-rooms  
							
							 
							
							
							
						 
						
							2021-05-26 09:51:27 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								121ed5eba9 
								
							
								 
							
						 
						
							
							
								
								Pass Matrix client around as matrixClient  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-24 08:51:04 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								400917623c 
								
							
								 
							
						 
						
							
							
								
								Make myself the copyright holder for forward dialog code  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-24 08:33:28 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								7a04502151 
								
							
								 
							
						 
						
							
							
								
								Iterate on forward dialog design feedback  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-21 12:41:29 -04:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								c428736191 
								
							
								 
							
						 
						
							
							
								
								Update MessagePanel test to account for new DOM structure  
							
							 
							
							
							
						 
						
							2021-05-21 14:59:26 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								678b298bab 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							 
							
							
							
						 
						
							2021-05-19 12:39:48 -04:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								aa4984019c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6061  from jaiwanth-v/update-memberlist-invite  
							
							 
							
							... 
							
							
							
							Update MemberList to reflect changes for invite permission change 
							
						 
						
							2021-05-19 17:35:58 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								a9d0699488 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6062  from matrix-org/t3chguy/fix/17280  
							
							 
							
							... 
							
							
							
							Show DMs in space for invited members too, to match Android impl 
							
						 
						
							2021-05-19 12:41:46 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								88d3706c04 
								
							
								 
							
						 
						
							
							
								
								mock getMembers on mkStubRoom  
							
							 
							
							
							
						 
						
							2021-05-19 12:34:27 +01:00  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								506a798961 
								
							
								 
							
						 
						
							
							
								
								Add getMember mock  
							
							 
							
							
							
						 
						
							2021-05-19 15:19:56 +05:30  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								f7d0afcd28 
								
									
								
							
								 
							
						 
						
							
							
								
								Performance monitoring measurements ( #6041 )  
							
							 
							
							
							
						 
						
							2021-05-19 10:07:02 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								454df8947b 
								
							
								 
							
						 
						
							
							
								
								Add mock for new client method  
							
							 
							
							
							
						 
						
							2021-05-18 13:46:47 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								e798b36f1d 
								
							
								 
							
						 
						
							
							
								
								Decorate forward dialog room avatars  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-16 08:39:22 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								64e828d069 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							 
							
							
							
						 
						
							2021-05-16 08:13:59 -04:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								df7b598ca7 
								
							
								 
							
						 
						
							
							
								
								Improve visible waveform for voice messages  
							
							 
							
							... 
							
							
							
							This tries to prioritize actual voice to decide the waveform, and clamps noise to zero to ensure the waveform doesn't have a perceptually noisy base.
In theory this better matches the overall voice message content. 
							
						 
						
							2021-05-13 22:20:08 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								d8e3458c55 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into travis/voicemessages/resample2  
							
							 
							
							
							
						 
						
							2021-05-11 10:15:37 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								beef07bdef 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into err  
							
							 
							
							
							
						 
						
							2021-05-10 20:08:19 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								379d19e2e0 
								
									
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							 
							
							
							
						 
						
							2021-05-10 19:56:30 -06:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								c39d9649ba 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							 
							
							
							
						 
						
							2021-05-10 13:38:02 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								503301aa89 
								
							
								 
							
						 
						
							
							
								
								Make rooms in ForwardDialog clickable  
							
							 
							
							... 
							
							
							
							…so that you can jump to a room easily once you've forwarded a message
there.
Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-10 13:00:06 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								5c10e1e574 
								
							
								 
							
						 
						
							
							
								
								Fix lints  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-10 01:16:37 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								eb779cd3d8 
								
							
								 
							
						 
						
							
							
								
								Test that forward buttons are disabled for rooms without permission  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-10 01:10:41 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								35cf0e1c7e 
								
							
								 
							
						 
						
							
							
								
								Find components by name rather than class in ForwardDialog test  
							
							 
							
							... 
							
							
							
							It makes things shorter and more readable!
Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-10 01:10:39 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								eb07f1fb86 
								
							
								 
							
						 
						
							
							
								
								Test that ForwardDialog can render replies  
							
							 
							
							... 
							
							
							
							Previously ForwardDialog was not giving its EventTile message preview
the information it needed to render a ReplyThread. This was a bit tricky
to fix since we were pulling a fake event out of thin air, so this
ensures it doesn't regress.
Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-10 00:54:00 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								74925b2c6d 
								
							
								 
							
						 
						
							
							
								
								Test ForwardDialog  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-08 21:11:06 -04:00  
						
					 
				
					
						
							
							
								 
								Ayush PS
							
						 
						
							 
							
							
							
								
							
								2ad0032f72 
								
							
								 
							
						 
						
							
							
								
								Added regression tests for Natural headers  
							
							 
							
							
							
						 
						
							2021-05-09 01:10:54 +05:30  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								b007ea81b2 
								
							
								 
							
						 
						
							
							
								
								Rescale and smooth playback waveform to better match expectation  
							
							 
							
							
							
						 
						
							2021-05-07 21:06:07 -06:00  
						
					 
				
					
						
							
							
								 
								Ayush PS
							
						 
						
							 
							
							
							
								
							
								32edbc155f 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into err  
							
							 
							
							
							
						 
						
							2021-05-07 19:16:00 +05:30  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								90fa738734 
								
							
								 
							
						 
						
							
							
								
								Fix that one final pesky test  
							
							 
							
							
							
						 
						
							2021-05-07 11:22:10 +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
							
						 
						
							 
							
							
							
								
							
								9d9dce7a91 
								
							
								 
							
						 
						
							
							
								
								update orphan room behaviour test to expect new home space behaviour  
							
							 
							
							
							
						 
						
							2021-05-07 10:48:55 +01:00  
						
					 
				
					
						
							
							
								 
								Ayush PS
							
						 
						
							 
							
							
							
								
							
								d1f23fb994 
								
							
								 
							
						 
						
							
							
								
								Partially added the tests  [WIP]  
							
							 
							
							
							
						 
						
							2021-05-07 11:45:52 +05:30  
						
					 
				
					
						
							
							
								 
								dependabot[bot]
							
						 
						
							 
							
							
								
								
							
							
								
							
								137189932e 
								
									
								
							
								 
							
						 
						
							
							
								
								Bump lodash from 4.17.19 to 4.17.21 in /test/end-to-end-tests  
							
							 
							
							... 
							
							
							
							Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.19 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21 )
Signed-off-by: dependabot[bot] <support@github.com> 
							
						 
						
							2021-05-07 01:13:47 +00: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
							
						 
						
							 
							
							
								
								
							
							
								
							
								ed8b05b730 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5951  from SimonBrandner/fix/room-pill-history  
							
							 
							
							... 
							
							
							
							Fix saving room pill part to history 
							
						 
						
							2021-05-04 12:32:04 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								1fe2085309 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix deserialize test  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-05-01 12:28:18 +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  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								8d8525cdeb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5935  from matrix-org/travis/voice/control-bar  
							
							 
							
							... 
							
							
							
							Voice messages: Composer controls 
							
						 
						
							2021-04-28 09:38:28 -06:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								9aaf321e4e 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove dis call which doesn't seem to be necessary  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-04-28 13:39:09 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								b6324a816f 
								
									
								
							
								 
							
						 
						
							
							
								
								Use CallHandler correctly  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-04-28 13:33:15 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								40748d3c94 
								
									
								
							
								 
							
						 
						
							
							
								
								Make CallHandler emit CallChangeRoom  
							
							 
							
							... 
							
							
							
							Let's hope I changed the tests correctly
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-04-28 11:49:07 +02:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								c95c1aeffd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5886  from matrix-org/dbkr/asserted_identity  
							
							 
							
							... 
							
							
							
							Support MSC3086 asserted identity 
							
						 
						
							2021-04-28 09:47:40 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								32e3ce3dea 
								
							
								 
							
						 
						
							
							
								
								Handle basic state machine of recordings  
							
							 
							
							
							
						 
						
							2021-04-27 15:02:15 -06:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								be7d4d020b 
								
							
								 
							
						 
						
							
							
								
								Put asserted identity option under a 'voip' section  
							
							 
							
							
							
						 
						
							2021-04-27 19:33:53 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								705505fe85 
								
							
								 
							
						 
						
							
							
								
								make copyright not lie  
							
							 
							
							
							
						 
						
							2021-04-27 18:56:36 +01: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  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
							
								
							
								ba4e58513d 
								
							
								 
							
						 
						
							
							
								
								Fix ScalarAuthClient test  
							
							 
							
							
							
						 
						
							2021-04-26 15:41:19 +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
							
						 
						
							 
							
							
							
								
							
								47c12a7d23 
								
							
								 
							
						 
						
							
							
								
								Add tests for rooms moving around the SpaceStore  
							
							 
							
							
							
						 
						
							2021-04-25 09:24:00 +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
							
						 
						
							 
							
							
							
								
							
								f85d3643ee 
								
							
								 
							
						 
						
							
							
								
								Test and fix subspace invite receipt behaviour  
							
							 
							
							
							
						 
						
							2021-04-24 11:31:52 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								82119ad595 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/error-states  
							
							 
							
							
							
						 
						
							2021-04-23 15:53:37 -06:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								dd2a1d063a 
								
							
								 
							
						 
						
							
							
								
								Write tests for spaces context switching behavious  
							
							 
							
							
							
						 
						
							2021-04-23 16:14:55 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								4446022327 
								
							
								 
							
						 
						
							
							
								
								Add automatic space switching tests  
							
							 
							
							
							
						 
						
							2021-04-23 14:45:22 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								dc3d05bc88 
								
							
								 
							
						 
						
							
							
								
								Test for asserted identity  
							
							 
							
							... 
							
							
							
							This is out first CallHandler test(!) Switches react-sdk to use
createCall on the client object so we can stub this out in the test.
Add a bunch more stubs to the test client.
There's more stuff in this test that has scope to be used more
widely, like waiting for a certain dispatch and mocking out rooms
with particular sets of users in them: we could consider moving these
out to test utils if we wanted. 
							
						 
						
							2021-04-23 14:39:39 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								c35678c64a 
								
							
								 
							
						 
						
							
							
								
								Add yet more tests  
							
							 
							
							
							
						 
						
							2021-04-23 13:40:16 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a3ca48b4da 
								
							
								 
							
						 
						
							
							
								
								Write more space store tests  
							
							 
							
							
							
						 
						
							2021-04-23 12:19:38 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a12cefee8e 
								
							
								 
							
						 
						
							
							
								
								Tweak some tests  
							
							 
							
							
							
						 
						
							2021-04-23 12:19:08 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a38419defb 
								
							
								 
							
						 
						
							
							
								
								extend space tests some more  
							
							 
							
							
							
						 
						
							2021-04-23 11:20:26 +01:00