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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								d7a5547d80 
								
							
								 
							
						 
						
							
							
								
								use Intl.Collator over String.prototype.localeCompare for better performance  
							
							
							
						 
						
							2021-06-02 10:42:17 +01:00  
				
					
						
							
							
								 
						
							
							
								0b7d3f007a 
								
							
								 
							
						 
						
							
							
								
								Remove react-beautiful-dnd  
							
							
							
						 
						
							2021-06-01 17:35:31 +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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								375ffafda6 
								
							
								 
							
						 
						
							
							
								
								Fix tests failing to load skin  
							
							... 
							
							
							
							We should find a better way to do this, but this works well enough. 
							
						 
						
							2021-03-09 10:13:16 -07:00  
				
					
						
							
							
								 
						
							
							
								b12cf7912a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5624  from SimonBrandner/show-room-name  
							
							... 
							
							
							
							Display room name in pills instead of address 
							
						 
						
							2021-03-08 16:27:43 +00:00  
				
					
						
							
							
								 
						
							
							
								f45510ed25 
								
							
								 
							
						 
						
							
							
								
								Fix test assuming too much about the underlying calls  
							
							
							
						 
						
							2021-02-19 13:08:30 +00:00  
				
					
						
							
							
								 
						
							
							
								a075568e89 
								
									
								
							
								 
							
						 
						
							
							
								
								Fixed tests  
							
							... 
							
							
							
							In the previous commits I have removed the native title/tooltip so it needs to be removed from the tests as well
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-02-12 11:34:09 +01:00  
				
					
						
							
							
								 
						
							
							
								474c029db5 
								
							
								 
							
						 
						
							
							
								
								Fix permalink via parsing for rooms  
							
							... 
							
							
							
							This adjusts the app local link parsing path to better handle `via`s in query
params. Previously this path only expected them when an event ID was also
present, but it's also valid to have `via`s without event IDs as well.
Fixes https://github.com/vector-im/element-web/issues/16345  
							
						 
						
							2021-02-03 15:18:19 +00:00  
				
					
						
							
							
								 
						
							
							
								89b835dd20 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5575  from matrix-org/jryans/no-event-pills  
							
							... 
							
							
							
							Remove pills from event permalinks with text 
							
						 
						
							2021-02-01 10:53:22 +00:00  
				
					
						
							
							
								 
						
							
							
								fa3ace8473 
								
							
								 
							
						 
						
							
							
								
								Rework message pilling to ignore event permalinks  
							
							... 
							
							
							
							This removes pills from event permalinks since they hide the text associated
with the link, which can cause nonsensical messages since words have been
removed. In addition, this moves away from fragile regexs to more
straightforward code to parse links and adds a test for this case.
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5188 
Fixes https://github.com/vector-im/element-web/issues/15159  
							
						 
						
							2021-01-27 11:46:20 +00:00  
				
					
						
							
							
								 
						
							
							
								e49a931588 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5533  from aaronraimist/security-key  
							
							... 
							
							
							
							Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase 
							
						 
						
							2021-01-21 17:46:02 +00:00  
				
					
						
							
							
								 
						
							
							
								97a551c04a 
								
							
								 
							
						 
						
							
							
								
								Fix test  
							
							
							
						 
						
							2021-01-14 17:39:58 +00:00  
				
					
						
							
							
								 
						
							
							
								6371a4abd1 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							... 
							
							
							
							Remove stray file extensions in includes and update shared instance
name. 
							
						 
						
							2021-01-13 16:02:35 +00:00  
				
					
						
							
							
								 
						
							
							
								4f96d5dee5 
								
									
								
							
								 
							
						 
						
							
							
								
								Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase  
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2021-01-04 19:17:17 -06:00  
				
					
						
							
							
								 
						
							
							
								0c85cb587d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into emoji_quick_shortcut  
							
							
							
						 
						
							2020-12-04 11:05:50 -05:00  
				
					
						
							
							
								 
						
							
							
								ba8d02a808 
								
							
								 
							
						 
						
							
							
								
								add quick shortcut emoji feature and tests  
							
							... 
							
							
							
							Signed-off-by: macekj <macekj@umich.edu> 
							
						 
						
							2020-11-17 17:36:58 -05:00  
				
					
						
							
							
								 
						
							
							
								3f9f1d03c8 
								
							
								 
							
						 
						
							
							
								
								stubbed isGuest for unit tests  
							
							
							
						 
						
							2020-10-29 13:22:09 +00:00  
				
					
						
							
							
								 
						
							
							
								b2d04deb83 
								
							
								 
							
						 
						
							
							
								
								fix tests for the new sessionStorage key  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-08 10:04:01 +01:00  
				
					
						
							
							
								 
						
							
							
								a8d88e01fb 
								
							
								 
							
						 
						
							
							
								
								Write Enzyme tests for SendMessageComposer state/history persistence behaviour  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-10-07 00:10:40 +01:00  
				
					
						
							
							
								 
						
							
							
								7bd5e3fa31 
								
							
								 
							
						 
						
							
							
								
								Move security-related dialogs to a common directory  
							
							
							
						 
						
							2020-09-16 15:03:06 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								38e93469d3 
								
							
								 
							
						 
						
							
							
								
								Fix broken test  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-07-23 09:01:44 +01:00  
				
					
						
							
							
								 
						
							
							
								2dfd636a9e 
								
							
								 
							
						 
						
							
							
								
								Appease the linter  
							
							
							
						 
						
							2020-07-17 16:28:49 -06:00  
				
					
						
							
							
								 
						
							
							
								c9b0b3b31d 
								
							
								 
							
						 
						
							
							
								
								RoomSublist2 -> RoomSublist  
							
							
							
						 
						
							2020-07-17 15:46:46 -06:00