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  
				
					
						
							
							
								 
						
							
							
								4a6af5a4d7 
								
							
								 
							
						 
						
							
							
								
								fix test missing required prop  
							
							
							
						 
						
							2021-07-07 18:12:31 +01:00  
				
					
						
							
							
								 
						
							
							
								b36a727a09 
								
									
								
							
								 
							
						 
						
							
							
								
								Fourth batch of burning  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-02 18:15:05 +02:00  
				
					
						
							
							
								 
						
							
							
								b17d72c399 
								
							
								 
							
						 
						
							
							
								
								fix duplicate import  
							
							
							
						 
						
							2021-07-02 14:54:10 +01:00  
				
					
						
							
							
								 
						
							
							
								82119a08f7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into t3chguy/ts/11  
							
							
							
						 
						
							2021-07-02 11:03:54 +01:00  
				
					
						
							
							
								 
						
							
							
								88f691776f 
								
							
								 
							
						 
						
							
							
								
								Use sleep from js-sdk as no point duplicating it  
							
							
							
						 
						
							2021-07-01 22:55:27 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								ee9be5438e 
								
							
								 
							
						 
						
							
							
								
								eslint --fix  
							
							
							
						 
						
							2021-07-01 20:43:05 +01:00  
				
					
						
							
							
								 
						
							
							
								e768ecb3d0 
								
							
								 
							
						 
						
							
							
								
								Typescript conversion of Composer components and more  
							
							
							
						 
						
							2021-06-30 13:01:26 +01:00  
				
					
						
							
							
								 
						
							
							
								ae0a8b8da4 
								
							
								 
							
						 
						
							
							
								
								Auto-fix lint errors  
							
							
							
						 
						
							2021-06-29 13:11:58 +01:00  
				
					
						
							
							
								 
						
							
							
								0df6200dd0 
								
									
								
							
								 
							
						 
						
							
							
								
								Convert MemberList-test to TS  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-23 16:00:13 +02:00  
				
					
						
							
							
								 
						
							
							
								b3b9135b1f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6134  from matrix-org/t3chguy/fix/17529  
							
							
							
						 
						
							2021-06-22 21:28:51 +01:00  
				
					
						
							
							
								 
						
							
							
								8a3dc1bbdf 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							
							
						 
						
							2021-06-18 17:56:18 +01:00  
				
					
						
							
							
								 
						
							
							
								a52dd57eb2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17529  
							
							... 
							
							
							
							 Conflicts:
	package.json
	yarn.lock 
							
						 
						
							2021-06-15 13:59:54 +01:00  
				
					
						
							
							
								 
						
							
							
								6e0a908c59 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/react-17  
							
							
							
						 
						
							2021-06-09 12:01:35 +01:00  
				
					
						
							
							
								 
						
							
							
								d492ee4d8a 
								
							
								 
							
						 
						
							
							
								
								Update Enzyme adapter name  
							
							
							
						 
						
							2021-06-09 11:57:29 +01:00  
				
					
						
							
							
								 
						
							
							
								8334a2ba60 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6143  from robintown/hide-events-perf  
							
							
							
						 
						
							2021-06-09 09:13:56 +01:00  
				
					
						
							
							
								 
						
							
							
								e891d18fa2 
								
							
								 
							
						 
						
							
							
								
								Add my email to my copyright notices  
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-05 21:41:28 -04:00  
				
					
						
							
							
								 
						
							
							
								a06306d560 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							
							
						 
						
							2021-06-05 11:04:17 -04:00  
				
					
						
							
							
								 
						
							
							
								0f64f4d692 
								
							
								 
							
						 
						
							
							
								
								Fix MessagePanel tests  
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-05 10:49:44 -04:00  
				
					
						
							
							
								 
						
							
							
								7f83590846 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6079  from matrix-org/gsouquet/switch-rooms  
							
							
							
						 
						
							2021-06-03 08:44:01 +01:00  
				
					
						
							
							
								 
						
							
							
								d7a5547d80 
								
							
								 
							
						 
						
							
							
								
								use Intl.Collator over String.prototype.localeCompare for better performance  
							
							
							
						 
						
							2021-06-02 10:42:17 +01:00  
				
					
						
							
							
								 
						
							
							
								56714525f2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							
							
						 
						
							2021-06-01 17:28:55 -04:00  
				
					
						
							
							
								 
						
							
							
								0b7d3f007a 
								
							
								 
							
						 
						
							
							
								
								Remove react-beautiful-dnd  
							
							
							
						 
						
							2021-06-01 17:35:31 +01:00  
				
					
						
							
							
								 
						
							
							
								f11a7083ae 
								
							
								 
							
						 
						
							
							
								
								Switch to stable endpoint/fields for MSC2858  
							
							
							
						 
						
							2021-06-01 11:01:09 +01:00  
				
					
						
							
							
								 
						
							
							
								c7c6a818f0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/switch-rooms  
							
							
							
						 
						
							2021-05-26 09:51:27 +01:00  
				
					
						
							
							
								 
						
							
							
								121ed5eba9 
								
							
								 
							
						 
						
							
							
								
								Pass Matrix client around as matrixClient  
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-24 08:51:04 -04:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								7a04502151 
								
							
								 
							
						 
						
							
							
								
								Iterate on forward dialog design feedback  
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-21 12:41:29 -04:00  
				
					
						
							
							
								 
						
							
							
								c428736191 
								
							
								 
							
						 
						
							
							
								
								Update MessagePanel test to account for new DOM structure  
							
							
							
						 
						
							2021-05-21 14:59:26 +01:00  
				
					
						
							
							
								 
						
							
							
								678b298bab 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							
							
						 
						
							2021-05-19 12:39:48 -04:00  
				
					
						
							
							
								 
						
							
							
								506a798961 
								
							
								 
							
						 
						
							
							
								
								Add getMember mock  
							
							
							
						 
						
							2021-05-19 15:19:56 +05:30  
				
					
						
							
							
								 
						
							
							
								64e828d069 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							
							
						 
						
							2021-05-16 08:13:59 -04:00  
				
					
						
							
							
								 
						
							
							
								379d19e2e0 
								
									
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							
							
						 
						
							2021-05-10 19:56:30 -06:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								5c10e1e574 
								
							
								 
							
						 
						
							
							
								
								Fix lints  
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-10 01:16:37 -04:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								74925b2c6d 
								
							
								 
							
						 
						
							
							
								
								Test ForwardDialog  
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-05-08 21:11:06 -04:00  
				
					
						
							
							
								 
						
							
							
								2ad0032f72 
								
							
								 
							
						 
						
							
							
								
								Added regression tests for Natural headers  
							
							
							
						 
						
							2021-05-09 01:10:54 +05:30  
				
					
						
							
							
								 
						
							
							
								32edbc155f 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into err  
							
							
							
						 
						
							2021-05-07 19:16:00 +05:30  
				
					
						
							
							
								 
						
							
							
								d1f23fb994 
								
							
								 
							
						 
						
							
							
								
								Partially added the tests  [WIP]  
							
							
							
						 
						
							2021-05-07 11:45:52 +05:30  
				
					
						
							
							
								 
						
							
							
								232b87a3b4 
								
									
								
							
								 
							
						 
						
							
							
								
								Improve formatting  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-04-29 19:57:02 +02:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								a53696ff5e 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2021-04-21 16:53:29 -06:00  
				
					
						
							
							
								 
						
							
							
								a0049f956d 
								
							
								 
							
						 
						
							
							
								
								Patch over legacy Groups test  
							
							
							
						 
						
							2021-03-31 23:51:17 -06:00  
				
					
						
							
							
								 
						
							
							
								5d9b36afc1 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2021-03-25 23:47:41 -06:00  
				
					
						
							
							
								 
						
							
							
								6ab235f10c 
								
							
								 
							
						 
						
							
							
								
								Fix tests for new call path  
							
							... 
							
							
							
							We have to mock `fetch` for the caching of the download icon, and then mock out all the function calls used by components to feed a Media object. 
							
						 
						
							2021-03-11 09:42:55 -07:00