8da7b98ad0 
								
							
								 
							
						 
						
							
							
								
								RTE: Remove dead code, fix <del> styling  
							
							
							
						 
						
							2016-09-08 11:21:39 +05:30  
				
					
						
							
							
								 
						
							
							
								c11232742b 
								
							
								 
							
						 
						
							
							
								
								Fix focus and toggling issues in formatting bar  
							
							
							
						 
						
							2016-09-08 02:46:56 +05:30  
				
					
						
							
							
								 
						
							
							
								8974442084 
								
							
								 
							
						 
						
							
							
								
								Hide empty autocomplete and remove word counter  
							
							
							
						 
						
							2016-09-08 00:43:10 +05:30  
				
					
						
							
							
								 
						
							
							
								802ec1169f 
								
							
								 
							
						 
						
							
							
								
								Fix Markdown conversion to not add extra \n  
							
							... 
							
							
							
							Fixes  vector-im/vector-web#2094  
						
							2016-09-08 00:03:55 +05:30  
				
					
						
							
							
								 
						
							
							
								f0f20beae0 
								
							
								 
							
						 
						
							
							
								
								RTE format bar enhancements  
							
							
							
						 
						
							2016-09-08 00:03:54 +05:30  
				
					
						
							
							
								 
						
							
							
								0c0c44b050 
								
							
								 
							
						 
						
							
							
								
								Formatting toggle, markdown indicator, quoting  
							
							... 
							
							
							
							Fixes  vector-im/vector-web#1825  
						
							2016-09-08 00:02:55 +05:30  
				
					
						
							
							
								 
						
							
							
								71251293e4 
								
							
								 
							
						 
						
							
							
								
								RTE formatbar (wip)  
							
							... 
							
							
							
							Fixes  vector-im/vector-web#2024  
						
							2016-09-08 00:02:16 +05:30  
				
					
						
							
							
								 
						
							
							
								cd07907392 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #431  from aviraldg/fix-emojione-sizing  
							
							... 
							
							
							
							fix emojione sizing 
							
						 
						
							2016-08-28 11:55:14 +01:00  
				
					
						
							
							
								 
						
							
							
								7c6b1703f3 
								
							
								 
							
						 
						
							
							
								
								fix emojione sizing  
							
							
							
						 
						
							2016-08-28 14:54:07 +05:30  
				
					
						
							
							
								 
						
							
							
								18436e1257 
								
							
								 
							
						 
						
							
							
								
								pick up ! matrix.to URLs  
							
							
							
						 
						
							2016-08-28 02:12:18 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								ad873c2b60 
								
							
								 
							
						 
						
							
							
								
								handle matrix.to links correctly. add partial support for #/user URLs  
							
							
							
						 
						
							2016-08-28 01:55:42 +01:00  
				
					
						
							
							
								 
						
							
							
								50d09f73f5 
								
							
								 
							
						 
						
							
							
								
								add leave/forget button to RoomSettings  
							
							
							
						 
						
							2016-08-28 00:00:22 +01:00  
				
					
						
							
							
								 
						
							
							
								fb5f8294c8 
								
							
								 
							
						 
						
							
							
								
								switch to namespaced CSS  
							
							
							
						 
						
							2016-08-28 00:00:10 +01:00  
				
					
						
							
							
								 
						
							
							
								5b0d13c1fc 
								
							
								 
							
						 
						
							
							
								
								switch to namespaced CSS  
							
							
							
						 
						
							2016-08-27 23:59:55 +01:00  
				
					
						
							
							
								 
						
							
							
								5df98d70f4 
								
							
								 
							
						 
						
							
							
								
								add debugging to MemberAvatar to try to kick jenkins...  
							
							
							
						 
						
							2016-08-27 01:18:48 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								6786539550 
								
							
								 
							
						 
						
							
							
								
								pin linkifyjs to precisely 2.0.0-beta4, as 2.0.0-beta9 breaks links as per  https://github.com/vector-im/vector-web/issues/2010  
							
							
							
						 
						
							2016-08-25 18:30:48 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								36d8fa9786 
								
							
								 
							
						 
						
							
							
								
								fix avatar clicking in memberinfo  
							
							
							
						 
						
							2016-08-25 16:20:38 +01:00  
				
					
						
							
							
								 
						
							
							
								c1db6fb42d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #429  from matrix-org/rav/timelinepanel_test  
							
							... 
							
							
							
							Update annoying TimelinePanel test 
							
						 
						
							2016-08-25 15:40:03 +01:00  
				
					
						
							
							
								 
						
							
							
								dd77cd74d1 
								
							
								 
							
						 
						
							
							
								
								Add text prefix to test event content  
							
							
							
						 
						
							2016-08-25 15:13:28 +01:00  
				
					
						
							
							
								 
						
							
							
								ae910d82a8 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #416  from aviraldg/feature-changelog  
							
							... 
							
							
							
							add fancy changelog dialog 
							
						 
						
							2016-08-24 18:01:39 +01:00  
				
					
						
							
							
								 
						
							
							
								6bcf9cc9db 
								
							
								 
							
						 
						
							
							
								
								TimelinePanel-test: Hackery to make it pass  
							
							
							
						 
						
							2016-08-24 17:30:53 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								6235d88b55 
								
							
								 
							
						 
						
							
							
								
								Missing return  
							
							
							
						 
						
							2016-08-24 14:10:21 +01:00  
				
					
						
							
							
								 
						
							
							
								82a822820f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #427  from matrix-org/kegan/postmessage-bot-options  
							
							... 
							
							
							
							Add ability to query and set bot options 
							
						 
						
							2016-08-24 13:51:31 +01:00  
				
					
						
							
							
								 
						
							
							
								73ba55abad 
								
							
								 
							
						 
						
							
							
								
								s/then/done/ to throw uncaught exceptions if the error function throws  
							
							
							
						 
						
							2016-08-24 13:47:35 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								fb4d3a9729 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #425  from matrix-org/markjh/travis  
							
							... 
							
							
							
							Add .travis.yml 
							
						 
						
							2016-08-23 17:20:30 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								ae8234ffe3 
								
							
								 
							
						 
						
							
							
								
								Added event/info message avatars back in  
							
							
							
						 
						
							2016-08-23 15:58:27 +01:00  
				
					
						
							
							
								 
						
							
							
								763d3bf9e7 
								
							
								 
							
						 
						
							
							
								
								Add .travis.yml  
							
							
							
						 
						
							2016-08-23 15:05:50 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								0dbc3ce344 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #424  from matrix-org/rav/fix_react_test  
							
							... 
							
							
							
							Fix TimelinePanel test 
							
						 
						
							2016-08-23 14:56:21 +01:00  
				
					
						
							
							
								 
						
							
							
								ecc7850e13 
								
							
								 
							
						 
						
							
							
								
								Trailing )  
							
							
							
						 
						
							2016-08-23 14:50:52 +01:00  
				
					
						
							
							
								 
						
							
							
								1c649303e3 
								
							
								 
							
						 
						
							
							
								
								Consistency with sendResponse  
							
							
							
						 
						
							2016-08-23 14:50:29 +01:00  
				
					
						
							
							
								 
						
							
							
								e96a40004b 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							
							
						 
						
							2016-08-23 14:41:47 +01:00  
				
					
						
							
							
								 
						
							
							
								70c0290aec 
								
							
								 
							
						 
						
							
							
								
								Fix TimelinePanel test  
							
							... 
							
							
							
							https://github.com/matrix-org/matrix-react-sdk/pull/422  made events take up
less vertical space, so we now need more of them to allow us to scroll back. 
						
							2016-08-23 14:39:44 +01:00  
				
					
						
							
							
								 
						
							
							
								f6b008350d 
								
							
								 
							
						 
						
							
							
								
								Spaces not tabs  
							
							
							
						 
						
							2016-08-23 13:31:55 +01:00  
				
					
						
							
							
								 
						
							
							
								1a2475ebba 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #422  from matrix-org/wmwragg/chat-message-presentation  
							
							... 
							
							
							
							Wmwragg/chat message presentation 
							
						 
						
							2016-08-23 12:20:03 +01:00  
				
					
						
							
							
								 
						
							
							
								9162a0ff01 
								
							
								 
							
						 
						
							
							
								
								Add postMessage API required for integration provisioning  
							
							... 
							
							
							
							Supports querying member state and creating invites only. 
							
						 
						
							2016-08-23 12:00:11 +01:00  
				
					
						
							
							
								 
						
							
							
								884abbd7e9 
								
							
								 
							
						 
						
							
							
								
								Cleanup autocomplete  
							
							
							
						 
						
							2016-08-23 00:36:31 +05:30  
				
					
						
							
							
								 
						
							
							
								48a2567b82 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into wmwragg/chat-message-presentation  
							
							
							
						 
						
							2016-08-19 17:19:30 +01:00  
				
					
						
							
							
								 
						
							
							
								993333490d 
								
							
								 
							
						 
						
							
							
								
								Removal of the mini avatars for action (info) messages  
							
							
							
						 
						
							2016-08-19 16:38:05 +01:00  
				
					
						
							
							
								 
						
							
							
								afd1ab1582 
								
							
								 
							
						 
						
							
							
								
								Comment to describe what info messages are  
							
							
							
						 
						
							2016-08-18 22:19:23 +01:00  
				
					
						
							
							
								 
						
							
							
								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