d31f1ea7f2 
								
							
								 
							
						 
						
							
							
								
								Disable addign threepids if no IS configured  
							
							
							
						 
						
							2019-08-07 11:51:42 +01:00  
				
					
						
							
							
								 
						
							
							
								bcf53c6e33 
								
							
								 
							
						 
						
							
							
								
								Make invite work without an IS  
							
							... 
							
							
							
							Also fix it so you can't try to invite a room ID to a room 
							
						 
						
							2019-08-07 11:41:00 +01:00  
				
					
						
							
							
								 
						
							
							
								366f7e277a 
								
							
								 
							
						 
						
							
							
								
								Make registration work without an IS.  
							
							
							
						 
						
							2019-08-07 11:15:56 +01:00  
				
					
						
							
							
								 
						
							
							
								ba3e9e3f84 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3283  from matrix-org/jryans/user-settings-toggle-3pid  
							
							... 
							
							
							
							Update existing 3PID management UX 
							
						 
						
							2019-08-05 18:56:15 +01:00  
				
					
						
							
							
								 
						
							
							
								11f2b4320d 
								
							
								 
							
						 
						
							
							
								
								Update existing 3PID management UX  
							
							... 
							
							
							
							This tweaks the appearance of the existing 3PID management UX to use a different
style for the remove button. This styling will more closely match the soon to be
added 3PID discovery settings.
Part of https://github.com/vector-im/riot-web/issues/10159  
							
						 
						
							2019-08-05 16:34:04 +01:00  
				
					
						
							
							
								 
						
							
							
								ab05d8c7a4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into develop  
							
							
							
						 
						
							2019-08-05 14:37:17 +01:00  
				
					
						
							
							
								 
						
							
							
								0e973bf211 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'release-v1.5.1'  
							
							
							
						 
						
							2019-08-05 14:36:48 +01:00  
				
					
						
							
							
								 
						
							
							
								9016be22a4 
								
							
								 
							
						 
						
							
							
								
								v1.5.1  
							
							
							
						 
						
							2019-08-05 14:33:58 +01:00  
				
					
						
							
							
								 
						
							
							
								92aec936a0 
								
							
								 
							
						 
						
							
							
								
								Prepare changelog for v1.5.1  
							
							
							
						 
						
							2019-08-05 14:33:58 +01:00  
				
					
						
							
							
								 
						
							
							
								b2d4054958 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3281  from matrix-org/dbkr/user-deactivated-2  
							
							... 
							
							
							
							Let user know their account has been deactivated upon trying to login 
							
						 
						
							2019-08-05 14:16:57 +01:00  
				
					
						
							
							
								 
						
							
							
								b531bb58ca 
								
							
								 
							
						 
						
							
							
								
								Let user know their account has been deactivated upon trying to login  
							
							
							
						 
						
							2019-08-05 13:55:55 +01:00  
				
					
						
							
							
								 
						
							
							
								e8fcfbe2bf 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3280  from matrix-org/bwindels/user-deactivated  
							
							... 
							
							
							
							Let user know their account has been deactivated upon trying to login 
							
						 
						
							2019-08-05 13:23:40 +01:00  
				
					
						
							
							
								 
						
							
							
								7a5167b1a3 
								
							
								 
							
						 
						
							
							
								
								Let user know their account has been deactivated upon trying to login  
							
							
							
						 
						
							2019-08-05 13:48:25 +02:00  
				
					
						
							
							
								 
						
							
							
								6c1268f5a6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into develop  
							
							
							
						 
						
							2019-08-05 12:02:22 +01:00  
				
					
						
							
							
								 
						
							
							
								fbd2ba8863 
								
							
								 
							
						 
						
							
							
								
								v1.5.0  
							
							
							
						 
						
							2019-08-05 12:01:29 +01:00  
				
					
						
							
							
								 
						
							
							
								1682f3a6ba 
								
							
								 
							
						 
						
							
							
								
								Prepare changelog for v1.5.0  
							
							
							
						 
						
							2019-08-05 12:01:29 +01:00  
				
					
						
							
							
								 
						
							
							
								ec9be798ae 
								
							
								 
							
						 
						
							
							
								
								released js-sdk  
							
							
							
						 
						
							2019-08-05 11:58:25 +01:00  
				
					
						
							
							
								 
						
							
							
								4f48f89704 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3277  from matrix-org/dbkr/dont_load_guest_session_2  
							
							... 
							
							
							
							Don't load guest sessions on post-registration login link 
							
						 
						
							2019-08-05 11:23:04 +01:00  
				
					
						
							
							
								 
						
							
							
								d4f0c38253 
								
							
								 
							
						 
						
							
							
								
								Use options object  
							
							
							
						 
						
							2019-08-05 11:16:12 +01:00  
				
					
						
							
							
								 
						
							
							
								da49dd4409 
								
							
								 
							
						 
						
							
							
								
								Don't load guest sessions on post-registration login link  
							
							... 
							
							
							
							If guest access was enabled, clicking the login link on the 'registration
completed' page would just load the guest account you had before registering.
Fixes https://github.com/vector-im/riot-web/issues/10482  
							
						 
						
							2019-08-05 11:16:07 +01:00  
				
					
						
							
							
								 
						
							
							
								f80cbebb9d 
								
									
								
							
								 
							
						 
						
							
							
								
								Don't switch rooms when forgetting a room ( #3275 )  
							
							... 
							
							
							
							Don't randomly change to another room upon forgetting a room. 
							
						 
						
							2019-08-05 10:34:46 +01:00  
				
					
						
							
							
								 
						
							
							
								98c0232a96 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3274  from matrix-org/bwindels/fixpostcodeblocknewline  
							
							... 
							
							
							
							Fix newline not being appended to code block while converting message to markdown 
							
						 
						
							2019-08-05 08:19:42 +00:00  
				
					
						
							
							
								 
						
							
							
								5f45bbd6b7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3273  from matrix-org/dbkr/dont_load_guest_session  
							
							... 
							
							
							
							Don't load guest sessions on post-registration login link 
							
						 
						
							2019-08-02 17:46:00 +01:00  
				
					
						
							
							
								 
						
							
							
								9ef24352d0 
								
							
								 
							
						 
						
							
							
								
								Use options object  
							
							
							
						 
						
							2019-08-02 16:44:49 +01:00  
				
					
						
							
							
								 
						
							
							
								c1f6d82a4c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3271  from matrix-org/jryans/is-terms-prompt-on-use  
							
							... 
							
							
							
							Show terms modal when inviting by email 
							
						 
						
							2019-08-02 15:41:23 +01:00  
				
					
						
							
							
								 
						
							
							
								c53708b245 
								
							
								 
							
						 
						
							
							
								
								set lastNode directly when not decending  
							
							
							
						 
						
							2019-08-02 16:36:09 +02:00  
				
					
						
							
							
								 
						
							
							
								7ccc218a98 
								
							
								 
							
						 
						
							
							
								
								Tweak control flow to avoid duplicate terms prompts  
							
							
							
						 
						
							2019-08-02 15:21:53 +01:00  
				
					
						
							
							
								 
						
							
							
								a85efe5f65 
								
							
								 
							
						 
						
							
							
								
								Tweak import  
							
							
							
						 
						
							2019-08-02 14:43:36 +01:00  
				
					
						
							
							
								 
						
							
							
								793b91be5b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3272  from matrix-org/bwindels/editor-doc  
							
							... 
							
							
							
							Add developer documentation for the new editor 
							
						 
						
							2019-08-02 11:48:04 +00:00  
				
					
						
							
							
								 
						
							
							
								dae6fae3d6 
								
							
								 
							
						 
						
							
							
								
								describe caret nodes  
							
							
							
						 
						
							2019-08-02 13:45:52 +02:00  
				
					
						
							
							
								 
						
							
							
								ad776fbfca 
								
							
								 
							
						 
						
							
							
								
								describe all reasons why we need a custom textify algorithm  
							
							
							
						 
						
							2019-08-02 13:45:35 +02:00  
				
					
						
							
							
								 
						
							
							
								995ae41e67 
								
							
								 
							
						 
						
							
							
								
								add line breaks  
							
							
							
						 
						
							2019-08-02 13:40:16 +02:00  
				
					
						
							
							
								 
						
							
							
								ce32c9f28f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3267  from matrix-org/bwindels/editor-history  
							
							... 
							
							
							
							Undo/redo support for new editor 
							
						 
						
							2019-08-02 11:30:53 +00:00  
				
					
						
							
							
								 
						
							
							
								1c156f0a5a 
								
							
								 
							
						 
						
							
							
								
								Don't load guest sessions on post-registration login link  
							
							... 
							
							
							
							If guest access was enabled, clicking the login link on the 'registration
completed' page would just load the guest account you had before registering.
Fixes https://github.com/vector-im/riot-web/issues/10482  
							
						 
						
							2019-08-02 11:22:42 +01:00  
				
					
						
							
							
								 
						
							
							
								30fd027adf 
								
							
								 
							
						 
						
							
							
								
								document editor  
							
							
							
						 
						
							2019-08-02 12:19:46 +02:00  
				
					
						
							
							
								 
						
							
							
								b1cc089062 
								
							
								 
							
						 
						
							
							
								
								Silence unnecessary warning  
							
							... 
							
							
							
							Don't complain that we can't enable guest login if nobody asked us to 
							
						 
						
							2019-08-02 11:08:37 +01:00  
				
					
						
							
							
								 
						
							
							
								af3eebd0a6 
								
							
								 
							
						 
						
							
							
								
								add undo steps after word boundary (or capped) when typing or removing  
							
							
							
						 
						
							2019-08-02 11:31:01 +02:00  
				
					
						
							
							
								 
						
							
							
								348f6f971a 
								
							
								 
							
						 
						
							
							
								
								Show terms modal when inviting by email  
							
							... 
							
							
							
							This invokes the terms modal flow when inviting someone by email. Entering an
email triggers a lookup to the IS, and if it has terms you need to agree to,
then a separate modal is shown to complete this activity. You then come back to
invite screen after agreeing to the terms.
Fixes https://github.com/vector-im/riot-web/issues/10093  
							
						 
						
							2019-08-01 17:50:34 +01:00  
				
					
						
							
							
								 
						
							
							
								7bb1e503cb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3268  from matrix-org/jryans/is-account-info  
							
							... 
							
							
							
							Check IS v2 account tokens for validity 
							
						 
						
							2019-08-01 17:43:18 +01:00  
				
					
						
							
							
								 
						
							
							
								07b2e51dce 
								
							
								 
							
						 
						
							
							
								
								put max step length in constant  
							
							
							
						 
						
							2019-08-01 16:27:17 +02:00  
				
					
						
							
							
								 
						
							
							
								ca5a53729f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3269  from matrix-org/jryans/dialog-button-borders  
							
							... 
							
							
							
							Fix dialog button border colours 
							
						 
						
							2019-08-01 13:58:25 +01:00  
				
					
						
							
							
								 
						
							
							
								701103aad7 
								
							
								 
							
						 
						
							
							
								
								Fix dialog button border colours  
							
							... 
							
							
							
							This corrects dialog button borders to match other buttons by removing the green
border from disabled and danger states.
Fixes https://github.com/vector-im/riot-web/issues/10310  
							
						 
						
							2019-08-01 12:47:23 +01:00  
				
					
						
							
							
								 
						
							
							
								36308b9ebf 
								
							
								 
							
						 
						
							
							
								
								Check IS v2 account tokens for validity  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/10452  
							
						 
						
							2019-08-01 12:07:39 +01:00  
				
					
						
							
							
								 
						
							
							
								abde8b45d2 
								
							
								 
							
						 
						
							
							
								
								fix bug that prevented a line from being removed when undoing a newline  
							
							
							
						 
						
							2019-08-01 11:28:40 +02:00  
				
					
						
							
							
								 
						
							
							
								9d49a5bb73 
								
							
								 
							
						 
						
							
							
								
								pass caret to history manager upon initial render  
							
							... 
							
							
							
							otherwise caret is put at editor start when undoing last step 
							
						 
						
							2019-08-01 11:28:01 +02:00  
				
					
						
							
							
								 
						
							
							
								234404e598 
								
							
								 
							
						 
						
							
							
								
								add mod+z/y shortcuts, set editor state to what history manager returns  
							
							
							
						 
						
							2019-08-01 11:27:09 +02:00  
				
					
						
							
							
								 
						
							
							
								98bc0d24f4 
								
							
								 
							
						 
						
							
							
								
								push changes to history manager  
							
							
							
						 
						
							2019-08-01 11:26:20 +02:00  
				
					
						
							
							
								 
						
							
							
								aa22c90f2c 
								
							
								 
							
						 
						
							
							
								
								HistoryManager + unit tests  
							
							
							
						 
						
							2019-08-01 11:25:04 +02:00  
				
					
						
							
							
								 
						
							
							
								e33109cb8c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3266  from matrix-org/jryans/upgrade-deps-2019-07-31  
							
							... 
							
							
							
							Upgrade dependencies 
							
						 
						
							2019-07-31 18:51:19 +01:00  
				
					
						
							
							
								 
						
							
							
								e5c3d91e53 
								
							
								 
							
						 
						
							
							
								
								Upgrade dependencies  
							
							
							
						 
						
							2019-07-31 17:41:36 +01:00