Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								245a68b3ba 
								
							
								 
							
						 
						
							
							
								
								Merge branches 'develop' and 't3chguy/clean_up_TextualBody' of github.com:matrix-org/matrix-react-sdk into t3chguy/clean_up_TextualBody  
							
							 
							
							... 
							
							
							
							 Conflicts:
	yarn.lock 
							
						 
						
							2020-01-09 12:17:21 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								59f608ffd6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3761  from matrix-org/travis/babel7-wp-es6-export  
							
							 
							
							... 
							
							
							
							Convert CommonJS exports to ES6 exports 
							
						 
						
							2020-01-08 09:09:11 -07:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								7b91d2056b 
								
							
								 
							
						 
						
							
							
								
								Attempt to fix e2e tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-01-06 23:50:42 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								bdef54622b 
								
							
								 
							
						 
						
							
							
								
								delint and add copyright  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-01-06 14:52:08 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f1de6d060a 
								
							
								 
							
						 
						
							
							
								
								Add a regression test for editing events and url previews  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-01-06 14:38:21 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								c551f2983a 
								
							
								 
							
						 
						
							
							
								
								Add TextualBody-test.js  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-01-06 13:28:29 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								c802f9a302 
								
							
								 
							
						 
						
							
							
								
								remove unused stale Test Suite  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-01-06 00:23:19 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								d31c863563 
								
							
								 
							
						 
						
							
							
								
								Remove all usages of slate in favour of CIDER  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-01-06 00:15:48 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								06230e01e3 
								
							
								 
							
						 
						
							
							
								
								Fix End-to-End tests for RoomSettings interactivity  
							
							 
							
							
							
						 
						
							2019-12-26 19:36:16 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								042bd35d79 
								
							
								 
							
						 
						
							
							
								
								Fix MatrixClientPeg imports  
							
							 
							
							
							
						 
						
							2019-12-22 21:15:54 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								4aec432b30 
								
							
								 
							
						 
						
							
							
								
								Convert the more complicated CommonJS exports to ES6-style  
							
							 
							
							
							
						 
						
							2019-12-22 21:01:03 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								344dac4fb9 
								
							
								 
							
						 
						
							
							
								
								Convert CommonJS exports to ES6-compatible exports  
							
							 
							
							... 
							
							
							
							We use `export default` begrudgingly here. Ideally we'd use just `export`, though this entire SDK expects things to be exported as a default. Instead of breaking everything, we'll sacrifice our export pattern for a smaller diff - a later commit can always do the default export -> regular export conversion. 
							
						 
						
							2019-12-22 21:01:02 -07:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								513ec30ef1 
								
							
								 
							
						 
						
							
							
								
								Fix tests v2  
							
							 
							
							
							
						 
						
							2019-12-17 18:02:45 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f3ca4c0b7c 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2019-12-17 17:54:19 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								da4d72b3c4 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							 
							
							
							
						 
						
							2019-12-17 17:34:03 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								937b32663c 
								
							
								 
							
						 
						
							
							
								
								Migrate away from Legacy React Contexts  
							
							 
							
							
							
						 
						
							2019-12-17 17:26:12 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								b9e22f8141 
								
							
								 
							
						 
						
							
							
								
								add delay  
							
							 
							
							
							
						 
						
							2019-12-17 13:11:30 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								409a111b02 
								
							
								 
							
						 
						
							
							
								
								wait additional tick  
							
							 
							
							
							
						 
						
							2019-12-17 12:42:47 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								c3415d2121 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							 
							
							
							
						 
						
							2019-12-17 12:09:01 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								802092bf9a 
								
							
								 
							
						 
						
							
							
								
								All tests passing locally. We no longer need Chrome in buildkite  
							
							 
							
							
							
						 
						
							2019-12-17 11:53:18 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								e6d8487302 
								
							
								 
							
						 
						
							
							
								
								Fix more tests  
							
							 
							
							
							
						 
						
							2019-12-17 11:47:01 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								ab3fb6581b 
								
							
								 
							
						 
						
							
							
								
								Down to 7 test failures  
							
							 
							
							
							
						 
						
							2019-12-17 11:24:37 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								0041dae664 
								
							
								 
							
						 
						
							
							
								
								26 test failures to go :D  
							
							 
							
							
							
						 
						
							2019-12-16 11:55:01 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								6ad31fe023 
								
							
								 
							
						 
						
							
							
								
								30 test failures to go :D  
							
							 
							
							
							
						 
						
							2019-12-16 11:12:48 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								ffa2ac172c 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							 
							
							
							
						 
						
							2019-12-15 14:09:41 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								18f81d80db 
								
							
								 
							
						 
						
							
							
								
								Initial jest stuff. Blocked on Babel 7  
							
							 
							
							
							
						 
						
							2019-12-13 13:43:48 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								7230d51cca 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3703  from matrix-org/travis/right-panel-v2  
							
							 
							
							... 
							
							
							
							Refactor RightPanel to match expected behaviour 
							
						 
						
							2019-12-11 10:50:45 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								405b3f6be6 
								
							
								 
							
						 
						
							
							
								
								Fix member list not being open for end-to-end tests  
							
							 
							
							
							
						 
						
							2019-12-06 16:33:03 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								185830e4f3 
								
							
								 
							
						 
						
							
							
								
								Fix end-to-end tests  
							
							 
							
							... 
							
							
							
							The right panel needs to be opened manually now. 
							
						 
						
							2019-12-06 14:22:27 -07:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a63fbbf2db 
								
							
								 
							
						 
						
							
							
								
								Add tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-12-05 00:11:10 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a2e3f64963 
								
							
								 
							
						 
						
							
							
								
								Change read markers to use CSS transitions  
							
							 
							
							... 
							
							
							
							Removes one of the two places we use Velocity, so we're one step
closer to getting rid of it for good.
Should therefore fix the fact that Velocity is leaking data entries
and therefore <hr> elements.
Hopefully also makes the logic in getEventTiles incrementally simpler,
if still somwewhat byzantine. 
							
						 
						
							2019-11-26 19:06:02 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								d4d51dc61f 
								
							
								 
							
						 
						
							
							
								
								Rip out the remainder of Bluebird  
							
							 
							
							
							
						 
						
							2019-11-18 10:03:05 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								b3760cdd6e 
								
							
								 
							
						 
						
							
							
								
								Replace usages of Promise.delay(...) with own utils  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-11-14 14:25:54 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								41f4f3ef82 
								
							
								 
							
						 
						
							
							
								
								make end-to-end test failure more verbose  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-11-14 14:04:50 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								168b1b68bb 
								
							
								 
							
						 
						
							
							
								
								Revert "s/.done(/.then(/ since modern es6 track unhandled promise exceptions"  
							
							 
							
							... 
							
							
							
							This reverts commit 09a8fec2 
							
						 
						
							2019-11-12 11:56:21 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								09a8fec261 
								
							
								 
							
						 
						
							
							
								
								s/.done(/.then(/ since modern es6 track unhandled promise exceptions  
							
							 
							
							
							
						 
						
							2019-11-12 11:51:23 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								616ff5ce76 
								
							
								 
							
						 
						
							
							
								
								adjust list item numbers in test that are now preserved  
							
							 
							
							
							
						 
						
							2019-10-22 15:43:40 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
								
								
							
							
								
							
								fc175a971c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3537  from matrix-org/bwindels/merge-e2e-tests  
							
							 
							
							... 
							
							
							
							Merge end-to-end tests 
							
						 
						
							2019-10-21 08:31:35 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								b03ebb964b 
								
							
								 
							
						 
						
							
							
								
								split up installing static webserver and riot copy  
							
							 
							
							... 
							
							
							
							so we can just do the latter for the e2e tests on CI 
							
						 
						
							2019-10-18 17:18:18 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
								
								
							
							
								
							
								dca968375d 
								
									
								
							
								 
							
						 
						
							
							
								
								Update test/end-to-end-tests/run.sh  
							
							 
							
							
							
						 
						
							2019-10-18 12:33:42 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
								
								
							
							
								
							
								3d15026da3 
								
									
								
							
								 
							
						 
						
							
							
								
								Update test/end-to-end-tests/run.sh  
							
							 
							
							
							
						 
						
							2019-10-18 12:33:32 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
								
								
							
							
								
							
								15a75737ff 
								
									
								
							
								 
							
						 
						
							
							
								
								Update test/end-to-end-tests/README.md  
							
							 
							
							... 
							
							
							
							Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2019-10-18 12:29:09 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
								
								
							
							
								
							
								76c7f58235 
								
									
								
							
								 
							
						 
						
							
							
								
								Update test/end-to-end-tests/README.md  
							
							 
							
							... 
							
							
							
							Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2019-10-18 12:28:58 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
								
								
							
							
								
							
								142a32b528 
								
									
								
							
								 
							
						 
						
							
							
								
								Update test/end-to-end-tests/README.md  
							
							 
							
							... 
							
							
							
							Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2019-10-18 12:28:47 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
								
								
							
							
								
							
								06e69d114f 
								
									
								
							
								 
							
						 
						
							
							
								
								Update test/end-to-end-tests/README.md  
							
							 
							
							... 
							
							
							
							Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2019-10-18 12:28:31 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
								
								
							
							
								
							
								5025a0ffea 
								
									
								
							
								 
							
						 
						
							
							
								
								Update test/end-to-end-tests/README.md  
							
							 
							
							... 
							
							
							
							Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2019-10-18 12:28:12 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
								
								
							
							
								
							
								8a028029ee 
								
									
								
							
								 
							
						 
						
							
							
								
								Update test/end-to-end-tests/install.sh  
							
							 
							
							... 
							
							
							
							Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2019-10-18 12:28:04 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
								
								
							
							
								
							
								6236909d93 
								
									
								
							
								 
							
						 
						
							
							
								
								Update test/end-to-end-tests/README.md  
							
							 
							
							... 
							
							
							
							Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2019-10-18 12:27:52 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
								
								
							
							
								
							
								683947e0b7 
								
									
								
							
								 
							
						 
						
							
							
								
								Update test/end-to-end-tests/README.md  
							
							 
							
							... 
							
							
							
							Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2019-10-18 12:27:43 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								15bbf3a999 
								
							
								 
							
						 
						
							
							
								
								fix the lint fix  
							
							 
							
							
							
						 
						
							2019-10-10 12:12:13 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								4b9a29cb60 
								
							
								 
							
						 
						
							
							
								
								put exec perms back on install script  
							
							 
							
							
							
						 
						
							2019-10-10 11:55:31 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								6f9604992b 
								
							
								 
							
						 
						
							
							
								
								copyright  
							
							 
							
							
							
						 
						
							2019-10-10 11:42:59 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								645a9d836f 
								
							
								 
							
						 
						
							
							
								
								install static webserver for server symlinked riot on CI  
							
							 
							
							
							
						 
						
							2019-10-10 11:40:04 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								2d848bba29 
								
							
								 
							
						 
						
							
							
								
								fix lint  
							
							 
							
							
							
						 
						
							2019-10-09 17:57:55 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								ebc2bba0c3 
								
							
								 
							
						 
						
							
							
								
								warn if not installed yet when running e2e tests  
							
							 
							
							
							
						 
						
							2019-10-09 17:37:57 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								f8358fa4d0 
								
							
								 
							
						 
						
							
							
								
								make e2e test safe to run from anywhere  
							
							 
							
							
							
						 
						
							2019-10-09 17:37:41 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								59cc36ca65 
								
							
								 
							
						 
						
							
							
								
								don't fetch riot/master by default when installing e2e tests  
							
							 
							
							
							
						 
						
							2019-10-09 17:34:40 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								de21cb24e0 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'e2etests/bwindels/use-cider' into bwindels/merge-e2e-tests  
							
							 
							
							
							
						 
						
							2019-10-09 17:12:50 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								cad71913e9 
								
							
								 
							
						 
						
							
							
								
								only run riot static server if no riot url has been provided  
							
							 
							
							
							
						 
						
							2019-10-09 16:59:00 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								ae38e0b357 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'e2etests/bwindels/bigmerge' into bwindels/merge-e2e-tests  
							
							 
							
							
							
						 
						
							2019-10-09 16:55:32 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								ca86969f92 
								
							
								 
							
						 
						
							
							
								
								move everything to subfolder to merge into react-sdk  
							
							 
							
							
							
						 
						
							2019-10-09 16:52:48 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								aae5bb9f39 
								
							
								 
							
						 
						
							
							
								
								Use new React Shallow renderer with hooks support  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-10-09 13:08:16 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								5c960dccb7 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-10-09 12:51:08 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								efeb6e87c4 
								
							
								 
							
						 
						
							
							
								
								Use new React Shallow renderer with hooks support  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-10-09 12:51:08 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								34530843f4 
								
							
								 
							
						 
						
							
							
								
								Factor out generic EventListSummary from MELS  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-10-09 12:50:03 +02:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								0862ad029d 
								
							
								 
							
						 
						
							
							
								
								Fix permalinks test  
							
							 
							
							
							
						 
						
							2019-09-30 21:15:31 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								fc66e69c02 
								
							
								 
							
						 
						
							
							
								
								Rename RoomPermalinkCreator -> Permalinks due to scope  
							
							 
							
							... 
							
							
							
							The file handles more than just a RoomPermalinkCreator, so we should name it accordingly. 
							
						 
						
							2019-09-30 20:39:58 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								64aa6695f5 
								
							
								 
							
						 
						
							
							
								
								Move matrix-to.js to utils/permalinks/RoomPermalinkCreator  
							
							 
							
							... 
							
							
							
							Just a little bit of refactoring to make the feature of custom prefixes a bit easier. 
							
						 
						
							2019-09-30 12:16:46 -06:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								7f4e070807 
								
							
								 
							
						 
						
							
							
								
								fix deserialize unit tests  
							
							 
							
							
							
						 
						
							2019-09-23 15:34:01 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								d5c96b86d4 
								
							
								 
							
						 
						
							
							
								
								fix test  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-09-19 10:31:34 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								02dfdffc4f 
								
							
								 
							
						 
						
							
							
								
								Fix failing test due to newly added assumption  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-09-18 14:35:13 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								99b8193ce7 
								
							
								 
							
						 
						
							
							
								
								Use the new ShallowRenderer over ReactTestUtils  
							
							 
							
							... 
							
							
							
							Mostly because the ReactTestUtils renderer doesn't exist anymore. 
							
						 
						
							2019-09-17 14:33:32 -06:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								bf30cfe699 
								
							
								 
							
						 
						
							
							
								
								Fix other test  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-09-11 17:44:04 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								1c7d67e8b3 
								
							
								 
							
						 
						
							
							
								
								fix test  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-09-11 17:44:04 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								70ff2bc9cd 
								
							
								 
							
						 
						
							
							
								
								Switch to createReactClass: views/rooms and test/components. React 16 :D  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-09-06 15:04:46 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								be79cdddb0 
								
							
								 
							
						 
						
							
							
								
								apply autocomplete changes to mock to fix editor unit tests  
							
							 
							
							
							
						 
						
							2019-08-29 18:00:38 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								c44fbb73d0 
								
							
								 
							
						 
						
							
							
								
								fix bug when replacing range starting at end of previous part  
							
							 
							
							
							
						 
						
							2019-08-28 15:52:39 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								994bcb5c85 
								
							
								 
							
						 
						
							
							
								
								dont expect rendered to be called from `range.replace()` anymore  
							
							 
							
							... 
							
							
							
							as this is now called from the `transform` method, unused in this test 
							
						 
						
							2019-08-27 16:43:05 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
								
								
							
							
								
							
								e0b99b5cc8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3342  from matrix-org/bwindels/cider-replace-emoticons  
							
							 
							
							... 
							
							
							
							Auto-replace emoticons with emojis in new composer 
							
						 
						
							2019-08-27 14:40:53 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								bcbd603874 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3345  from matrix-org/t3chguy/react16_3  
							
							 
							
							... 
							
							
							
							Switch from react-addons-test-utils to react-dom/test-utils. React 16 :D 
							
						 
						
							2019-08-26 19:44:51 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								0e65f71a37 
								
							
								 
							
						 
						
							
							
								
								support incrementing/decrementing doc positions with predicate  
							
							 
							
							
							
						 
						
							2019-08-26 16:16:27 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								10291bafe0 
								
							
								 
							
						 
						
							
							
								
								add support for selecting ranges in the editor model, and replacing them  
							
							 
							
							... 
							
							
							
							this to support finding emoticons and replacing them with an emoji 
							
						 
						
							2019-08-26 16:16:27 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								accb0abe2d 
								
							
								 
							
						 
						
							
							
								
								Switch from react-addons-test-utils to react-dom/test-utils. React 16 :D  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-24 11:47:07 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								e5d3198f53 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3339  from matrix-org/t3chguy/substitute_handle_global  
							
							 
							
							... 
							
							
							
							Iterate over all instances of variable/tag for _t substitutions 
							
						 
						
							2019-08-23 19:43:40 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								310457059b 
								
							
								 
							
						 
						
							
							
								
								[i18n] only append tail if it is actually needed  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-22 18:31:02 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								b5daba9026 
								
							
								 
							
						 
						
							
							
								
								Iterate over all instances of variable/tag for _t substitutions  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-22 18:17:08 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								5cebce9bbf 
								
							
								 
							
						 
						
							
							
								
								fix bug detected by tests  
							
							 
							
							
							
						 
						
							2019-08-22 14:41:40 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								1dd052d9dd 
								
							
								 
							
						 
						
							
							
								
								fix test after refactoring  
							
							 
							
							
							
						 
						
							2019-08-22 14:38:24 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a87fb7eaa2 
								
							
								 
							
						 
						
							
							
								
								also remove from comment  
							
							 
							
							
							
						 
						
							2019-08-16 15:36:41 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								3c4c595f79 
								
							
								 
							
						 
						
							
							
								
								remove old serverCaps  
							
							 
							
							
							
						 
						
							2019-08-16 15:27:11 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								19c7a4627d 
								
							
								 
							
						 
						
							
							
								
								fix test  
							
							 
							
							
							
						 
						
							2019-08-16 12:24:52 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								299cf8542c 
								
							
								 
							
						 
						
							
							
								
								Split MessageEditor in edit-specifics & reusable part for main composer  
							
							 
							
							
							
						 
						
							2019-08-05 15:31:18 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								af3eebd0a6 
								
							
								 
							
						 
						
							
							
								
								add undo steps after word boundary (or capped) when typing or removing  
							
							 
							
							
							
						 
						
							2019-08-02 11:31:01 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								07b2e51dce 
								
							
								 
							
						 
						
							
							
								
								put max step length in constant  
							
							 
							
							
							
						 
						
							2019-08-01 16:27:17 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								aa22c90f2c 
								
							
								 
							
						 
						
							
							
								
								HistoryManager + unit tests  
							
							 
							
							
							
						 
						
							2019-08-01 11:25:04 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								201d7fb448 
								
							
								 
							
						 
						
							
							
								
								Merge branches 'develop' and 't3chguy/prop-types' of github.com:matrix-org/matrix-react-sdk into t3chguy/prop-types  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	test/components/structures/MessagePanel-test.js 
							
						 
						
							2019-07-31 12:21:00 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								1087e04bb5 
								
							
								 
							
						 
						
							
							
								
								Replace React.PropTypes with usage of the `prop-types` package  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-07-31 12:19:29 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
								
								
							
							
								
							
								fb77802d54 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3260  from matrix-org/t3chguy/hide_msg_action_buttons_on_perms  
							
							 
							
							... 
							
							
							
							Introduce RoomContext for sharing state between RoomView and children 
							
						 
						
							2019-07-31 11:43:26 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								c338f8bf1f 
								
							
								 
							
						 
						
							
							
								
								Add `room` context to test  
							
							 
							
							
							
						 
						
							2019-07-31 11:17:28 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
								
								
							
							
								
							
								e855a056c7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3247  from matrix-org/bwindels/editortests  
							
							 
							
							... 
							
							
							
							Unit tests for new editor 
							
						 
						
							2019-07-30 14:46:33 +00:00