Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								dcb9b9b777 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686  
							
							 
							
							... 
							
							
							
							 Conflicts:
	src/components/views/elements/MiniAvatarUploader.tsx
	src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
	src/i18n/strings/en_EN.json
	src/settings/handlers/RoomSettingsHandler.ts
	src/stores/SpaceStore.tsx 
							
						 
						
							2021-07-15 10:04:48 +01:00  
						
					 
				
					
						
							
							
								 
								Paulo Pinto
							
						 
						
							 
							
							
							
								
							
								6884b2aa6d 
								
							
								 
							
						 
						
							
							
								
								Standardise spelling of identity server  
							
							 
							
							... 
							
							
							
							Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com> 
							
						 
						
							2021-07-13 16:28:43 +01:00  
						
					 
				
					
						
							
							
								 
								Paulo Pinto
							
						 
						
							 
							
							
							
								
							
								7a8400e5c7 
								
							
								 
							
						 
						
							
							
								
								Standardise spelling and casing of homeserver  
							
							 
							
							... 
							
							
							
							Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com> 
							
						 
						
							2021-07-13 16:28:43 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f412fb44a7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686  
							
							 
							
							... 
							
							
							
							 Conflicts:
	src/SlashCommands.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts 
							
						 
						
							2021-07-09 08:13:39 +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  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								ae0a8b8da4 
								
							
								 
							
						 
						
							
							
								
								Auto-fix lint errors  
							
							 
							
							
							
						 
						
							2021-06-29 13:11:58 +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  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								48e090abcc 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary comment  
							
							 
							
							
							
						 
						
							2021-06-17 10:20:43 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								9f8d04ab9a 
								
							
								 
							
						 
						
							
							
								
								Fix passing variable down to evaluate context  
							
							 
							
							
							
						 
						
							2021-06-16 11:39:04 +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
							
						 
						
							 
							
							
								
								
							
							
								
							
								91df392a2a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5880  from SimonBrandner/show-username  
							
							 
							
							
							
						 
						
							2021-06-14 21:34:01 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								7000176572 
								
							
								 
							
						 
						
							
							
								
								Add workflow steps to track measurements  
							
							 
							
							
							
						 
						
							2021-06-14 14:53:22 +01:00  
						
					 
				
					
						
							
							
								 
								Aaron Raimist
							
						 
						
							 
							
							
								
								
							
							
								
							
								b8458c0ae3 
								
									
								
							
								 
							
						 
						
							
							
								
								fix test maybe  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2021-06-11 23:58:20 -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  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								f7d0afcd28 
								
									
								
							
								 
							
						 
						
							
							
								
								Performance monitoring measurements ( #6041 )  
							
							 
							
							
							
						 
						
							2021-05-19 10:07:02 +01:00  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								Š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  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								55365e632b 
								
									
								
							
								 
							
						 
						
							
							
								
								Use the correct selector in E2EE tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-04-22 07:52:39 +02:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								de5ca92e4e 
								
							
								 
							
						 
						
							
							
								
								add e2e session.delay explainer  
							
							 
							
							
							
						 
						
							2021-04-19 18:01:19 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								db646d5987 
								
							
								 
							
						 
						
							
							
								
								Fix end to end tests for DM creation  
							
							 
							
							
							
						 
						
							2021-04-19 15:07:11 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								cf4ed1bcdf 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2021-03-26 11:56:58 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Weimann
							
						 
						
							 
							
							
								
								
							
							
								
							
								0660371461 
								
									
								
							
								 
							
						 
						
							
							
								
								fix typo in end-to-end-test run script output  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Weimann <mail@michael-weimann.eu> 
							
						 
						
							2021-01-31 09:53:15 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								1fda735222 
								
							
								 
							
						 
						
							
							
								
								Rebrand various CI scripts and modules  
							
							 
							
							... 
							
							
							
							This replaces Riot with Element in various CI scripts, modules, parameters, etc.
This _should_ be the last major rebranding pass (hopefully).
Fixes https://github.com/vector-im/element-web/issues/14894  
							
						 
						
							2020-12-03 13:56:27 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								3bdedd73f7 
								
							
								 
							
						 
						
							
							
								
								fix another test  
							
							 
							
							
							
						 
						
							2020-11-25 11:38:43 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								c4084196d1 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							 
							
							
							
						 
						
							2020-11-25 10:39:44 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								6029f2a03b 
								
							
								 
							
						 
						
							
							
								
								update e2e tests for invite ux tweaks  
							
							 
							
							
							
						 
						
							2020-11-03 15:16:52 +00:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								b5000b236f 
								
							
								 
							
						 
						
							
							
								
								Fix lint error  
							
							 
							
							
							
						 
						
							2020-09-16 17:12:51 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								a18d0271c3 
								
							
								 
							
						 
						
							
							
								
								Adjust tests for Secure Backup toast  
							
							 
							
							
							
						 
						
							2020-09-16 16:51:10 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								46f37fb969 
								
							
								 
							
						 
						
							
							
								
								Create cross-signing keys during authentication  
							
							 
							
							... 
							
							
							
							With this change, Element now creates cross-signing keys during auth flows for
password login. For other auth flows like token / SSO, it will not happen until
a cross-signing / secret storage dialog flow as before. 
							
						 
						
							2020-09-16 15:03:06 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								39a59dbefa 
								
							
								 
							
						 
						
							
							
								
								fix CI some more  
							
							 
							
							
							
						 
						
							2020-09-09 12:59:41 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								d9e17e89b5 
								
							
								 
							
						 
						
							
							
								
								fix CI  
							
							 
							
							
							
						 
						
							2020-09-09 12:55:16 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								b635598bc3 
								
							
								 
							
						 
						
							
							
								
								Attempt to fix tests and fix RoomSummaryCard having wrong member count  
							
							 
							
							
							
						 
						
							2020-09-09 12:28:12 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								8dcb2d4719 
								
							
								 
							
						 
						
							
							
								
								attempt to fix CI tests  
							
							 
							
							
							
						 
						
							2020-09-09 12:06:16 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								bb98587143 
								
							
								 
							
						 
						
							
							
								
								fix e2e tests. Change the default Room Tab to RoomSummary  
							
							 
							
							
							
						 
						
							2020-09-09 11:42:41 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								fb0b784369 
								
							
								 
							
						 
						
							
							
								
								test CI  
							
							 
							
							
							
						 
						
							2020-09-09 10:56:14 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								c8bc80a3b1 
								
							
								 
							
						 
						
							
							
								
								test with delay  
							
							 
							
							
							
						 
						
							2020-09-09 10:07:43 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								644ff56ace 
								
							
								 
							
						 
						
							
							
								
								Fix e2e tests  
							
							 
							
							
							
						 
						
							2020-09-09 09:38:13 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								c815a370e7 
								
							
								 
							
						 
						
							
							
								
								Remove some unused components  
							
							 
							
							... 
							
							
							
							We no longer have tinting support, so remove it. We still need the `Tinter` to exist though as it's used in quite a few places (though does nothing). Similarly, we have to keep the `roomColor` setting due to it being used in a few places - another PR can take away the tinter support properly.
The room tile context menu and top left menu are artifacts of the old room list.
The end to end tests weren't failing before as the code path is unused, however it seems worthwhile to keep it as we will eventually need it. 
							
						 
						
							2020-08-20 20:47:02 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								4f851542ac 
								
							
								 
							
						 
						
							
							
								
								Implement force state for features like in the proposal  
							
							 
							
							
							
						 
						
							2020-08-17 13:51:41 -06:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								62c1798bec 
								
							
								 
							
						 
						
							
							
								
								try to fix the e2e tests  
							
							 
							
							
							
						 
						
							2020-08-13 16:55:48 +01:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
								
								
							
							
								
							
								0060acbb33 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5056  from matrix-org/joriks/style-fighting  
							
							 
							
							... 
							
							
							
							Quick win session 24/07/2020 
							
						 
						
							2020-08-12 15:21:06 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								2e76e19f37 
								
							
								 
							
						 
						
							
							
								
								Remove rebrand toast from tests  
							
							 
							
							
							
						 
						
							2020-08-12 14:58:55 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								ce226ab534 
								
							
								 
							
						 
						
							
							
								
								Replace Riot with Element in docs and comments  
							
							 
							
							... 
							
							
							
							This only covers the simple cases of references to issues and repos. More
complex areas, such as deployment scripts, will be handled separately.
Part of https://github.com/vector-im/element-web/issues/14864  
							
						 
						
							2020-08-03 18:33:36 +01:00