b16bc0178a 
								
							
								 
							
						 
						
							
							
								
								insert manually, as insertHTML command moves caret inconsistently  
							
							... 
							
							
							
							across browsers 
							
						 
						
							2019-06-19 17:42:18 +02:00  
				
					
						
							
							
								 
						
							
							
								f0271b593d 
								
							
								 
							
						 
						
							
							
								
								remove special casing for moving caret after newline and pills  
							
							... 
							
							
							
							not needed anymore with new caret logic and having caret nodes 
							
						 
						
							2019-06-19 17:42:18 +02:00  
				
					
						
							
							
								 
						
							
							
								a229641985 
								
							
								 
							
						 
						
							
							
								
								use caret nodes in caret positioning code, to move caret out of pills  
							
							
							
						 
						
							2019-06-19 17:42:18 +02:00  
				
					
						
							
							
								 
						
							
							
								607fc328ed 
								
							
								 
							
						 
						
							
							
								
								also process first part when processing empty and mergeable parts  
							
							... 
							
							
							
							this was preventing clearing an emtpy plain part when inserting
a pill-candidate at the beginning of the model, which
prevented a caret node from being inserted before the pill. 
							
						 
						
							2019-06-19 17:42:18 +02:00  
				
					
						
							
							
								 
						
							
							
								75fc769742 
								
							
								 
							
						 
						
							
							
								
								insert "caret nodes" where pills don't have an adjacent text node  
							
							... 
							
							
							
							just empty spans, where the caret can be placed. 
							
						 
						
							2019-06-19 17:42:18 +02:00  
				
					
						
							
							
								 
						
							
							
								9591e6b0d3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3071  from matrix-org/t3chguy/authentication_password_field  
							
							... 
							
							
							
							Switch ugly password boxes to Field or styled input 
							
						 
						
							2019-06-19 09:31:11 +01:00  
				
					
						
							
							
								 
						
							
							
								9641110315 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3118  from matrix-org/dbkr/already_registered  
							
							... 
							
							
							
							Restore warning for if you're already logged in 
							
						 
						
							2019-06-19 09:27:31 +01:00  
				
					
						
							
							
								 
						
							
							
								c8e121dc70 
								
							
								 
							
						 
						
							
							
								
								Restore warning for if you're already logged in  
							
							... 
							
							
							
							...when clicking an email link. Although now we can complete the
registration because we can do so without replacing your session. 
							
						 
						
							2019-06-18 18:43:14 +01:00  
				
					
						
							
							
								 
						
							
							
								bb97653455 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3113  from matrix-org/bwindels/mediadeviceslabels  
							
							... 
							
							
							
							Provide default name if device label is missing 
							
						 
						
							2019-06-18 16:44:43 +00:00  
				
					
						
							
							
								 
						
							
							
								63fba611c0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3108  from matrix-org/bwindels/edit-room-notif-pill  
							
							... 
							
							
							
							Support @room pills while editing 
							
						 
						
							2019-06-18 16:43:14 +00:00  
				
					
						
							
							
								 
						
							
							
								7b514b0573 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3115  from matrix-org/travis/reduce-scalar-calls  
							
							... 
							
							
							
							Defer scalar API calls until they are needed 
							
						 
						
							2019-06-18 08:17:21 -06:00  
				
					
						
							
							
								 
						
							
							
								b6ca0ea6bf 
								
							
								 
							
						 
						
							
							
								
								Appease the linter  
							
							
							
						 
						
							2019-06-18 08:01:38 -06:00  
				
					
						
							
							
								 
						
							
							
								be37332bb0 
								
							
								 
							
						 
						
							
							
								
								Further simplify usage of integrations  
							
							
							
						 
						
							2019-06-18 07:55:43 -06:00  
				
					
						
							
							
								 
						
							
							
								f7c03acb58 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3117  from matrix-org/bwindels/redactions-blended-echo  
							
							... 
							
							
							
							Blend pending redactions 
							
						 
						
							2019-06-18 13:09:25 +00:00  
				
					
						
							
							
								 
						
							
							
								c4fc2a8089 
								
							
								 
							
						 
						
							
							
								
								remove redundant localecho part from method name  
							
							
							
						 
						
							2019-06-18 14:57:58 +02:00  
				
					
						
							
							
								 
						
							
							
								f9188bca92 
								
							
								 
							
						 
						
							
							
								
								reduced opacity for pending redactions  
							
							
							
						 
						
							2019-06-18 13:48:51 +02:00  
				
					
						
							
							
								 
						
							
							
								02c9e29937 
								
							
								 
							
						 
						
							
							
								
								use renamed method that also takes local redactions into account now  
							
							
							
						 
						
							2019-06-18 13:47:33 +02:00  
				
					
						
							
							
								 
						
							
							
								cc155ac049 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3116  from matrix-org/bwindels/feature-guard-arrowup-to-edit  
							
							... 
							
							
							
							Keep old arrow-up behaviour when editing is not enabled 
							
						 
						
							2019-06-18 09:57:04 +00:00  
				
					
						
							
							
								 
						
							
							
								f95f194b6a 
								
							
								 
							
						 
						
							
							
								
								keep old arrow-up behaviour when editing is not enabled  
							
							... 
							
							
							
							also, move caret at end/start checks before choosing what to do
also, selectHistory shouldn't return a promise 
							
						 
						
							2019-06-18 11:49:36 +02:00  
				
					
						
							
							
								 
						
							
							
								32840fc274 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3098  from matrix-org/t3chguy/restore_composer_history  
							
							... 
							
							
							
							Restore Composer History under shift-up & down 
							
						 
						
							2019-06-18 08:59:11 +00:00  
				
					
						
							
							
								 
						
							
							
								5e7b4564cf 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3114  from matrix-org/dbkr/allow_server_change_if_dead  
							
							... 
							
							
							
							Allow changing server if validation has failed 
							
						 
						
							2019-06-18 09:37:31 +01:00  
				
					
						
							
							
								 
						
							
							
								1db505c667 
								
							
								 
							
						 
						
							
							
								
								comment typo  
							
							
							
						 
						
							2019-06-18 09:50:31 +02:00  
				
					
						
							
							
								 
						
							
							
								3119feaa17 
								
							
								 
							
						 
						
							
							
								
								whitespace  
							
							
							
						 
						
							2019-06-18 09:48:25 +02:00  
				
					
						
							
							
								 
						
							
							
								47579f37e8 
								
							
								 
							
						 
						
							
							
								
								clarify why its always safe to not append @room at end while parsing  
							
							
							
						 
						
							2019-06-18 08:40:58 +02:00  
				
					
						
							
							
								 
						
							
							
								b0d340f578 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3109  from matrix-org/t3chguy/upload_all_button  
							
							... 
							
							
							
							Add Upload All button to UploadConfirmDialog 
							
						 
						
							2019-06-17 18:06:15 -06:00  
				
					
						
							
							
								 
						
							
							
								d5db0077ed 
								
							
								 
							
						 
						
							
							
								
								Remove unused imports  
							
							
							
						 
						
							2019-06-17 15:53:11 -06:00  
				
					
						
							
							
								 
						
							
							
								8f6e8c1ec7 
								
							
								 
							
						 
						
							
							
								
								Appease the linter  
							
							
							
						 
						
							2019-06-17 15:51:14 -06:00  
				
					
						
							
							
								 
						
							
							
								d58ab8e6d0 
								
							
								 
							
						 
						
							
							
								
								Remove excessive scalar auth checks in manager util class  
							
							
							
						 
						
							2019-06-17 15:50:09 -06:00  
				
					
						
							
							
								 
						
							
							
								974a11ed20 
								
							
								 
							
						 
						
							
							
								
								Defer scalar auth in AppsDrawer to widgets/manager dialog  
							
							
							
						 
						
							2019-06-17 15:39:32 -06:00  
				
					
						
							
							
								 
						
							
							
								d2d0cb2e9e 
								
							
								 
							
						 
						
							
							
								
								Port AppTile (widgets) over to new integration manager dialog props  
							
							
							
						 
						
							2019-06-17 15:34:30 -06:00  
				
					
						
							
							
								 
						
							
							
								f699fed720 
								
							
								 
							
						 
						
							
							
								
								Defer sticker picker scalar auth to integration manager dialog  
							
							... 
							
							
							
							or when needed, instead of up front. 
							
						 
						
							2019-06-17 15:30:24 -06:00  
				
					
						
							
							
								 
						
							
							
								ebabc5238d 
								
							
								 
							
						 
						
							
							
								
								Port integration manager class to new dialog props  
							
							
							
						 
						
							2019-06-17 15:30:01 -06:00  
				
					
						
							
							
								 
						
							
							
								a5f296457f 
								
							
								 
							
						 
						
							
							
								
								Make the Manage Integrations Button defer scalar auth to the manager  
							
							... 
							
							
							
							This moves the responsibility of creating a URL to open from the button (and other components) to the integrations manager dialog itself.
By doing this, we also cut down on scalar API calls because we don't pick up on account information until the user opens the dialog. 
							
						 
						
							2019-06-17 15:29:28 -06:00  
				
					
						
							
							
								 
						
							
							
								6cc443cd01 
								
							
								 
							
						 
						
							
							
								
								spelling  
							
							
							
						 
						
							2019-06-17 15:27:35 -06:00  
				
					
						
							
							
								 
						
							
							
								7c80355ea7 
								
							
								 
							
						 
						
							
							
								
								Convert IntegrationsManager to a class  
							
							
							
						 
						
							2019-06-17 15:26:58 -06:00  
				
					
						
							
							
								 
						
							
							
								10f6abfe17 
								
							
								 
							
						 
						
							
							
								
								Allow changing server if validation has failed  
							
							... 
							
							
							
							Show the server config section if there's an error and fix an if
case where we forgot to un-set the busy flag 
							
						 
						
							2019-06-17 18:47:20 +01:00  
				
					
						
							
							
								 
						
							
							
								fac6dc25f6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3112  from matrix-org/dbkr/reenable_register_button  
							
							... 
							
							
							
							Re-enable register button 
							
						 
						
							2019-06-17 18:45:39 +01:00  
				
					
						
							
							
								 
						
							
							
								536f78eaf5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3111  from matrix-org/bwindels/fix-register-layout  
							
							... 
							
							
							
							keep mx_Field stretching 
							
						 
						
							2019-06-17 17:42:52 +00:00  
				
					
						
							
							
								 
						
							
							
								a35c9ea585 
								
							
								 
							
						 
						
							
							
								
								provide default for missing device labels  
							
							
							
						 
						
							2019-06-17 19:39:40 +02:00  
				
					
						
							
							
								 
						
							
							
								872c1acdea 
								
							
								 
							
						 
						
							
							
								
								keep mx_Field stretching  
							
							
							
						 
						
							2019-06-17 18:29:03 +02:00  
				
					
						
							
							
								 
						
							
							
								3f6bb0c7ca 
								
							
								 
							
						 
						
							
							
								
								Use default cursor for disabled submit button  
							
							
							
						 
						
							2019-06-17 16:57:13 +01:00  
				
					
						
							
							
								 
						
							
							
								e3bf4a0b8e 
								
							
								 
							
						 
						
							
							
								
								Re-enable register button on change to working HS  
							
							... 
							
							
							
							Register button disabling is done via serverErrorIsFatal so we need
to reset this on a successful validation.
https://github.com/vector-im/riot-web/issues/10029  
							
						 
						
							2019-06-17 16:27:35 +01:00  
				
					
						
							
							
								 
						
							
							
								2eef3d610e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3107  from matrix-org/dbkr/multispinner  
							
							... 
							
							
							
							Fix double-spinner 
							
						 
						
							2019-06-17 09:27:45 +01:00  
				
					
						
							
							
								 
						
							
							
								94f6907db5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3110  from z3ntu/canonical_alias  
							
							... 
							
							
							
							Fix display of canonicalAlias in group room info 
							
						 
						
							2019-06-17 08:11:27 +01:00  
				
					
						
							
							
								 
						
							
							
								c68074f532 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix display of canonicalAlias in group room info  
							
							... 
							
							
							
							Signed-off-by: Luca Weiss <luca@z3ntu.xyz> 
							
						 
						
							2019-06-16 21:52:25 +02:00  
				
					
						
							
							
								 
						
							
							
								2fc2e32e60 
								
							
								 
							
						 
						
							
							
								
								Add Upload All button to UploadConfirmDialog  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-06-16 11:43:13 +01:00  
				
					
						
							
							
								 
						
							
							
								fbe8d1c89b 
								
							
								 
							
						 
						
							
							
								
								Switch DeactivateAccountDialog to Field and cleanups  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-06-16 10:42:46 +01:00  
				
					
						
							
							
								 
						
							
							
								3563b83762 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/authentication_password_field  
							
							
							
						 
						
							2019-06-16 10:31:30 +01:00  
				
					
						
							
							
								 
						
							
							
								03c37821f6 
								
							
								 
							
						 
						
							
							
								
								clean up onVerticalArrow  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-06-15 15:10:34 +01:00  
				
					
						
							
							
								 
						
							
							
								d9e62b54fc 
								
							
								 
							
						 
						
							
							
								
								also support deserializing at-room-pill when transferring editor state  
							
							
							
						 
						
							2019-06-14 18:42:30 +02:00