wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							2b1ed707c4 
							
						 
					 
					
						
						
							
							Better comments, and correct bottom header sticky calc to allow clicking  
						
						
						
						
					 
					
						2016-08-28 19:18:41 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							123d9b56c8 
							
						 
					 
					
						
						
							
							calculating the scrollAreaHeight correctly taking into account the different scroll methods available on macOSX, i.e. System Preferences>General>Show Scroll Bars  
						
						
						
						
					 
					
						2016-08-28 16:25:20 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							5e105e1be6 
							
						 
					 
					
						
						
							
							make /user URLs work  
						
						
						
						
					 
					
						2016-08-28 14:04:11 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							8f7d3394e6 
							
						 
					 
					
						
						
							
							Always setup stickies, even if we aren't going to use them so that the following map can fire  
						
						
						
						
					 
					
						2016-08-28 12:02:20 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							7631539584 
							
						 
					 
					
						
						
							
							Fixed incorrect init calculation of originalPosition attribute  
						
						
						
						
					 
					
						2016-08-28 11:39:47 +01:00 
						 
				 
			
				
					
						
							
							
								Aviral Dasgupta 
							
						 
					 
					
						
						
						
						
							
						
						
							7c6b1703f3 
							
						 
					 
					
						
						
							
							fix emojione sizing  
						
						
						
						
					 
					
						2016-08-28 14:54:07 +05:30 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							18436e1257 
							
						 
					 
					
						
						
							
							pick up ! matrix.to URLs  
						
						
						
						
					 
					
						2016-08-28 02:12:18 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							de82ac3bc0 
							
						 
					 
					
						
						
							
							don't change URL bar when clicking on linkified rooms or users.  
						
						... 
						
						
						
						be aware of /user paths. 
						
						
					 
					
						2016-08-28 02:05:31 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							ad873c2b60 
							
						 
					 
					
						
						
							
							handle matrix.to links correctly. add partial support for #/user URLs  
						
						
						
						
					 
					
						2016-08-28 01:55:42 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							50d09f73f5 
							
						 
					 
					
						
						
							
							add leave/forget button to RoomSettings  
						
						
						
						
					 
					
						2016-08-28 00:00:22 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							fb5f8294c8 
							
						 
					 
					
						
						
							
							switch to namespaced CSS  
						
						
						
						
					 
					
						2016-08-28 00:00:10 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							5b0d13c1fc 
							
						 
					 
					
						
						
							
							switch to namespaced CSS  
						
						
						
						
					 
					
						2016-08-27 23:59:55 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							5df98d70f4 
							
						 
					 
					
						
						
							
							add debugging to MemberAvatar to try to kick jenkins...  
						
						
						
						
					 
					
						2016-08-27 01:18:48 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							73dd05b01d 
							
						 
					 
					
						
						
							
							Corrected incorrect offset from top of window for the scrollArea  
						
						
						
						
					 
					
						2016-08-26 18:31:02 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							8ccb1d482a 
							
						 
					 
					
						
						
							
							Better comments, and adjusted the top sticky logic, so that the very top header isn't allways stuck  
						
						
						
						
					 
					
						2016-08-26 15:52:57 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							5f9c794f0c 
							
						 
					 
					
						
						
							
							Tweaking autoscroll to only adjust if header stuck at top and not at bottom  
						
						
						
						
					 
					
						2016-08-26 15:36:16 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							b9e95865af 
							
						 
					 
					
						
						
							
							Click on stuck header scrolls to that header, collapses expands for none stuck header  
						
						
						
						
					 
					
						2016-08-26 15:09:13 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							71e829fd32 
							
						 
					 
					
						
						
							
							Getting click to not collapse expand when header is stuck  
						
						
						
						
					 
					
						2016-08-26 14:36:39 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							774e24a3b4 
							
						 
					 
					
						
						
							
							Added some logic to turn off sticky headers when the scroll area isn't large enough to support them  
						
						
						
						
					 
					
						2016-08-26 11:01:04 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							c8c2f733e2 
							
						 
					 
					
						
						
							
							Re-calculate sticky header positions when sublist header is clicked  
						
						
						
						
					 
					
						2016-08-26 09:56:07 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							7fcdd0f77a 
							
						 
					 
					
						
						
							
							Initial pass at sticky headers for the LHS panel section labels  
						
						
						
						
					 
					
						2016-08-25 19:46:01 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							c8b2d5106f 
							
						 
					 
					
						
						
							
							Merge pull request  #430  from matrix-org/rav/fix_search_regression  
						
						... 
						
						
						
						Fix NPE when we don't know the sender of an event 
						
						
					 
					
						2016-08-25 19:31:16 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							96567dad0d 
							
						 
					 
					
						
						
							
							Fix NPE when we don't know the sender of an event  
						
						... 
						
						
						
						Fixes a bug introduced in
https://github.com/matrix-org/matrix-react-sdk/pull/426 .
Particularly when we are showing search results, we may not recognise the
sender of an event; attempting to create a MemberAvatar for it will lead to
null-reference errors.
Also a bit of untangling of the logic of needsSenderProfile. Since
https://github.com/matrix-org/matrix-react-sdk/pull/422 ,
EventTileType.needsSenderProfile was only being called on MessageEvents, and
therefore only returned true. It's a shame to see all this logic going into
EventTile rather than the individual EventTileTypes, but since it's there,
let's not leave the unused logic lying around in the EventTileType
implementations. 
						
						
					 
					
						2016-08-25 16:55:09 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							36d8fa9786 
							
						 
					 
					
						
						
							
							fix avatar clicking in memberinfo  
						
						
						
						
					 
					
						2016-08-25 16:20:38 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							c1db6fb42d 
							
						 
					 
					
						
						
							
							Merge pull request  #429  from matrix-org/rav/timelinepanel_test  
						
						... 
						
						
						
						Update annoying TimelinePanel test 
						
						
					 
					
						2016-08-25 15:40:03 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							ae910d82a8 
							
						 
					 
					
						
						
							
							Merge pull request  #416  from aviraldg/feature-changelog  
						
						... 
						
						
						
						add fancy changelog dialog 
						
						
					 
					
						2016-08-24 18:01:39 +01:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							cdd2902b01 
							
						 
					 
					
						
						
							
							Update annoying TimelinePanel test  
						
						... 
						
						
						
						* Actually test what we were supposed to be testing (viz, that we can paginate
  back down after we hit the top of the room)
* Make the cap on the number of events we show in the timeline a configurable
  property, so that we can set it in the test
* Use a smaller cap in the test, so that we have to do less paginating to hit
  the cap, to make the test run quicker.
* add some more logging so that we can see how far it's got if it gets stuck. 
						
						
					 
					
						2016-08-24 16:28:00 +01:00 
						 
				 
			
				
					
						
							
							
								Kegsay 
							
						 
					 
					
						
						
						
						
							
						
						
							97fc4249d4 
							
						 
					 
					
						
						
							
							Merge pull request  #428  from matrix-org/kegan/state-key-with-underscores  
						
						... 
						
						
						
						Send bot options with leading underscore on the state key 
						
						
					 
					
						2016-08-24 15:09:44 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							c292312115 
							
						 
					 
					
						
						
							
							Send bot options with leading underscore on the state key  
						
						... 
						
						
						
						This is in order to get around the synapse rule which states that if the
state key is a user ID, then only that user can send the event. We want to
set the event for another user (the bot), hence we can't send just the plain
user ID. 
						
						
					 
					
						2016-08-24 14:54:44 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							2f0599aae1 
							
						 
					 
					
						
						
							
							Merge pull request  #419  from aviraldg/feature-autocomplete-improvements  
						
						... 
						
						
						
						Update autocomplete design and scroll it correctly 
						
						
					 
					
						2016-08-24 14:47:22 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							6235d88b55 
							
						 
					 
					
						
						
							
							Missing return  
						
						
						
						
					 
					
						2016-08-24 14:10:21 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							73ba55abad 
							
						 
					 
					
						
						
							
							s/then/done/ to throw uncaught exceptions if the error function throws  
						
						
						
						
					 
					
						2016-08-24 13:47:35 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							dbff5f671e 
							
						 
					 
					
						
						
							
							Add ability to query and set bot options  
						
						... 
						
						
						
						- Also standardise on 'success' as the key name for successes.
- Also return the entire `content` on get state event requests. 
						
						
					 
					
						2016-08-24 13:23:06 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							08c0d7e298 
							
						 
					 
					
						
						
							
							Merge pull request  #426  from matrix-org/wmwragg/chat-message-presentation  
						
						... 
						
						
						
						Added event/info message avatars back in 
						
						
					 
					
						2016-08-23 17:14:11 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							ae8234ffe3 
							
						 
					 
					
						
						
							
							Added event/info message avatars back in  
						
						
						
						
					 
					
						2016-08-23 15:58:27 +01:00 
						 
				 
			
				
					
						
							
							
								Kegsay 
							
						 
					 
					
						
						
						
						
							
						
						
							c10208a203 
							
						 
					 
					
						
						
							
							Merge pull request  #423  from matrix-org/kegan/scalar-postmessage-api  
						
						... 
						
						
						
						Add postMessage API required for integration provisioning 
						
						
					 
					
						2016-08-23 15:00:44 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							ecc7850e13 
							
						 
					 
					
						
						
							
							Trailing )  
						
						
						
						
					 
					
						2016-08-23 14:50:52 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							1c649303e3 
							
						 
					 
					
						
						
							
							Consistency with sendResponse  
						
						
						
						
					 
					
						2016-08-23 14:50:29 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							e96a40004b 
							
						 
					 
					
						
						
							
							Review comments  
						
						
						
						
					 
					
						2016-08-23 14:41:47 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							f6b008350d 
							
						 
					 
					
						
						
							
							Spaces not tabs  
						
						
						
						
					 
					
						2016-08-23 13:31:55 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							6a4d02ffc5 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into wmwragg/direct-chat-sublist  
						
						
						
						
					 
					
						2016-08-23 12:49:21 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							c362d4ff01 
							
						 
					 
					
						
						
							
							Added updating of count when room tile notification state changed  
						
						
						
						
					 
					
						2016-08-23 12:40:28 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							9162a0ff01 
							
						 
					 
					
						
						
							
							Add postMessage API required for integration provisioning  
						
						... 
						
						
						
						Supports querying member state and creating invites only. 
						
						
					 
					
						2016-08-23 12:00:11 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							6d1f9003e2 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into wmwragg/direct-chat-sublist  
						
						
						
						
					 
					
						2016-08-23 10:52:50 +01:00 
						 
				 
			
				
					
						
							
							
								Aviral Dasgupta 
							
						 
					 
					
						
						
						
						
							
						
						
							884abbd7e9 
							
						 
					 
					
						
						
							
							Cleanup autocomplete  
						
						
						
						
					 
					
						2016-08-23 00:36:31 +05:30 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							edb7301b37 
							
						 
					 
					
						
						
							
							Moving the drirect messages above rooms  
						
						
						
						
					 
					
						2016-08-22 14:10:51 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							48a2567b82 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into wmwragg/chat-message-presentation  
						
						
						
						
					 
					
						2016-08-19 17:19:30 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							993333490d 
							
						 
					 
					
						
						
							
							Removal of the mini avatars for action (info) messages  
						
						
						
						
					 
					
						2016-08-19 16:38:05 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							afd1ab1582 
							
						 
					 
					
						
						
							
							Comment to describe what info messages are  
						
						
						
						
					 
					
						2016-08-18 22:19:23 +01:00 
						 
				 
			
				
					
						
							
							
								wmwragg 
							
						 
					 
					
						
						
						
						
							
						
						
							ddda435e9e 
							
						 
					 
					
						
						
							
							Updated the MessagePanel to now take account of /me messages when working out if an event is a continuation message or not  
						
						
						
						
					 
					
						2016-08-18 22:15:53 +01:00