881cac0d21 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into fix/ringing-sound/15591  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-08-04 16:30:03 +02:00  
				
					
						
							
							
								 
						
							
							
								57f5c30af8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6532  from matrix-org/posthog-analytics  
							
							... 
							
							
							
							Reinstate Posthog analytics PR fixing type definitions via installing dev dependencies 
							
						 
						
							2021-08-04 09:47:39 +01:00  
				
					
						
							
							
								 
						
							
							
								c9c8177f58 
								
									
								
							
								 
							
						 
						
							
							
								
								Start a call immediately after creating a room via the dial pad ( #6529 )  
							
							
							
						 
						
							2021-08-04 09:46:39 +01:00  
				
					
						
							
							
								 
						
							
							
								28f5dc483b 
								
							
								 
							
						 
						
							
							
								
								Update eslint plugin & fix silly indenting  
							
							... 
							
							
							
							As per https://github.com/matrix-org/eslint-plugin-matrix-org/pull/15 
this caused a bunch of silly indenting to creep in, so this fixes it
back to the previous style. 
							
						 
						
							2021-08-03 17:07:37 +01:00  
				
					
						
							
							
								 
						
							
							
								a18f41ceed 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-08-03 15:43:56 +02:00  
				
					
						
							
							
								 
						
							
							
								2a378f30b7 
								
									
								
							
								 
							
						 
						
							
							
								
								Attempt to fix tests  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-08-03 15:38:12 +02:00  
				
					
						
							
							
								 
						
							
							
								dc7aad1abf 
								
							
								 
							
						 
						
							
							
								
								Revert "Revert "Add support for Posthog Analytics under a labs flag""  
							
							... 
							
							
							
							This reverts commit c5ea253181 
							
						 
						
							2021-08-03 11:55:02 +01:00  
				
					
						
							
							
								 
						
							
							
								c5ea253181 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Add support for Posthog Analytics under a labs flag"  
							
							
							
						 
						
							2021-08-03 07:30:02 +01:00  
				
					
						
							
							
								 
						
							
							
								a65b41be63 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6495  from matrix-org/posthog-analytics  
							
							... 
							
							
							
							Add support for Posthog Analytics under a labs flag 
							
						 
						
							2021-08-02 14:46:17 +01:00  
				
					
						
							
							
								 
						
							
							
								3c436c9617 
								
							
								 
							
						 
						
							
							
								
								update setting naming to match style  
							
							
							
						 
						
							2021-07-30 12:20:02 +01:00  
				
					
						
							
							
								 
						
							
							
								02dbdc5c0a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093  
							
							... 
							
							
							
							 Conflicts:
	src/components/views/spaces/SpaceTreeLevel.tsx
	src/dispatcher/actions.ts
	src/i18n/strings/en_EN.json 
							
						 
						
							2021-07-29 16:11:16 +01:00  
				
					
						
							
							
								 
						
							
							
								6123ccb2eb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096  
							
							
							
						 
						
							2021-07-28 17:45:15 +01:00  
				
					
						
							
							
								 
						
							
							
								ecbc536a3e 
								
							
								 
							
						 
						
							
							
								
								Add copyright header  
							
							
							
						 
						
							2021-07-28 14:15:27 +01:00  
				
					
						
							
							
								 
						
							
							
								a09e046c18 
								
									
								
							
								 
							
						 
						
							
							
								
								Update test/PosthogAnalytics-test.ts  
							
							... 
							
							
							
							Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2021-07-28 14:11:55 +01:00  
				
					
						
							
							
								 
						
							
							
								df7ebb2e7c 
								
							
								 
							
						 
						
							
							
								
								Remove commented out block  
							
							
							
						 
						
							2021-07-28 14:00:37 +01:00  
				
					
						
							
							
								 
						
							
							
								3ff7de3c96 
								
							
								 
							
						 
						
							
							
								
								Mock SHA-256 to avoid problems loading crypto on Node 14  
							
							
							
						 
						
							2021-07-28 13:44:06 +01:00  
				
					
						
							
							
								 
						
							
							
								7cf28de9c9 
								
							
								 
							
						 
						
							
							
								
								take 2 at fixing import  
							
							
							
						 
						
							2021-07-28 11:32:17 +01:00  
				
					
						
							
							
								 
						
							
							
								7c62386915 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							2021-07-28 11:28:19 +01:00  
				
					
						
							
							
								 
						
							
							
								c697079eb4 
								
							
								 
							
						 
						
							
							
								
								Fix import  
							
							
							
						 
						
							2021-07-28 11:22:40 +01:00  
				
					
						
							
							
								 
						
							
							
								bd7e2dee3d 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin' into posthog-analytics  
							
							
							
						 
						
							2021-07-28 11:13:22 +01:00  
				
					
						
							
							
								 
						
							
							
								a6df687196 
								
							
								 
							
						 
						
							
							
								
								Tidy up interface and add some comments  
							
							
							
						 
						
							2021-07-28 09:54:37 +01:00  
				
					
						
							
							
								 
						
							
							
								1d81bdc6f9 
								
							
								 
							
						 
						
							
							
								
								Interface changes and anonymity fixes  
							
							
							
						 
						
							2021-07-28 09:37:08 +01:00  
				
					
						
							
							
								 
						
							
							
								776435f620 
								
							
								 
							
						 
						
							
							
								
								Switch all-rooms toggle for spaces to non-feature settings key  
							
							
							
						 
						
							2021-07-27 21:17:24 +01:00  
				
					
						
							
							
								 
						
							
							
								0a9d3302ba 
								
							
								 
							
						 
						
							
							
								
								Fix home vs all rooms requiring app reload and change default to `home`  
							
							... 
							
							
							
							Consolidate ALL_ROOMS and HOME_SPACE storage
Fix behaviour when recalled room is no longer part of the target space
Improve tests 
							
						 
						
							2021-07-27 21:11:47 +01:00  
				
					
						
							
							
								 
						
							
							
								ec173e74e6 
								
							
								 
							
						 
						
							
							
								
								Test & Refactor SpaceWatcher to allow all rooms/home change without needing reload  
							
							
							
						 
						
							2021-07-27 20:15:40 +01:00  
				
					
						
							
							
								 
						
							
							
								755007cbee 
								
							
								 
							
						 
						
							
							
								
								Conclude labs flags and write more tests  
							
							
							
						 
						
							2021-07-27 14:39:14 +01:00  
				
					
						
							
							
								 
						
							
							
								474561600e 
								
							
								 
							
						 
						
							
							
								
								Fix hash == ""  
							
							
							
						 
						
							2021-07-27 13:31:56 +01:00  
				
					
						
							
							
								 
						
							
							
								c8d9294350 
								
							
								 
							
						 
						
							
							
								
								Discard unused utility now that we use Object.fromEntries  
							
							
							
						 
						
							2021-07-23 18:40:22 +01:00  
				
					
						
							
							
								 
						
							
							
								95f4275807 
								
							
								 
							
						 
						
							
							
								
								Add Disabled anonymity, improve tests  
							
							
							
						 
						
							2021-07-23 16:47:02 +01:00  
				
					
						
							
							
								 
						
							
							
								5ccd02dd6e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1  
							
							... 
							
							
							
							 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/messages/MImageBody.tsx 
							
						 
						
							2021-07-23 10:42:46 +01:00  
				
					
						
							
							
								 
						
							
							
								f5630acea7 
								
							
								 
							
						 
						
							
							
								
								Adhere to better eslint rules  
							
							
							
						 
						
							2021-07-23 10:35:10 +01:00  
				
					
						
							
							
								 
						
							
							
								6737cfd297 
								
							
								 
							
						 
						
							
							
								
								remove superflous dnt clear  
							
							
							
						 
						
							2021-07-21 16:10:06 +01:00  
				
					
						
							
							
								 
						
							
							
								726b4497b2 
								
							
								 
							
						 
						
							
							
								
								Remove redactedCurrentLocation and rely on posthog for DNT  
							
							... 
							
							
							
							* Redact and pass the redacted url as a property. redactedCurrentLocation might have issues with concurrent events
* Remove DNT code and rely on posthog 
							
						 
						
							2021-07-21 16:06:09 +01:00  
				
					
						
							
							
								 
						
							
							
								4c6b0d35ad 
								
							
								 
							
						 
						
							
							
								
								Improve analytics interface  
							
							... 
							
							
							
							* Make it an error to call it before its initialised, and separately track whether its been enabled
* Use anonmity enum in the public interface
* Properly await upstream calls
* Fix accidental test fixture cross-reliance 
							
						 
						
							2021-07-21 14:58:43 +01:00  
				
					
						
							
							
								 
						
							
							
								6da3cc8ca1 
								
							
								 
							
						 
						
							
							
								
								Redact sensitive data  
							
							
							
						 
						
							2021-07-21 13:48:10 +01:00  
				
					
						
							
							
								 
						
							
							
								390b05617c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686  
							
							... 
							
							
							
							 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/dialogs/RoomUpgradeDialog.tsx
	src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx 
							
						 
						
							2021-07-21 10:46:41 +01:00  
				
					
						
							
							
								 
						
							
							
								4b0cb409a0 
								
							
								 
							
						 
						
							
							
								
								Add identifyUser  
							
							
							
						 
						
							2021-07-21 08:38:58 +01:00  
				
					
						
							
							
								 
						
							
							
								74b0e52f9a 
								
							
								 
							
						 
						
							
							
								
								Enforce anon/pseudo-anon via types  
							
							
							
						 
						
							2021-07-21 08:23:42 +01:00  
				
					
						
							
							
								 
						
							
							
								3135e42586 
								
							
								 
							
						 
						
							
							
								
								Add test for silently ignoring messages when not initialised  
							
							
							
						 
						
							2021-07-21 07:42:55 +01:00  
				
					
						
							
							
								 
						
							
							
								2a48d3c9bc 
								
							
								 
							
						 
						
							
							
								
								First pass at a PosthogAnalytics class  
							
							
							
						 
						
							2021-07-21 07:40:39 +01:00  
				
					
						
							
							
								 
						
							
							
								dd6379cf4b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-20 13:15:04 +02:00  
				
					
						
							
							
								 
						
							
							
								ce78cdf4ad 
								
							
								 
							
						 
						
							
							
								
								Conform to new react and typescript eslint rules  
							
							
							
						 
						
							2021-07-19 22:43:11 +01:00  
				
					
						
							
							
								 
						
							
							
								de42a00ca4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686  
							
							... 
							
							
							
							 Conflicts:
	src/components/views/avatars/RoomAvatar.tsx
	test/stores/SpaceStore-test.ts
	test/test-utils.js 
							
						 
						
							2021-07-19 16:47:31 +01:00  
				
					
						
							
							
								 
						
							
							
								f7767bf09c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6393  from robintown/match-avatar-colors  
							
							
							
						 
						
							2021-07-17 14:12:29 +01:00  
				
					
						
							
							
								 
						
							
							
								16ed5c6645 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-16 21:43:33 +02:00  
				
					
						
							
							
								 
						
							
							
								eefadf6a46 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-07-16 15:30:26 -04:00  
				
					
						
							
							
								 
						
							
							
								831c482371 
								
							
								 
							
						 
						
							
							
								
								Stub out MatrixClient::isUserIgnored for tests  
							
							
							
						 
						
							2021-07-15 18:17:07 +01:00  
				
					
						
							
							
								 
						
							
							
								316b21408d 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2021-07-15 10:59:52 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								c7c29f2119 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6365  from psrpinto/fix/naming  
							
							
							
						 
						
							2021-07-15 08:07:03 +01:00