David Baker
							
						 
						
							 
							
							
							
								
							
								009c768b72 
								
							
								 
							
						 
						
							
							
								
								Comma fail  
							
							 
							
							
							
						 
						
							2016-08-03 16:41:22 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								9bf45fb556 
								
							
								 
							
						 
						
							
							
								
								Add start wrapper in MatrixClientPeg  
							
							 
							
							... 
							
							
							
							to handle the opts dictionary 
							
						 
						
							2016-08-03 16:39:47 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b95a1c4a4b 
								
							
								 
							
						 
						
							
							
								
								Just doc with the MatrixClientCreds object  
							
							 
							
							
							
						 
						
							2016-08-03 16:31:42 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a5384d32e2 
								
							
								 
							
						 
						
							
							
								
								Copy opts to set pendingEventOrdering  
							
							 
							
							
							
						 
						
							2016-08-03 16:28:37 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								1b39f02141 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #335  from aviraldg/feature-composer-emoji  
							
							 
							
							... 
							
							
							
							feat: code cleanup & emoji replacement in composer 
							
						 
						
							2016-08-03 16:18:56 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								3780d82f6f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #386  from matrix-org/rav/default_to_device_id  
							
							 
							
							... 
							
							
							
							DevicesPanel: use device_id as a placeholder 
							
						 
						
							2016-08-03 16:12:46 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f469bbbb64 
								
							
								 
							
						 
						
							
							
								
								Refactor UI error effects  
							
							 
							
							... 
							
							
							
							And add error effects to the login page to be consistent with the registration page 
							
						 
						
							2016-08-03 15:59:17 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								42f6703112 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #385  from matrix-org/rav/device_name_for_e2e_keys  
							
							 
							
							... 
							
							
							
							MemberDeviceInfo: Use the device name, where available 
							
						 
						
							2016-08-03 15:26:37 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								f95a11a9bf 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #369  from matrix-org/wmwragg/mention-state-menu  
							
							 
							
							... 
							
							
							
							Wmwragg/mention state menu 
							
						 
						
							2016-08-03 15:22:39 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								c1cfbd6b59 
								
							
								 
							
						 
						
							
							
								
								Corrected comment typo  
							
							 
							
							
							
						 
						
							2016-08-03 14:47:53 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								f4d41b7847 
								
							
								 
							
						 
						
							
							
								
								DevicesPanel: use device_id as a placeholder  
							
							 
							
							... 
							
							
							
							A device may have no display_name set, in which case we probably want to use
the device_id as a placeholder. 
							
						 
						
							2016-08-03 14:19:54 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								55f4d23625 
								
							
								 
							
						 
						
							
							
								
								MemberDeviceInfo: Use the device name, where available  
							
							 
							
							... 
							
							
							
							we now have device name for e2e devices: use it! 
							
						 
						
							2016-08-03 14:18:09 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								8e19532e5a 
								
							
								 
							
						 
						
							
							
								
								Hover state for badges, now only on the badges themselves  
							
							 
							
							
							
						 
						
							2016-08-03 14:09:10 +01:00  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								8e66e6dfdd 
								
							
								 
							
						 
						
							
							
								
								fix: Switch to opacity: 0 for composer emoji.  
							
							 
							
							... 
							
							
							
							This seems to be the best option for displaying emoji in the composer. While it means selected emoji don't actually have the selection colour applied, it's the most functional of all the options. Facebook uses the same approach. 
							
						 
						
							2016-08-03 18:27:49 +05:30  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								569b6057c3 
								
							
								 
							
						 
						
							
							
								
								fix upload for video or image files where sniffing the content.info fails  
							
							 
							
							
							
						 
						
							2016-08-03 13:27:06 +01:00  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								1f9a396fa5 
								
							
								 
							
						 
						
							
							
								
								fix: autocomplete to use tab instead of return  
							
							 
							
							
							
						 
						
							2016-08-03 17:51:40 +05:30  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								104ccc751f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #375  from aviraldg/fix-574  
							
							 
							
							... 
							
							
							
							strip (IRC) displayname suffix from autocomplete 
							
						 
						
							2016-08-03 13:00:30 +01:00  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								2cddf18461 
								
							
								 
							
						 
						
							
							
								
								strip (IRC) displayname suffix from autocomplete  
							
							 
							
							... 
							
							
							
							Fixes  vector-im/vector-web#574  
							
						 
						
							2016-08-03 17:26:05 +05:30  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ffa97a4095 
								
							
								 
							
						 
						
							
							
								
								Log out when account is deactivated  
							
							 
							
							
							
						 
						
							2016-08-03 11:47:29 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f8201ac2ea 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dbkr/use_logout_api' into dbkr/deactivate_account  
							
							 
							
							
							
						 
						
							2016-08-03 11:39:22 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f47ac87775 
								
							
								 
							
						 
						
							
							
								
								Don't show deactivate button for guests  
							
							 
							
							
							
						 
						
							2016-08-03 11:34:31 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2f0fd6da05 
								
							
								 
							
						 
						
							
							
								
								Actually commit the deactivate account dialog  
							
							 
							
							
							
						 
						
							2016-08-03 11:34:13 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d9a7d50a03 
								
							
								 
							
						 
						
							
							
								
								Add an interface for MatrixClientCreds  
							
							 
							
							... 
							
							
							
							and make MatrixClientPeg functions use it consistently 
							
						 
						
							2016-08-03 10:46:42 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								cf7e7d65c8 
								
							
								 
							
						 
						
							
							
								
								Don't start the client twice  
							
							 
							
							... 
							
							
							
							if we have a guest_access_token 
							
						 
						
							2016-08-03 10:15:50 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								1f17b78371 
								
							
								 
							
						 
						
							
							
								
								log if we can't log out  
							
							 
							
							
							
						 
						
							2016-08-03 10:01:23 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								e3a5776eae 
								
							
								 
							
						 
						
							
							
								
								We should clear /login off the URL after login  
							
							 
							
							
							
						 
						
							2016-08-03 09:57:12 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								4825ab8fe7 
								
							
								 
							
						 
						
							
							
								
								No need to set options in WillStartClient  
							
							 
							
							... 
							
							
							
							We can set them any time up to that point 
							
						 
						
							2016-08-03 09:53:02 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								0c2bd10594 
								
							
								 
							
						 
						
							
							
								
								Comment functions  
							
							 
							
							
							
						 
						
							2016-08-02 19:05:05 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								0c61c52480 
								
							
								 
							
						 
						
							
							
								
								Just use Lifecycle.setLoggedIn  
							
							 
							
							
							
						 
						
							2016-08-02 19:02:07 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d74a8e405d 
								
							
								 
							
						 
						
							
							
								
								Remove unused function  
							
							 
							
							
							
						 
						
							2016-08-02 19:00:01 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								65865f879f 
								
							
								 
							
						 
						
							
							
								
								We already know we're a guest here  
							
							 
							
							
							
						 
						
							2016-08-02 18:59:09 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								40834d188e 
								
							
								 
							
						 
						
							
							
								
								Don't let pendingEventOrdering be changed  
							
							 
							
							
							
						 
						
							2016-08-02 18:58:18 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								77a5384bf8 
								
							
								 
							
						 
						
							
							
								
								Comment startMatrixClient  
							
							 
							
							
							
						 
						
							2016-08-02 18:56:12 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c2c548ef5a 
								
							
								 
							
						 
						
							
							
								
								Comment logout  
							
							 
							
							
							
						 
						
							2016-08-02 18:55:13 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b9a5f7902b 
								
							
								 
							
						 
						
							
							
								
								Doc setLoggedIn & remove redundant opts  
							
							 
							
							
							
						 
						
							2016-08-02 18:52:56 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								58bbb35096 
								
							
								 
							
						 
						
							
							
								
								s/login/setLoggedIn/  
							
							 
							
							
							
						 
						
							2016-08-02 18:48:27 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								3818a89ca3 
								
							
								 
							
						 
						
							
							
								
								Comment guestCreds  
							
							 
							
							
							
						 
						
							2016-08-02 18:46:43 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								54c10a5d89 
								
							
								 
							
						 
						
							
							
								
								Get name of section right  
							
							 
							
							
							
						 
						
							2016-08-02 18:42:02 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								aafec49abf 
								
							
								 
							
						 
						
							
							
								
								WIP for deactivaing account UI  
							
							 
							
							... 
							
							
							
							https://github.com/vector-im/vector-web/issues/1775  
							
						 
						
							2016-08-02 18:40:12 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a0b973ffad 
								
							
								 
							
						 
						
							
							
								
								Syntax fail  
							
							 
							
							
							
						 
						
							2016-08-02 16:07:07 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								3000fae5d8 
								
							
								 
							
						 
						
							
							
								
								Oops, uncommit  61e0258 
							
							 
							
							
							
						 
						
							2016-08-02 15:58:21 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								05f0d4d166 
								
							
								 
							
						 
						
							
							
								
								Fix 'start new direct chat'  
							
							 
							
							
							
						 
						
							2016-08-02 14:55:29 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								2c2f689361 
								
							
								 
							
						 
						
							
							
								
								New design for long names  
							
							 
							
							
							
						 
						
							2016-08-02 14:46:47 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								db9750a7e3 
								
							
								 
							
						 
						
							
							
								
								Call the logout API when we log out  
							
							 
							
							... 
							
							
							
							Also try to refactor some of the login/logout code out of MatrixChat and into a separate Lifecycle.js. This still isn't great, but it at least gets some code out of MatrixClient. 
							
						 
						
							2016-08-02 14:04:20 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								124a816751 
								
							
								 
							
						 
						
							
							
								
								Silence some more react warnings  
							
							 
							
							... 
							
							
							
							Remove some spurious props which were causing react warnings 
							
						 
						
							2016-08-01 17:10:46 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								84583b25e6 
								
							
								 
							
						 
						
							
							
								
								New voice and video call buttons  
							
							 
							
							
							
						 
						
							2016-08-01 16:45:27 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								5b100eeff3 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #353  from matrix-org/wmwragg/button-updates  
							
							 
							
							... 
							
							
							
							Wmwragg/button updates 
							
						 
						
							2016-08-01 15:42:46 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								c071bc54f9 
								
							
								 
							
						 
						
							
							
								
								Implement device management UI  
							
							 
							
							... 
							
							
							
							View/rename/delete. 
							
						 
						
							2016-08-01 13:42:29 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								9333793a7c 
								
							
								 
							
						 
						
							
							
								
								Fix code style  
							
							 
							
							
							
						 
						
							2016-08-01 10:49:51 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								cf22a5fecc 
								
							
								 
							
						 
						
							
							
								
								Merge up from develop  
							
							 
							
							
							
						 
						
							2016-07-30 12:10:43 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								1487c600ee 
								
							
								 
							
						 
						
							
							
								
								Revert so that the  
							
							 
							
							
							
						 
						
							2016-07-29 17:53:18 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								229664a624 
								
							
								 
							
						 
						
							
							
								
								first pass on css re-write  
							
							 
							
							
							
						 
						
							2016-07-29 17:49:42 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								38f504bdcb 
								
							
								 
							
						 
						
							
							
								
								Hide tooltip when badge clicked and collapsed  
							
							 
							
							
							
						 
						
							2016-07-29 11:10:16 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								5889beacf3 
								
							
								 
							
						 
						
							
							
								
								Mute state now handled correctly  
							
							 
							
							
							
						 
						
							2016-07-28 17:24:58 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								94350bc780 
								
							
								 
							
						 
						
							
							
								
								Fixed spelling mistake  
							
							 
							
							
							
						 
						
							2016-07-28 15:51:46 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								bc902a9741 
								
							
								 
							
						 
						
							
							
								
								Tidy up of the contextual menu refactor  
							
							 
							
							
							
						 
						
							2016-07-28 14:32:59 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								867b14d2ca 
								
							
								 
							
						 
						
							
							
								
								Reposition context menu now that the styling is final  
							
							 
							
							
							
						 
						
							2016-07-27 18:14:46 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								46a643ac38 
								
							
								 
							
						 
						
							
							
								
								Now the text spaceing is correct need to align cheveron  
							
							 
							
							
							
						 
						
							2016-07-27 18:10:45 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								8246d9148c 
								
							
								 
							
						 
						
							
							
								
								Initial context menu with all it's elements  
							
							 
							
							
							
						 
						
							2016-07-27 17:43:48 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								6e7e091117 
								
							
								 
							
						 
						
							
							
								
								Refactor so that chevron and menu can be positioned independantly  
							
							 
							
							
							
						 
						
							2016-07-27 16:09:07 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								39ae8c6e46 
								
							
								 
							
						 
						
							
							
								
								formatting  
							
							 
							
							... 
							
							
							
							PR feedback 
							
						 
						
							2016-07-27 15:41:24 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								0660b9feff 
								
							
								 
							
						 
						
							
							
								
								Fixes to properly point to the moved components  
							
							 
							
							
							
						 
						
							2016-07-27 14:49:10 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								3cb3dd96a6 
								
							
								 
							
						 
						
							
							
								
								Added the moved ContextualMenu to the components list  
							
							 
							
							
							
						 
						
							2016-07-27 14:23:37 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								3df746ef14 
								
							
								 
							
						 
						
							
							
								
								Revert merge up from develop  
							
							 
							
							
							
						 
						
							2016-07-27 14:16:17 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								6d141d1a7b 
								
							
								 
							
						 
						
							
							
								
								Only allow none guests to access the context menu  
							
							 
							
							
							
						 
						
							2016-07-27 11:58:40 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								1a600b0674 
								
							
								 
							
						 
						
							
							
								
								Stop the Avatar classes setting properties on <span>s  
							
							 
							
							... 
							
							
							
							React apparently now checks the properties which are set on DOM elements, and
grumbles noisily about unexpected ones. Update BaseAvatar and RoomAvatar so
that they don't set unrelated properties on the DOM elements. 
							
						 
						
							2016-07-27 11:38:04 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								c8df9148b3 
								
							
								 
							
						 
						
							
							
								
								Remove relayoutOnUpdate prop on gemini-scrollbar  
							
							 
							
							... 
							
							
							
							The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it
and remove the properties. 
							
						 
						
							2016-07-27 11:35:48 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								4b26ac58af 
								
							
								 
							
						 
						
							
							
								
								Re-modularised the context menus  
							
							 
							
							
							
						 
						
							2016-07-27 10:41:24 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								dca4702b7b 
								
							
								 
							
						 
						
							
							
								
								Fixed a bug where the contextual menu was being incorrectly positioned when zoom in on the webpage  
							
							 
							
							
							
						 
						
							2016-07-27 09:51:50 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								09993cd3bc 
								
							
								 
							
						 
						
							
							
								
								Add comment back  
							
							 
							
							
							
						 
						
							2016-07-26 18:19:25 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								31399254b6 
								
							
								 
							
						 
						
							
							
								
								Fix onRoomStateMember debouncing  
							
							 
							
							... 
							
							
							
							Don't have debounced functions take arsg, because they won't be the same for each invocation. 
							
						 
						
							2016-07-26 18:15:26 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								4ecf5f6372 
								
							
								 
							
						 
						
							
							
								
								Fix bug where vector freezes on power level event  
							
							 
							
							... 
							
							
							
							Make rate_limited_function accept functions with args so we can just ratelimit the event handler & be done with it.
Fixes https://github.com/vector-im/vector-web/issues/1877  
							
						 
						
							2016-07-26 17:58:19 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								0eb15085e9 
								
							
								 
							
						 
						
							
							
								
								some code tidyup  
							
							 
							
							
							
						 
						
							2016-07-26 17:25:16 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								477a17b49f 
								
							
								 
							
						 
						
							
							
								
								Removed debug statement  
							
							 
							
							
							
						 
						
							2016-07-26 10:39:34 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								8f3e93214c 
								
							
								 
							
						 
						
							
							
								
								Drawing cheveron with CSS so it can be styled  
							
							 
							
							
							
						 
						
							2016-07-25 18:02:30 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								9c9c5ec458 
								
							
								 
							
						 
						
							
							
								
								Menu context dohickey now sticks when menu shown  
							
							 
							
							
							
						 
						
							2016-07-25 17:18:45 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								a218b4e8a3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'wmwragg/mention-state-indicator-round-3' into wmwragg/mention-state-menu  
							
							 
							
							... 
							
							
							
							# resolved Conflicts:
#	src/components/views/rooms/RoomTile.js 
							
						 
						
							2016-07-25 17:04:37 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								4b763997df 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #361  from matrix-org/dbkr/refactor_matrixclientpeg  
							
							 
							
							... 
							
							
							
							Refactor MatrixClientPeg 
							
						 
						
							2016-07-25 16:36:47 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								cbf10bfff6 
								
							
								 
							
						 
						
							
							
								
								PR feedback  
							
							 
							
							... 
							
							
							
							Reintroduce replaceClient so we're not calling replaceUsingAccessToken without access tokens which is a bit silly.
Fix bug from previous commit (pass isGuest through) 
							
						 
						
							2016-07-25 16:28:28 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								587a86441f 
								
							
								 
							
						 
						
							
							
								
								This may as wel go in createclient  
							
							 
							
							
							
						 
						
							2016-07-25 16:20:03 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								8b8486a8d0 
								
							
								 
							
						 
						
							
							
								
								Move from +99 to 99+ for more than 99 messages  
							
							 
							
							
							
						 
						
							2016-07-25 14:39:15 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								a69107f4f1 
								
							
								 
							
						 
						
							
							
								
								Trying to get the context menu dohicky to stick when menu open  
							
							 
							
							
							
						 
						
							2016-07-25 10:58:43 +01:00  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								b7555f49ea 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into feature-composer-emoji  
							
							 
							
							
							
						 
						
							2016-07-23 19:15:06 +05:30  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								ece575bd00 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #363  from matrix-org/dbkr/fix_start_chat  
							
							 
							
							... 
							
							
							
							Fix 'start chat' button on MemberInfo 
							
						 
						
							2016-07-22 18:36:32 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								c89904bc25 
								
							
								 
							
						 
						
							
							
								
								Initial unstyled mentions state notifier context menu  
							
							 
							
							
							
						 
						
							2016-07-22 17:30:31 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b07e50d418 
								
							
								 
							
						 
						
							
							
								
								Fix 'start chat' button on MemberInfo  
							
							 
							
							... 
							
							
							
							this/self fail & related scoping
Fixes https://github.com/vector-im/vector-web/issues/1844  
							
						 
						
							2016-07-22 17:30:25 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								9b318e8f61 
								
							
								 
							
						 
						
							
							
								
								Getting the corrct height for the placing the context menu  
							
							 
							
							
							
						 
						
							2016-07-22 16:12:20 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ddbac8c73a 
								
							
								 
							
						 
						
							
							
								
								More refactoring of MatrixClientPeg  
							
							 
							
							... 
							
							
							
							Including getting rid of GuestAccess as it was basically doing nothing apart from remembering if we were a guest which may as well be done in the same place we save/restore everything else 
							
						 
						
							2016-07-22 15:47:47 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								e4dd6c8dbe 
								
							
								 
							
						 
						
							
							
								
								Browser tooltip being used instead of the HTML styled one.  
							
							 
							
							
							
						 
						
							2016-07-22 15:15:24 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								6984a55b11 
								
							
								 
							
						 
						
							
							
								
								The tooltip now appears even when not collapsed when hover over the avater, to allow the full name to be shown  
							
							 
							
							
							
						 
						
							2016-07-22 14:58:09 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b7e95b3883 
								
							
								 
							
						 
						
							
							
								
								Remove other guestAccess arg  
							
							 
							
							
							
						 
						
							2016-07-22 14:00:23 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								ca75d93434 
								
							
								 
							
						 
						
							
							
								
								Tweaked the offset for the tooltip so that it is next to the element it is tipping  
							
							 
							
							
							
						 
						
							2016-07-22 11:31:26 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								5d4b03c1f4 
								
							
								 
							
						 
						
							
							
								
								Put back clicking on the name to acces the room  
							
							 
							
							
							
						 
						
							2016-07-22 11:28:11 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								3dd83922f1 
								
							
								 
							
						 
						
							
							
								
								Tooltip positioning tweaked  
							
							 
							
							
							
						 
						
							2016-07-22 11:12:11 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								922bb0f402 
								
							
								 
							
						 
						
							
							
								
								+99 badge when notifications are greater the 99  
							
							 
							
							
							
						 
						
							2016-07-21 18:50:07 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								762873350a 
								
							
								 
							
						 
						
							
							
								
								Badge dohickey shown on name hover and badge hover  
							
							 
							
							
							
						 
						
							2016-07-21 18:20:12 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ea5e021d8d 
								
							
								 
							
						 
						
							
							
								
								Refactor MatrixClientPeg  
							
							 
							
							... 
							
							
							
							Should be functionally identical 
							
						 
						
							2016-07-21 17:57:55 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								4013ea75d0 
								
							
								 
							
						 
						
							
							
								
								Testing out the context menu  
							
							 
							
							
							
						 
						
							2016-07-21 17:44:31 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								9565eef84d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #360  from matrix-org/dbkr/fix_tabcomplete_order_again  
							
							 
							
							... 
							
							
							
							Fix tab complete order properly 
							
						 
						
							2016-07-21 16:35:27 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								0b0f10ddf6 
								
							
								 
							
						 
						
							
							
								
								Fix tab complete order properly  
							
							 
							
							... 
							
							
							
							Don't return NaN from your sort functions... 
							
						 
						
							2016-07-21 16:25:51 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								775fc97102 
								
							
								 
							
						 
						
							
							
								
								Slight refactor to better match current code  
							
							 
							
							
							
						 
						
							2016-07-21 14:33:54 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								030652f289 
								
							
								 
							
						 
						
							
							
								
								Add removeLisatener for account data listener  
							
							 
							
							
							
						 
						
							2016-07-21 13:49:31 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								46a2c74d71 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #358  from matrix-org/rav/device_id_for_register  
							
							 
							
							... 
							
							
							
							Set the device_id on pre-login MatrixClient 
							
						 
						
							2016-07-21 13:15:39 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								e41df245c3 
								
							
								 
							
						 
						
							
							
								
								Set the device_id on pre-login MatrixClient  
							
							 
							
							... 
							
							
							
							In order that device_id is set when we register a new user (or, for that
matter, when we register as a guest), we need to make sure that device_id is
set on the temporary MatrixClient which is created before the user is logged
in - ie, that created by replaceUsingUrls.
In order to achieve this, I've basically removed the distinction between
replaceUsingAccessToken and replaceUsingUrls. There is a side-effect in that
the temporary MatrixClient now gets an e2e sessionStore, but I don't think that
is a bad thing. 
							
						 
						
							2016-07-20 20:20:10 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								165b0810cc 
								
							
								 
							
						 
						
							
							
								
								remove debug  
							
							 
							
							
							
						 
						
							2016-07-20 18:17:09 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								bc87fc575b 
								
							
								 
							
						 
						
							
							
								
								remove debug  
							
							 
							
							
							
						 
						
							2016-07-20 18:16:54 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								d6415aceca 
								
							
								 
							
						 
						
							
							
								
								handle accountData changes, and errors on toggling URL previews  
							
							 
							
							
							
						 
						
							2016-07-20 18:14:16 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								9babf3f92f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #357  from matrix-org/wmwragg/mention-state-indicator-round-2  
							
							 
							
							... 
							
							
							
							Wmwragg/mention state indicator round 2 
							
						 
						
							2016-07-20 18:01:59 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								ffa43ebb96 
								
							
								 
							
						 
						
							
							
								
								badge content when hovered is now kerned via the CSS  
							
							 
							
							
							
						 
						
							2016-07-20 17:12:41 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								fb964be072 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #356  from matrix-org/matthew/disable-url-previews  
							
							 
							
							... 
							
							
							
							Support for disabling/enabling URL previews per-user, per-room and per-user-per-room 
							
						 
						
							2016-07-20 16:43:08 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								02e2ade7d9 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #336  from matrix-org/dbkr/add_email_fail_if_in_use  
							
							 
							
							... 
							
							
							
							Use HS proxy API for requestToken on adding email 
							
						 
						
							2016-07-20 14:05:58 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ae7e51ae17 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #337  from matrix-org/dbkr/password_reset_email_not_found  
							
							 
							
							... 
							
							
							
							Error if email already in use when resetting pw 
							
						 
						
							2016-07-20 14:00:12 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								33edb1dea9 
								
							
								 
							
						 
						
							
							
								
								Made the badge always exist, but if no unread mesasges available then has a different class  
							
							 
							
							
							
						 
						
							2016-07-20 12:47:32 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								1365f18829 
								
							
								 
							
						 
						
							
							
								
								many stupid thinkos and bugfixes; make it work  
							
							 
							
							
							
						 
						
							2016-07-20 12:03:13 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d6df3682f2 
								
							
								 
							
						 
						
							
							
								
								Fix enourmous video bug  
							
							 
							
							
							
						 
						
							2016-07-20 11:58:49 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2190dcbe1e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #354  from Half-Shot/develop  
							
							 
							
							... 
							
							
							
							Add support for sending uploaded content as m.video 
							
						 
						
							2016-07-20 11:15:38 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								514bc2cd51 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #341  from matrix-org/dbkr/tab_complete_most_recently_spoke  
							
							 
							
							... 
							
							
							
							Order tab complete by most recently spoke 
							
						 
						
							2016-07-19 18:02:09 +01:00  
						
					 
				
					
						
							
							
								 
								Will Hunt
							
						 
						
							 
							
							
							
								
							
								4bd2b93f59 
								
							
								 
							
						 
						
							
							
								
								Add support for sending uploaded content as m.video  
							
							 
							
							
							
						 
						
							2016-07-19 16:05:15 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								1ba0ef7369 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #350  from matrix-org/wmwragg/spinner-fix  
							
							 
							
							... 
							
							
							
							Wmwragg/spinner fix 
							
						 
						
							2016-07-19 12:10:31 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								c1fd2f888f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #352  from matrix-org/wmwragg/mention-state-indicator  
							
							 
							
							... 
							
							
							
							Now showing three dots when hovering over the badge 
							
						 
						
							2016-07-19 11:12:42 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								9e4511b8eb 
								
							
								 
							
						 
						
							
							
								
								Now showing three dots when hovering over the badge  
							
							 
							
							
							
						 
						
							2016-07-18 16:10:07 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ffaf7f44f3 
								
							
								 
							
						 
						
							
							
								
								typos  
							
							 
							
							
							
						 
						
							2016-07-18 15:36:19 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								743f79a9a7 
								
							
								 
							
						 
						
							
							
								
								Fix unpublishing room in room settings  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/vector-web/issues/1743  
							
						 
						
							2016-07-18 15:22:08 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								6bf5499289 
								
							
								 
							
						 
						
							
							
								
								typos  
							
							 
							
							
							
						 
						
							2016-07-18 10:47:03 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								e92024f7a9 
								
							
								 
							
						 
						
							
							
								
								reskindex  
							
							 
							
							
							
						 
						
							2016-07-18 10:42:18 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2b7ade9ef5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #347  from matrix-org/matthew/fix-race-on-new-room-invitelist  
							
							 
							
							... 
							
							
							
							Fix race when creating rooms where invite list can be blank 
							
						 
						
							2016-07-18 10:37:05 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								37402c0071 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #348  from matrix-org/matthew/improve-start-chat-wording  
							
							 
							
							... 
							
							
							
							improve wording of MemberInfo's start chat button. 
							
						 
						
							2016-07-18 10:34:37 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								f13bb5f656 
								
							
								 
							
						 
						
							
							
								
								typos  
							
							 
							
							
							
						 
						
							2016-07-18 01:39:24 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								ebdac4ee50 
								
							
								 
							
						 
						
							
							
								
								first cut (untested)  
							
							 
							
							
							
						 
						
							2016-07-18 01:35:42 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								bcd1c7e099 
								
							
								 
							
						 
						
							
							
								
								improve comment  
							
							 
							
							
							
						 
						
							2016-07-18 01:34:26 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								a385955c6b 
								
							
								 
							
						 
						
							
							
								
								Fixed MatrixChat Dialog Spinner. Still needs testing, unsure what triggers it.  
							
							 
							
							
							
						 
						
							2016-07-17 21:23:52 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								1559c69ddf 
								
							
								 
							
						 
						
							
							
								
								Create room Dialog Spinner fix.  
							
							 
							
							
							
						 
						
							2016-07-17 21:21:27 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								8d749be51f 
								
							
								 
							
						 
						
							
							
								
								fix potential bug where canonical alias setting is broken (modulo autoheisting)  
							
							 
							
							
							
						 
						
							2016-07-17 20:36:53 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								554a6ff035 
								
							
								 
							
						 
						
							
							
								
								improve wording of MemberInfo's start chat button. Fixes  https://github.com/vector-im/vector-web/issues/689  and clarifies  https://github.com/matrix-org/matrix-react-sdk/issues/328  
							
							 
							
							
							
						 
						
							2016-07-17 19:41:53 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								999c52b650 
								
							
								 
							
						 
						
							
							
								
								fix comment  
							
							 
							
							
							
						 
						
							2016-07-17 19:00:22 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								0553d806d7 
								
							
								 
							
						 
						
							
							
								
								stop re-invites  
							
							 
							
							
							
						 
						
							2016-07-17 18:40:54 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								2bc9dd4307 
								
							
								 
							
						 
						
							
							
								
								hopefully  fix   vector-im/vector-web#1813  
							
							 
							
							
							
						 
						
							2016-07-17 18:32:48 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								bfe50c209c 
								
							
								 
							
						 
						
							
							
								
								fix typo in comment  
							
							 
							
							
							
						 
						
							2016-07-16 22:49:42 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								5c566cae5c 
								
							
								 
							
						 
						
							
							
								
								typo  
							
							 
							
							
							
						 
						
							2016-07-15 18:10:56 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ccf8e269cd 
								
							
								 
							
						 
						
							
							
								
								Comments & required props  
							
							 
							
							
							
						 
						
							2016-07-15 17:15:51 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								327015ba0f 
								
							
								 
							
						 
						
							
							
								
								Tidy up autocomplete updating  
							
							 
							
							... 
							
							
							
							..into a function 
							
						 
						
							2016-07-15 17:03:53 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								a61168d943 
								
							
								 
							
						 
						
							
							
								
								Revert "Amends react template and removes opening image in lightbox"  
							
							 
							
							
							
						 
						
							2016-07-15 16:54:56 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								7d712d06a1 
								
							
								 
							
						 
						
							
							
								
								Move code to make diff less confusing  
							
							 
							
							
							
						 
						
							2016-07-15 16:14:05 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d5bed78a54 
								
							
								 
							
						 
						
							
							
								
								Rejig tab complete to make it faster  
							
							 
							
							... 
							
							
							
							Now do a lot less when people speak. Also move more of the tab completion logic into TabComplete.js and out of RoomView. 
							
						 
						
							2016-07-15 16:10:27 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								41bff38713 
								
							
								 
							
						 
						
							
							
								
								fix classes used for body spans, and only apply markdown-body to markdown(!)  
							
							 
							
							
							
						 
						
							2016-07-15 15:04:19 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								ca5987bf6c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #345  from matrix-org/wmwragg/modal-restyle  
							
							 
							
							... 
							
							
							
							Wmwragg/modal restyle 
							
						 
						
							2016-07-15 14:05:22 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								78b7d04710 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #343  from ribot/feature-inline-link-preview  
							
							 
							
							... 
							
							
							
							Amends react template and removes opening image in lightbox 
							
						 
						
							2016-07-15 13:55:07 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								febd2110c5 
								
							
								 
							
						 
						
							
							
								
								Updated all dialogs to define their primary button, I've selected the one that had been specified for focus, but the primary button isn't dependent on focus, it's a UX feature  
							
							 
							
							
							
						 
						
							2016-07-15 11:23:58 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								8144b894f7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #344  from matrix-org/dbkr/remove_initial_memberlist_load_hack  
							
							 
							
							... 
							
							
							
							Remove the member list loading hack 
							
						 
						
							2016-07-14 18:50:52 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								3abdb83d16 
								
							
								 
							
						 
						
							
							
								
								Remove now-unused limit param to roomMembers()  
							
							 
							
							
							
						 
						
							2016-07-14 18:40:43 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								743cb4b777 
								
							
								 
							
						 
						
							
							
								
								Remove the member list loading hack  
							
							 
							
							... 
							
							
							
							Now the memberlist os a truncated list it at-best makes no difference and may be marginally slowing us down. 
							
						 
						
							2016-07-14 18:37:57 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								9fd0ea1e32 
								
							
								 
							
						 
						
							
							
								
								More variable case  
							
							 
							
							
							
						 
						
							2016-07-14 18:18:44 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2fd690ea2b 
								
							
								 
							
						 
						
							
							
								
								Oops, removed the pure offline class  
							
							 
							
							
							
						 
						
							2016-07-14 18:13:54 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								7c1b4f4fc9 
								
							
								 
							
						 
						
							
							
								
								Obey my own code style  
							
							 
							
							
							
						 
						
							2016-07-14 18:13:15 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a49a545161 
								
							
								 
							
						 
						
							
							
								
								CSS classes to colour offline users differently  
							
							 
							
							... 
							
							
							
							So we can use the same 66% opacity as idle tiles for offline-with-last-active-time to reduce the visual jarring 
							
						 
						
							2016-07-14 17:41:07 +01:00  
						
					 
				
					
						
							
							
								 
								Stefan Pearson
							
						 
						
							 
							
							
							
								
							
								cad057ef34 
								
							
								 
							
						 
						
							
							
								
								amends react template and removes opening image in lightbox  
							
							 
							
							
							
						 
						
							2016-07-14 17:12:17 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f1d72296b7 
								
							
								 
							
						 
						
							
							
								
								Fix last-spoke order  
							
							 
							
							... 
							
							
							
							Turns out this timeline is the other way around, so loop through the other way 
							
						 
						
							2016-07-14 14:06:31 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								fd5d28768a 
								
							
								 
							
						 
						
							
							
								
								Simplification of the css  
							
							 
							
							
							
						 
						
							2016-07-14 12:05:00 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								f6302fc990 
								
							
								 
							
						 
						
							
							
								
								Updated the search button, and simplified the leave css  
							
							 
							
							
							
						 
						
							2016-07-14 11:43:33 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2ce521fe38 
								
							
								 
							
						 
						
							
							
								
								Fix null error in TabComplete  
							
							 
							
							... 
							
							
							
							.sende ris sometimes null: use getSender() which isn't and returns the userId which is what we actually want 
							
						 
						
							2016-07-14 11:40:17 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								0dde891d4c 
								
							
								 
							
						 
						
							
							
								
								Order tab complete by most recently spoke  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/vector-web/issues/1741  
							
						 
						
							2016-07-14 11:25:45 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2d6d734571 
								
							
								 
							
						 
						
							
							
								
								Listen for the new lastPreseceTs event  
							
							 
							
							... 
							
							
							
							This will catch all presence events as previously we were only listening for the actual presence string changing 
							
						 
						
							2016-07-14 10:05:40 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								7f00053f84 
								
							
								 
							
						 
						
							
							
								
								Footer upload icon updated to new vesrion  
							
							 
							
							
							
						 
						
							2016-07-13 17:46:56 +01:00  
						
					 
				
					
						
							
							
								 
								wmwragg
							
						 
						
							 
							
							
							
								
							
								936a38a9f4 
								
							
								 
							
						 
						
							
							
								
								Updated and moved the room header settings icon  
							
							 
							
							
							
						 
						
							2016-07-13 16:02:18 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								6b03f72474 
								
							
								 
							
						 
						
							
							
								
								Fix filtering user list by ID  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/vector-web/issues/1739  
							
						 
						
							2016-07-13 11:56:01 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ac58520b3b 
								
							
								 
							
						 
						
							
							
								
								Update tab completion list when we have a room  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/vector-web/issues/1737  
							
						 
						
							2016-07-12 18:30:37 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								30cfc6b605 
								
							
								 
							
						 
						
							
							
								
								Error if email already in use when resetting pw  
							
							 
							
							... 
							
							
							
							Use password reset specific requestToken 
							
						 
						
							2016-07-08 18:06:50 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								8e8e54a3bf 
								
							
								 
							
						 
						
							
							
								
								Update function name as per js-sdk PR feedback  
							
							 
							
							
							
						 
						
							2016-07-08 17:53:06 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b78340ff51 
								
							
								 
							
						 
						
							
							
								
								Use HS proxy API for requestToken on adding email  
							
							 
							
							... 
							
							
							
							So we report an error if the email is already taken. Also fix a bug where the spinner wouldn't disappear if adding an email failed (and don't include the raw errcode in the user-facing dialog) 
							
						 
						
							2016-07-08 17:28:04 +01:00  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								b334522168 
								
							
								 
							
						 
						
							
							
								
								feat: code cleanup & emoji replacement in composer  
							
							 
							
							
							
						 
						
							2016-07-08 12:54:28 +05:30  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								345ed04ba9 
								
							
								 
							
						 
						
							
							
								
								Less enetering  
							
							 
							
							
							
						 
						
							2016-07-07 13:03:27 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a6b04c462e 
								
							
								 
							
						 
						
							
							
								
								Comment how we're remembering form vals  
							
							 
							
							
							
						 
						
							2016-07-07 11:26:35 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								5c879d786e 
								
							
								 
							
						 
						
							
							
								
								Doc the default params / guestUsername props  
							
							 
							
							
							
						 
						
							2016-07-07 11:23:08 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								e2c473b366 
								
							
								 
							
						 
						
							
							
								
								Error on registration if email taken  
							
							 
							
							... 
							
							
							
							Use the new register-specific request token endpoint (https://github.com/matrix-org/matrix-js-sdk/pull/147 ) and catch the error that it gives if the email is already in use. Also add initial values to the registration form so we can reload it after the error without all the values disappearing, and split out the guest username parameter which was previously called defaultUsername. 
							
						 
						
							2016-07-06 15:22:06 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								63ad57a8d4 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #332  from aviraldg/feature-emojione  
							
							 
							
							... 
							
							
							
							feat: render unicode emoji as emojione images 
							
						 
						
							2016-07-05 10:18:33 +01:00  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								545d59769e 
								
							
								 
							
						 
						
							
							
								
								feat: unblacklist img tags with data URIs  
							
							 
							
							... 
							
							
							
							fixes  vector-im/vector-web#1692  
							
						 
						
							2016-07-05 11:16:09 +05:30  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								a9a3d31b3f 
								
							
								 
							
						 
						
							
							
								
								feat: improve emoji-body detection  
							
							 
							
							
							
						 
						
							2016-07-05 10:43:09 +05:30  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								6a133bc034 
								
							
								 
							
						 
						
							
							
								
								feat: and emojify name in MemberInfo  
							
							 
							
							
							
						 
						
							2016-07-05 10:24:18 +05:30  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								020f1f4320 
								
							
								 
							
						 
						
							
							
								
								feat: emojify ALL THE THINGS!  
							
							 
							
							
							
						 
						
							2016-07-05 10:16:17 +05:30  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								9c0dc74289 
								
							
								 
							
						 
						
							
							
								
								feat: use svg emoji  
							
							 
							
							
							
						 
						
							2016-07-05 09:58:28 +05:30  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								4069886cbd 
								
							
								 
							
						 
						
							
							
								
								feat: large emoji support  
							
							 
							
							
							
						 
						
							2016-07-05 04:04:57 +05:30  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								48f2c4a696 
								
							
								 
							
						 
						
							
							
								
								feat: render unicode emoji as emojione images  
							
							 
							
							
							
						 
						
							2016-07-05 03:13:53 +05:30  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								ed305bd547 
								
							
								 
							
						 
						
							
							
								
								fix: https for DDG, provide range for UserProvider  
							
							 
							
							
							
						 
						
							2016-07-05 01:37:01 +05:30  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								22a2593bf2 
								
							
								 
							
						 
						
							
							
								
								fix: unbreak old MessageComposerInput/TabComplete  
							
							 
							
							
							
						 
						
							2016-07-05 01:32:40 +05:30  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								b3d8292113 
								
							
								 
							
						 
						
							
							
								
								feat: use canonical room alias for room completion  
							
							 
							
							
							
						 
						
							2016-07-04 22:34:58 +05:30  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								73b726e5fb 
								
							
								 
							
						 
						
							
							
								
								feat: import only flatMap from lodash  
							
							 
							
							
							
						 
						
							2016-07-04 21:56:09 +05:30  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								30b7efd585 
								
							
								 
							
						 
						
							
							
								
								fix: code cleanup, fix getCurrentCommand  
							
							 
							
							
							
						 
						
							2016-07-04 21:44:35 +05:30  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								cccc58b47f 
								
							
								 
							
						 
						
							
							
								
								feat: implement autocomplete replacement  
							
							 
							
							
							
						 
						
							2016-07-03 22:15:13 +05:30  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								8961c87cf9 
								
							
								 
							
						 
						
							
							
								
								feat: Autocomplete selection wraparound  
							
							 
							
							
							
						 
						
							2016-07-03 01:11:34 +05:30  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								cd928fe6f5 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature-autocomplete  
							
							 
							
							
							
						 
						
							2016-07-03 00:00:02 +05:30  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								a671e07da7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #326  from matrix-org/dbkr/fix_user_links  
							
							 
							
							... 
							
							
							
							Fix user links 
							
						 
						
							2016-06-30 17:43:08 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								ce39822957 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #327  from theworldbright/1492-fix-ordering-memberlist  
							
							 
							
							... 
							
							
							
							Fix ordering of Memberlist 
							
						 
						
							2016-06-29 10:21:15 +01:00  
						
					 
				
					
						
							
							
								 
								theworldbright
							
						 
						
							 
							
							
							
								
							
								7609b9eba8 
								
							
								 
							
						 
						
							
							
								
								Simplify logic for timestamp ordering of memberlist  
							
							 
							
							
							
						 
						
							2016-06-29 17:45:24 +09:00  
						
					 
				
					
						
							
							
								 
								theworldbright
							
						 
						
							 
							
							
							
								
							
								b3d871aa6a 
								
							
								 
							
						 
						
							
							
								
								Add back comment  
							
							 
							
							
							
						 
						
							2016-06-29 17:33:41 +09:00  
						
					 
				
					
						
							
							
								 
								theworldbright
							
						 
						
							 
							
							
							
								
							
								69cb0a8f1c 
								
							
								 
							
						 
						
							
							
								
								Switch ordering of Idle users  
							
							 
							
							
							
						 
						
							2016-06-29 17:08:17 +09:00  
						
					 
				
					
						
							
							
								 
								theworldbright
							
						 
						
							 
							
							
							
								
							
								72a1d5a0de 
								
							
								 
							
						 
						
							
							
								
								Remove unused comments  
							
							 
							
							
							
						 
						
							2016-06-29 16:58:08 +09:00  
						
					 
				
					
						
							
							
								 
								theworldbright
							
						 
						
							 
							
							
							
								
							
								174caceabf 
								
							
								 
							
						 
						
							
							
								
								Use lastActiveAgo to reorder member list  
							
							 
							
							
							
						 
						
							2016-06-29 16:57:59 +09:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ba47c5a198 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/fix_user_links  
							
							 
							
							
							
						 
						
							2016-06-28 17:15:17 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								e8337b2119 
								
							
								 
							
						 
						
							
							
								
								More PR feedback  
							
							 
							
							
							
						 
						
							2016-06-28 17:11:47 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								548c392236 
								
							
								 
							
						 
						
							
							
								
								PR feedback  
							
							 
							
							
							
						 
						
							2016-06-28 14:59:45 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c016eb78c8 
								
							
								 
							
						 
						
							
							
								
								Fix user links  
							
							 
							
							... 
							
							
							
							'Start chat' was broken on the sidebar if the panel was displayed by clicking on a link to a user. This adds null checking for the hack that we use to display users in the member panel. 
							
						 
						
							2016-06-28 14:28:05 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								98c03869a7 
								
							
								 
							
						 
						
							
							
								
								Display an error message if room not found  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/vector-web/issues/1012  
							
						 
						
							2016-06-24 15:34:07 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								a1dd427420 
								
							
								 
							
						 
						
							
							
								
								Implement device blocking  
							
							 
							
							... 
							
							
							
							This is the react-sdk part of
https://github.com/matrix-org/matrix-js-sdk/pull/146 . It adds 'Block'/'Unblock'
buttons to the device list, and updates the deviceVerified listeners to listen
for deviceVerificationChanged instead.
Also adds an extra <div> to the deviceinfo section to help me with the
CSS. 
							
						 
						
							2016-06-23 17:30:04 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								e046f5359f 
								
							
								 
							
						 
						
							
							
								
								CreateRoom: remove reference to encryption module  
							
							 
							
							... 
							
							
							
							The CreateRoom structure isn't currently used, but contained a reference to the
(now defunct) encryption module; remove the reference for now. 
							
						 
						
							2016-06-23 14:08:45 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								0df6209a57 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #322  from matrix-org/rav/remove_encrypt_command  
							
							 
							
							... 
							
							
							
							Remove /encrypt command 
							
						 
						
							2016-06-23 13:41:18 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								cdaf317f1d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #321  from matrix-org/rav/encrypt_room_setting  
							
							 
							
							... 
							
							
							
							RoomSettings: add encryption setting 
							
						 
						
							2016-06-23 13:40:30 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								6283b200fb 
								
							
								 
							
						 
						
							
							
								
								Remove /encrypt command  
							
							 
							
							... 
							
							
							
							Now that we have the room setting to enable encryption, the /encrypt command is
not only redundant, but confusing, since it's in conflict with the room
setting. 
							
						 
						
							2016-06-23 13:21:55 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								3a21958faf 
								
							
								 
							
						 
						
							
							
								
								RoomSettings: add encryption setting  
							
							 
							
							... 
							
							
							
							Add a knob to RoomSettings which will send the appropriate event to enable
encryption in the room. 
							
						 
						
							2016-06-23 12:21:31 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								7a7d7c0e02 
								
							
								 
							
						 
						
							
							
								
								Fix a pair of warnings from RoomSettings  
							
							 
							
							... 
							
							
							
							- initialise the 'publish' checkbox correctly so react doesn't grumble about it
  turning from uncontrolled into controlled
- PowerSelector's 'controlled' property isn't really required, so mark it as
  such. 
							
						 
						
							2016-06-23 11:15:55 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								a04f03669c 
								
							
								 
							
						 
						
							
							
								
								RoomSettings: refactor permissions calculations  
							
							 
							
							... 
							
							
							
							The logic for calculating who had permission for what was impenetrable (and
wrong, in parts), so rewrite it to be a bit clearer. 
							
						 
						
							2016-06-23 10:36:16 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								5195140ff8 
								
							
								 
							
						 
						
							
							
								
								reposition Login spinner  
							
							 
							
							
							
						 
						
							2016-06-21 19:50:03 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								2ddfccdab3 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #318  from matrix-org/dbkr/fix_default_hs  
							
							 
							
							... 
							
							
							
							Fix https://github.com/vector-im/vector-web/issues/1679  
							
						 
						
							2016-06-21 17:55:27 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d3265ab970 
								
							
								 
							
						 
						
							
							
								
								Redundant getDeafultHs()  
							
							 
							
							... 
							
							
							
							This now can never be falsey so no point checking it 
							
						 
						
							2016-06-21 17:46:55 +01:00  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								a74db3a815 
								
							
								 
							
						 
						
							
							
								
								Get basic keyboard selection working  
							
							 
							
							
							
						 
						
							2016-06-21 18:33:39 +05:30  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								fb6eec0f7d 
								
							
								 
							
						 
						
							
							
								
								Hide/show autocomplete based on selection state  
							
							 
							
							
							
						 
						
							2016-06-21 15:46:20 +05:30  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								213e284edf 
								
							
								 
							
						 
						
							
							
								
								Fix  https://github.com/vector-im/vector-web/issues/1679  
							
							 
							
							
							
						 
						
							2016-06-21 11:05:37 +01:00  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								f6a76edfdf 
								
							
								 
							
						 
						
							
							
								
								Fuzzy matching in User and Room providers  
							
							 
							
							
							
						 
						
							2016-06-21 05:05:23 +05:30  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								442291c0a4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-autocomplete  
							
							 
							
							
							
						 
						
							2016-06-21 04:09:22 +05:30  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								fc06ebcc63 
								
							
								 
							
						 
						
							
							
								
								Fix view_next_room  
							
							 
							
							
							
						 
						
							2016-06-20 18:43:56 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								4c214119b2 
								
							
								 
							
						 
						
							
							
								
								Fix PR feedback  
							
							 
							
							
							
						 
						
							2016-06-20 18:05:58 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								4d5fbfc5b1 
								
							
								 
							
						 
						
							
							
								
								Remove now unused MatrixTools.GetRoomForAlias  
							
							 
							
							
							
						 
						
							2016-06-20 17:11:46 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d8dedae084 
								
							
								 
							
						 
						
							
							
								
								Fix /join to be consistent with the other code  
							
							 
							
							... 
							
							
							
							Plus a number of other tidyups:
 * Fix /join to dispatch a view_room for the room alias
   with the additional auto_join parameter
 * Make RoomView automatically join the room if the auto_join
   parameter is true and the user isn't already in it
 * Tidy up RoomView's peeking code, also fixing
   https://github.com/vector-im/vector-web/issues/1220 
   in react-sdk (although it still requires a synapse change
   to actually fix, but react-sdk does 'the right thing').
 * Remove duplication of usage text from /join command
 * Amalgamate MatrixChat::_viewRoom's many, many parameters
   into an object and sort out case consistency a little. 
							
						 
						
							2016-06-20 16:30:51 +01:00  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								4af983ed90 
								
							
								 
							
						 
						
							
							
								
								Style changes and improvements in autocomplete  
							
							 
							
							
							
						 
						
							2016-06-20 13:52:55 +05:30  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								94aec10512 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into dbkr/scalar  
							
							 
							
							
							
						 
						
							2016-06-19 22:40:48 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								8103a795ec 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #316  from matrix-org/rav/fix_react_version_number  
							
							 
							
							... 
							
							
							
							UserSettings: fix the displayed version of the react-sdk 
							
						 
						
							2016-06-17 17:13:35 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								f6835baa9c 
								
							
								 
							
						 
						
							
							
								
								UserSettings: fix the displayed version of the react-sdk  
							
							 
							
							
							
						 
						
							2016-06-17 17:09:52 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								1d42443c0c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #314  from matrix-org/dbkr/show_canonical_alias  
							
							 
							
							... 
							
							
							
							Show canonical alias in URL bar 
							
						 
						
							2016-06-17 17:03:18 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								6adce649eb 
								
							
								 
							
						 
						
							
							
								
								Use the first alias is there's no canonical alias  
							
							 
							
							
							
						 
						
							2016-06-17 16:56:34 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								ad00abe9c0 
								
							
								 
							
						 
						
							
							
								
								Support for making devices unverified  
							
							 
							
							... 
							
							
							
							Because its useful for testing
Requires support from js-sdk, and (ideally) css from vector-web 
							
						 
						
							2016-06-17 16:24:23 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								3b5378fa53 
								
							
								 
							
						 
						
							
							
								
								Show canonical alias in URL bar  
							
							 
							
							... 
							
							
							
							Use https://github.com/matrix-org/matrix-js-sdk/pull/140  to get the canonical alias, because that's a thing now. 
							
						 
						
							2016-06-17 15:17:45 +01:00  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								b9d7743e5a 
								
							
								 
							
						 
						
							
							
								
								Emoji provider, DDG working, style improvements  
							
							 
							
							
							
						 
						
							2016-06-17 04:58:09 +05:30  
						
					 
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 
						
							 
							
							
							
								
							
								769b3f0c2a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into feature-autocomplete  
							
							 
							
							
							
						 
						
							2016-06-17 00:37:39 +05:30  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								624e34c48a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #312  from matrix-org/rav/eventlistnener_warning  
							
							 
							
							... 
							
							
							
							Fix eventListener warning 
							
						 
						
							2016-06-16 11:15:08 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								0cc4497ef0 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #307  from matrix-org/dbkr/fix_peeking  
							
							 
							
							... 
							
							
							
							Fix peeking and member list vanishing 
							
						 
						
							2016-06-16 11:13:20 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								3e44d7307f 
								
							
								 
							
						 
						
							
							
								
								Fix eventListener warning  
							
							 
							
							... 
							
							
							
							Bump up maxEventListeners on the MatrixClient to shut up the warning about
leaks. 
							
						 
						
							2016-06-16 11:03:09 +01:00