f95a11a9bf 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #369  from matrix-org/wmwragg/mention-state-menu  
							
							... 
							
							
							
							Wmwragg/mention state menu 
							
						 
						
							2016-08-03 15:22:39 +01:00  
				
					
						
							
							
								 
						
							
							
								ff2dd74429 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #383  from matrix-org/matthew/fix-video-upload  
							
							... 
							
							
							
							fix upload for video or image files where sniffing fails 
							
						 
						
							2016-08-03 15:04:53 +01:00  
				
					
						
							
							
								 
						
							
							
								c1cfbd6b59 
								
							
								 
							
						 
						
							
							
								
								Corrected comment typo  
							
							
							
						 
						
							2016-08-03 14:47:53 +01:00  
				
					
						
							
							
								 
						
							
							
								8e19532e5a 
								
							
								 
							
						 
						
							
							
								
								Hover state for badges, now only on the badges themselves  
							
							
							
						 
						
							2016-08-03 14:09:10 +01:00  
				
					
						
							
							
								 
						
							
							
								efdcc6da98 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #384  from aviraldg/fix-composer-up-down  
							
							... 
							
							
							
							fix: allow up/down normally for no completions 
							
						 
						
							2016-08-03 13:55:13 +01:00  
				
					
						
							
							
								 
						
							
							
								a2d64f5119 
								
							
								 
							
						 
						
							
							
								
								fix: allow up/down normally for no completions  
							
							... 
							
							
							
							Autocomplete current eats up up/down key events by unconditionally returning
true for onUpArrow and onDownArrow. Instead, only do that if there are completions actually visible. 
							
						 
						
							2016-08-03 18:04:52 +05:30  
				
					
						
							
							
								 
						
							
							
								1ff2ce60ff 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #382  from aviraldg/fix-autocomplete-confirm  
							
							... 
							
							
							
							fix: autocomplete to use tab instead of return 
							
						 
						
							2016-08-03 13:28:11 +01:00  
				
					
						
							
							
								 
						
							
							
								569b6057c3 
								
							
								 
							
						 
						
							
							
								
								fix upload for video or image files where sniffing the content.info fails  
							
							
							
						 
						
							2016-08-03 13:27:06 +01:00  
				
					
						
							
							
								 
						
							
							
								1f9a396fa5 
								
							
								 
							
						 
						
							
							
								
								fix: autocomplete to use tab instead of return  
							
							
							
						 
						
							2016-08-03 17:51:40 +05:30  
				
					
						
							
							
								 
						
							
							
								104ccc751f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #375  from aviraldg/fix-574  
							
							... 
							
							
							
							strip (IRC) displayname suffix from autocomplete 
							
						 
						
							2016-08-03 13:00:30 +01:00  
				
					
						
							
							
								 
						
							
							
								2cddf18461 
								
							
								 
							
						 
						
							
							
								
								strip (IRC) displayname suffix from autocomplete  
							
							... 
							
							
							
							Fixes  vector-im/vector-web#574  
						
							2016-08-03 17:26:05 +05:30  
				
					
						
							
							
								 
						
							
							
								f431e62e6b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #379  from matrix-org/dbkr/direct_chat_include_invited  
							
							... 
							
							
							
							Include rooms with 1 person invited 
							
						 
						
							2016-08-02 16:11:00 +01:00  
				
					
						
							
							
								 
						
							
							
								a0b973ffad 
								
							
								 
							
						 
						
							
							
								
								Syntax fail  
							
							
							
						 
						
							2016-08-02 16:07:07 +01:00  
				
					
						
							
							
								 
						
							
							
								10f6ecfe5f 
								
							
								 
							
						 
						
							
							
								
								Include rooms with 1 person invited  
							
							... 
							
							
							
							If we can't find one with both people joined. 
							
						 
						
							2016-08-02 15:59:28 +01:00  
				
					
						
							
							
								 
						
							
							
								3000fae5d8 
								
							
								 
							
						 
						
							
							
								
								Oops, uncommit  61e0258 
							
							
							
						 
						
							2016-08-02 15:58:21 +01:00  
				
					
						
							
							
								 
						
							
							
								61e0258b6f 
								
							
								 
							
						 
						
							
							
								
								Include rooms with 1 person invited  
							
							... 
							
							
							
							If we can't find one with both people joined. 
							
						 
						
							2016-08-02 15:55:18 +01:00  
				
					
						
							
							
								 
						
							
							
								3fc4e92a78 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #378  from matrix-org/dbkr/fix_new-direct_chat  
							
							... 
							
							
							
							Fix 'start new direct chat' 
							
						 
						
							2016-08-02 15:05:11 +01:00  
				
					
						
							
							
								 
						
							
							
								05f0d4d166 
								
							
								 
							
						 
						
							
							
								
								Fix 'start new direct chat'  
							
							
							
						 
						
							2016-08-02 14:55:29 +01:00  
				
					
						
							
							
								 
						
							
							
								2c2f689361 
								
							
								 
							
						 
						
							
							
								
								New design for long names  
							
							
							
						 
						
							2016-08-02 14:46:47 +01:00  
				
					
						
							
							
								 
						
							
							
								f393811171 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #376  from matrix-org/rav/messagecomposer_warnings  
							
							... 
							
							
							
							Fix warnings from MessageComposer 
							
						 
						
							2016-08-02 11:32:00 +01:00  
				
					
						
							
							
								 
						
							
							
								e63a32dc10 
								
							
								 
							
						 
						
							
							
								
								Fix warnings from MessageComposer  
							
							... 
							
							
							
							Fix a couple of warnings from React about required properties not being set. 
							
						 
						
							2016-08-02 11:00:00 +01:00  
				
					
						
							
							
								 
						
							
							
								1b38398156 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #371  from matrix-org/wmwragg/button-updates  
							
							... 
							
							
							
							New voice and video call buttons 
							
						 
						
							2016-08-01 20:36:56 +01:00  
				
					
						
							
							
								 
						
							
							
								89d2a56584 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #373  from matrix-org/rav/more_react_warnings  
							
							... 
							
							
							
							Silence some more react warnings 
							
						 
						
							2016-08-01 17:23:08 +01:00  
				
					
						
							
							
								 
						
							
							
								0ad23fa9ed 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #372  from matrix-org/rav/velociraptor_warnings  
							
							... 
							
							
							
							Fix warnings emanating from Velociraptor elements 
							
						 
						
							2016-08-01 17:22:29 +01:00  
				
					
						
							
							
								 
						
							
							
								124a816751 
								
							
								 
							
						 
						
							
							
								
								Silence some more react warnings  
							
							... 
							
							
							
							Remove some spurious props which were causing react warnings 
							
						 
						
							2016-08-01 17:10:46 +01:00  
				
					
						
							
							
								 
						
							
							
								94a44bfec3 
								
							
								 
							
						 
						
							
							
								
								Fix warnings emanating from Velociraptor elements  
							
							... 
							
							
							
							We are no longer allowed to stick random properties on child properties, and
the Velociraptor animations were causing some React warnings.
Move the startStyles and enterTransitionOpts properties up to the Velociraptor
node, and avoid setting arbitrary props on the created children. This is less
flexible, as it assumes that all children will have the same start style;
however, we weren't using the flexibility, and we can always replace the array
with a map or a function or something if we need it in the future. 
							
						 
						
							2016-08-01 16:56:25 +01:00  
				
					
						
							
							
								 
						
							
							
								84583b25e6 
								
							
								 
							
						 
						
							
							
								
								New voice and video call buttons  
							
							
							
						 
						
							2016-08-01 16:45:27 +01:00  
				
					
						
							
							
								 
						
							
							
								5b100eeff3 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #353  from matrix-org/wmwragg/button-updates  
							
							... 
							
							
							
							Wmwragg/button updates 
							
						 
						
							2016-08-01 15:42:46 +01:00  
				
					
						
							
							
								 
						
							
							
								215b32b377 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #370  from matrix-org/rav/devices_panel  
							
							... 
							
							
							
							Implement device management UI 
							
						 
						
							2016-08-01 14:27:12 +01:00  
				
					
						
							
							
								 
						
							
							
								c071bc54f9 
								
							
								 
							
						 
						
							
							
								
								Implement device management UI  
							
							... 
							
							
							
							View/rename/delete. 
							
						 
						
							2016-08-01 13:42:29 +01:00  
				
					
						
							
							
								 
						
							
							
								9333793a7c 
								
							
								 
							
						 
						
							
							
								
								Fix code style  
							
							
							
						 
						
							2016-08-01 10:49:51 +01:00  
				
					
						
							
							
								 
						
							
							
								d16aa276e2 
								
							
								 
							
						 
						
							
							
								
								Positional tweaks for the name, badge and context menu, to better match design in both normal and collapsed states  
							
							
							
						 
						
							2016-07-30 12:52:39 +01:00  
				
					
						
							
							
								 
						
							
							
								398e56c9f9 
								
							
								 
							
						 
						
							
							
								
								Fixed bug where the long hover tooltip for a room name show an object rather than the name  
							
							
							
						 
						
							2016-07-30 12:28:10 +01:00  
				
					
						
							
							
								 
						
							
							
								cf22a5fecc 
								
							
								 
							
						 
						
							
							
								
								Merge up from develop  
							
							
							
						 
						
							2016-07-30 12:10:43 +01:00  
				
					
						
							
							
								 
						
							
							
								1487c600ee 
								
							
								 
							
						 
						
							
							
								
								Revert so that the  
							
							
							
						 
						
							2016-07-29 17:53:18 +01:00  
				
					
						
							
							
								 
						
							
							
								229664a624 
								
							
								 
							
						 
						
							
							
								
								first pass on css re-write  
							
							
							
						 
						
							2016-07-29 17:49:42 +01:00  
				
					
						
							
							
								 
						
							
							
								3194c5c61d 
								
							
								 
							
						 
						
							
							
								
								Factor EditableTextContainer out of ChangeDisplayName  
							
							... 
							
							
							
							Take the non-displayname-specific bits out of ChangeDisplayName into a new
EditableTextContainer, so that we can reuse the logic elsewhere. 
							
						 
						
							2016-07-29 17:40:13 +01:00  
				
					
						
							
							
								 
						
							
							
								38f504bdcb 
								
							
								 
							
						 
						
							
							
								
								Hide tooltip when badge clicked and collapsed  
							
							
							
						 
						
							2016-07-29 11:10:16 +01:00  
				
					
						
							
							
								 
						
							
							
								5889beacf3 
								
							
								 
							
						 
						
							
							
								
								Mute state now handled correctly  
							
							
							
						 
						
							2016-07-28 17:24:58 +01:00  
				
					
						
							
							
								 
						
							
							
								94350bc780 
								
							
								 
							
						 
						
							
							
								
								Fixed spelling mistake  
							
							
							
						 
						
							2016-07-28 15:51:46 +01:00  
				
					
						
							
							
								 
						
							
							
								bc902a9741 
								
							
								 
							
						 
						
							
							
								
								Tidy up of the contextual menu refactor  
							
							
							
						 
						
							2016-07-28 14:32:59 +01:00  
				
					
						
							
							
								 
						
							
							
								867b14d2ca 
								
							
								 
							
						 
						
							
							
								
								Reposition context menu now that the styling is final  
							
							
							
						 
						
							2016-07-27 18:14:46 +01:00  
				
					
						
							
							
								 
						
							
							
								46a643ac38 
								
							
								 
							
						 
						
							
							
								
								Now the text spaceing is correct need to align cheveron  
							
							
							
						 
						
							2016-07-27 18:10:45 +01:00  
				
					
						
							
							
								 
						
							
							
								8246d9148c 
								
							
								 
							
						 
						
							
							
								
								Initial context menu with all it's elements  
							
							
							
						 
						
							2016-07-27 17:43:48 +01:00  
				
					
						
							
							
								 
						
							
							
								88be2827fd 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #367  from matrix-org/rav/remove_bad_props  
							
							... 
							
							
							
							Stop the Avatar classes setting properties on <span>s 
							
						 
						
							2016-07-27 16:22:31 +01:00  
				
					
						
							
							
								 
						
							
							
								6e7e091117 
								
							
								 
							
						 
						
							
							
								
								Refactor so that chevron and menu can be positioned independantly  
							
							
							
						 
						
							2016-07-27 16:09:07 +01:00  
				
					
						
							
							
								 
						
							
							
								39ae8c6e46 
								
							
								 
							
						 
						
							
							
								
								formatting  
							
							... 
							
							
							
							PR feedback 
							
						 
						
							2016-07-27 15:41:24 +01:00  
				
					
						
							
							
								 
						
							
							
								cf3cd69f37 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #366  from matrix-org/rav/remove_relayoutonupdate  
							
							... 
							
							
							
							Remove relayoutOnUpdate prop on gemini-scrollbar 
							
						 
						
							2016-07-27 15:21:46 +01:00  
				
					
						
							
							
								 
						
							
							
								0660b9feff 
								
							
								 
							
						 
						
							
							
								
								Fixes to properly point to the moved components  
							
							
							
						 
						
							2016-07-27 14:49:10 +01:00  
				
					
						
							
							
								 
						
							
							
								3cb3dd96a6 
								
							
								 
							
						 
						
							
							
								
								Added the moved ContextualMenu to the components list  
							
							
							
						 
						
							2016-07-27 14:23:37 +01:00