90cc26c78f 
								
							
								 
							
						 
						
							
							
								
								rename workflow  
							
							
							
						 
						
							2021-06-09 12:17:12 +01:00  
				
					
						
							
							
								 
						
							
							
								c9b1d1aef0 
								
									
								
							
								 
							
						 
						
							
							
								
								Only run e2e tests on develop and PR targetting develop  
							
							... 
							
							
							
							Co-authored-by: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2021-06-09 10:38:28 +01:00  
				
					
						
							
							
								 
						
							
							
								5c62728d13 
								
							
								 
							
						 
						
							
							
								
								Migrate end to end tests pipeline to GitHub Actions  
							
							
							
						 
						
							2021-06-08 12:52:32 +01:00  
				
					
						
							
							
								 
						
							
							
								bd8fd77d54 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6148  from robintown/fix-timestamps  
							
							
							
						 
						
							2021-06-07 13:12:11 +01:00  
				
					
						
							
							
								 
						
							
							
								b60feab7d2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6147  from robintown/easier-image-panning  
							
							
							
						 
						
							2021-06-07 12:47:43 +01:00  
				
					
						
							
							
								 
						
							
							
								a3a6f3fa31 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6154  from matrix-org/gsouquet/fix-files-scroll-token  
							
							
							
						 
						
							2021-06-07 12:44:59 +01:00  
				
					
						
							
							
								 
						
							
							
								7abf680e51 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6153  from matrix-org/t3chguy/ts/123  
							
							
							
						 
						
							2021-06-07 12:40:41 +01:00  
				
					
						
							
							
								 
						
							
							
								ea6904ce2a 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix local echo comment for scroll tokens  
							
							... 
							
							
							
							Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2021-06-07 12:37:11 +01:00  
				
					
						
							
							
								 
						
							
							
								d111f4cbb1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/fix-files-scroll-token  
							
							
							
						 
						
							2021-06-07 12:25:08 +01:00  
				
					
						
							
							
								 
						
							
							
								6693c39709 
								
							
								 
							
						 
						
							
							
								
								make event list summary a list item  
							
							
							
						 
						
							2021-06-07 12:17:29 +01:00  
				
					
						
							
							
								 
						
							
							
								4cc95dd184 
								
							
								 
							
						 
						
							
							
								
								Make skinning less upset  
							
							
							
						 
						
							2021-06-07 11:20:35 +01:00  
				
					
						
							
							
								 
						
							
							
								ae04b2ce4a 
								
							
								 
							
						 
						
							
							
								
								Fix Dialog/Modal types defn  
							
							
							
						 
						
							2021-06-07 11:06:30 +01:00  
				
					
						
							
							
								 
						
							
							
								2525db6fb1 
								
							
								 
							
						 
						
							
							
								
								Convert Resend to Typescript  
							
							
							
						 
						
							2021-06-07 11:03:39 +01:00  
				
					
						
							
							
								 
						
							
							
								f6e4943bef 
								
							
								 
							
						 
						
							
							
								
								Convert RoomAliasCache to Typescript  
							
							
							
						 
						
							2021-06-07 11:01:38 +01:00  
				
					
						
							
							
								 
						
							
							
								50d3e04bda 
								
							
								 
							
						 
						
							
							
								
								Convert MatrixActionCreators to Typescript  
							
							
							
						 
						
							2021-06-07 10:58:22 +01:00  
				
					
						
							
							
								 
						
							
							
								c8b3acb7e4 
								
							
								 
							
						 
						
							
							
								
								Convert utils to Typescript  
							
							
							
						 
						
							2021-06-07 10:57:46 +01:00  
				
					
						
							
							
								 
						
							
							
								b2d9dd7214 
								
							
								 
							
						 
						
							
							
								
								Convert LifecycleStore to Typescript  
							
							
							
						 
						
							2021-06-07 10:57:39 +01:00  
				
					
						
							
							
								 
						
							
							
								3431ebb995 
								
							
								 
							
						 
						
							
							
								
								Convert AsyncWrapper to Typescript  
							
							
							
						 
						
							2021-06-07 10:57:25 +01:00  
				
					
						
							
							
								 
						
							
							
								9315a87ebf 
								
							
								 
							
						 
						
							
							
								
								Convert EventIndex to Typescript  
							
							
							
						 
						
							2021-06-07 10:57:11 +01:00  
				
					
						
							
							
								 
						
							
							
								d2ce670d3e 
								
							
								 
							
						 
						
							
							
								
								Remove unused code  
							
							
							
						 
						
							2021-06-07 10:56:10 +01:00  
				
					
						
							
							
								 
						
							
							
								96ab920577 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6142  from matrix-org/dbkr/lint_ts_tests  
							
							... 
							
							
							
							Lint the typescript tests 
							
						 
						
							2021-06-07 09:51:24 +01:00  
				
					
						
							
							
								 
						
							
							
								a6ddffe74c 
								
							
								 
							
						 
						
							
							
								
								Add scroll token to file and notif event tiles  
							
							
							
						 
						
							2021-06-07 09:26:42 +01:00  
				
					
						
							
							
								 
						
							
							
								00dd6e878f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6146  from robintown/fix-jump-to-bottom  
							
							... 
							
							
							
							Fix jumping to bottom without a highlighted event 
							
						 
						
							2021-06-07 09:01:47 +01:00  
				
					
						
							
							
								 
						
							
							
								ea2120bdfd 
								
							
								 
							
						 
						
							
							
								
								Fix timestamps  
							
							... 
							
							
							
							7f83590846 
						
							2021-06-06 01:55:01 -04:00  
				
					
						
							
							
								 
						
							
							
								17edfec3aa 
								
							
								 
							
						 
						
							
							
								
								Make it easier to pan images in the lightbox  
							
							... 
							
							
							
							Previously, if you were dragging an image and your cursor outpaced the
edge of the image as it was moving, panning would abruptly stop. This
moves a few of the lightbox event listeners one level up to the image
wrapper to ensure that all drag movements are detected, even if they
don't end over the image's current position.
Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-05 21:08:44 -04:00  
				
					
						
							
							
								 
						
							
							
								b06da16a85 
								
							
								 
							
						 
						
							
							
								
								Fix jumping to bottom without a highlighted event  
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-05 13:20:27 -04:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								abfe6d85a0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6141  from matrix-org/jryans/repair-event-status  
							
							... 
							
							
							
							Repair event status position in timeline 
							
						 
						
							2021-06-04 14:16:59 +01:00  
				
					
						
							
							
								 
						
							
							
								ab96d5f8af 
								
							
								 
							
						 
						
							
							
								
								Repair event status position in timeline  
							
							... 
							
							
							
							https://github.com/matrix-org/matrix-react-sdk/pull/6079  caused a regression in
the event status indicator. The `mx_EventTile_msgOption` container was folded
into the avatars code path, but the event status is a special case of this, so
it now needs to also have this container to preserve its positioning.
Fixes https://github.com/vector-im/element-web/issues/17552  
						
							2021-06-04 11:54:58 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								f22fd7aa3b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6096  from matrix-org/t3chguy/fix/6606  
							
							
							
						 
						
							2021-06-04 00:00:31 +01:00  
				
					
						
							
							
								 
						
							
							
								5d0d81e79a 
								
							
								 
							
						 
						
							
							
								
								not sure how I butchered this merge conflict resolution this much.  
							
							
							
						 
						
							2021-06-03 19:37:26 +01:00  
				
					
						
							
							
								 
						
							
							
								93010d34fd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into t3chguy/fix/6606  
							
							
							
						 
						
							2021-06-03 19:33:09 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								a36063704d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6138  from matrix-org/gsouquet/containment-event  
							
							... 
							
							
							
							Fix mx_Event containment rules and empty read avatar row 
							
						 
						
							2021-06-03 16:38:55 +01:00  
				
					
						
							
							
								 
						
							
							
								5ef78f43a4 
								
							
								 
							
						 
						
							
							
								
								fix containment rule to keep height when resizing vertically  
							
							
							
						 
						
							2021-06-03 16:26:20 +01:00  
				
					
						
							
							
								 
						
							
							
								8ef95a6237 
								
							
								 
							
						 
						
							
							
								
								Interface dispatcher payload  
							
							... 
							
							
							
							& use constant in test 
							
						 
						
							2021-06-03 14:38:13 +01:00  
				
					
						
							
							
								 
						
							
							
								7f83590846 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6079  from matrix-org/gsouquet/switch-rooms  
							
							
							
						 
						
							2021-06-03 08:44:01 +01:00  
				
					
						
							
							
								 
						
							
							
								4f50727010 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606  
							
							... 
							
							
							
							 Conflicts:
	src/components/structures/RoomView.tsx
	src/components/views/right_panel/UserInfo.tsx 
							
						 
						
							2021-06-03 08:42:05 +01:00  
				
					
						
							
							
								 
						
							
							
								83d223475b 
								
							
								 
							
						 
						
							
							
								
								delint imports  
							
							
							
						 
						
							2021-06-03 08:41:22 +01:00  
				
					
						
							
							
								 
						
							
							
								a34f8a29f4 
								
							
								 
							
						 
						
							
							
								
								fix mx_Event containment rules and empty read avatar row  
							
							
							
						 
						
							2021-06-03 08:41:12 +01:00  
				
					
						
							
							
								 
						
							
							
								4765216280 
								
							
								 
							
						 
						
							
							
								
								Merge branch 't3chguy/fix/6606' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606  
							
							
							
						 
						
							2021-06-03 08:36:04 +01:00  
				
					
						
							
							
								 
						
							
							
								42a3ace82a 
								
							
								 
							
						 
						
							
							
								
								Iterate PR based on feedback  
							
							
							
						 
						
							2021-06-03 08:35:12 +01:00  
				
					
						
							
							
								 
						
							
							
								430cfa9c06 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6127  from matrix-org/gsouquet/css-containment  
							
							... 
							
							
							
							Add CSS containment rules for shorter reflow operations 
							
						 
						
							2021-06-03 08:10:29 +01:00  
				
					
						
							
							
								 
						
							
							
								53fc475539 
								
									
								
							
								 
							
						 
						
							
							
								
								Update src/components/views/rooms/PinnedEventTile.tsx  
							
							... 
							
							
							
							Co-authored-by: Travis Ralston <travisr@matrix.org> 
							
						 
						
							2021-06-03 08:03:31 +01:00  
				
					
						
							
							
								 
						
							
							
								58652152c1 
								
							
								 
							
						 
						
							
							
								
								Strings are now in a different place...  
							
							
							
						 
						
							2021-06-02 17:52:26 +01:00  
				
					
						
							
							
								 
						
							
							
								0aeddea30f 
								
							
								 
							
						 
						
							
							
								
								Only do native lookup if it's supported  
							
							... 
							
							
							
							Also fix as bug where we were checking the wrong field to check
for native/virtual support: oops. 
							
						 
						
							2021-06-02 17:47:29 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								4290237bdf 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6135  from matrix-org/t3chguy/fix/17494  
							
							... 
							
							
							
							ignore hash/fragment when de-duplicating links for url previews 
							
						 
						
							2021-06-02 15:08:41 +01:00  
				
					
						
							
							
								 
						
							
							
								70e309f0de 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5823  from matrix-org/gsouquet-scroll-to-live-reset-hash  
							
							
							
						 
						
							2021-06-02 14:10:16 +01:00