ffa49df889 
								
							
								 
							
						 
						
							
							
								
								Refactor integration manager handling into a common place  
							
							... 
							
							
							
							It was already in a common place, but this is the boilerplate for supporting multiple integration managers, and multiple integration manager sources. 
For https://github.com/vector-im/riot-web/issues/4913  / https://github.com/vector-im/riot-web/issues/10161  
							
						 
						
							2019-08-09 16:08:06 -06:00  
				
					
						
							
							
								 
						
							
							
								75bcd61934 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3298  from matrix-org/t3chguy/Modal.createX_promise  
							
							... 
							
							
							
							change Modal async/await signature to use raw promises 
							
						 
						
							2019-08-09 18:16:40 +01:00  
				
					
						
							
							
								 
						
							
							
								49c7730503 
								
							
								 
							
						 
						
							
							
								
								change Modal async/await signature to use raw promises  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-09 17:29:22 +01:00  
				
					
						
							
							
								 
						
							
							
								a9afdec24a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3297  from matrix-org/t3chguy/Modal.createX_promise  
							
							... 
							
							
							
							Modal.createX return thenable which extends onFinished, for async/await 
							
						 
						
							2019-08-09 17:16:21 +01:00  
				
					
						
							
							
								 
						
							
							
								13c7149592 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3294  from matrix-org/t3chguy/mount-guard  
							
							... 
							
							
							
							Add mount-guards to MImageBody 
							
						 
						
							2019-08-09 16:55:08 +01:00  
				
					
						
							
							
								 
						
							
							
								cc0b698c92 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3296  from matrix-org/t3chguy/remove_legacyLoginParams  
							
							... 
							
							
							
							Get rid of support for legacy login params 
							
						 
						
							2019-08-09 16:54:51 +01:00  
				
					
						
							
							
								 
						
							
							
								7fe078c07a 
								
							
								 
							
						 
						
							
							
								
								Modal.createX return thenable which extends onFinished, for async/await  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-09 16:47:22 +01:00  
				
					
						
							
							
								 
						
							
							
								d297018d9a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3295  from matrix-org/dbkr/debounce_field  
							
							... 
							
							
							
							Change throttle to debounce 
							
						 
						
							2019-08-09 15:38:58 +01:00  
				
					
						
							
							
								 
						
							
							
								787e9feeff 
								
							
								 
							
						 
						
							
							
								
								Get rid of support for legacy login params  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-09 15:34:32 +01:00  
				
					
						
							
							
								 
						
							
							
								fcdbce1dda 
								
							
								 
							
						 
						
							
							
								
								Change throttle to debounce  
							
							... 
							
							
							
							And add an explanation of whyI think one's more apropriate than the
other for this. 
							
						 
						
							2019-08-09 15:30:05 +01:00  
				
					
						
							
							
								 
						
							
							
								72a83a8e6e 
								
							
								 
							
						 
						
							
							
								
								Add mount-guards to MImageBody  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-09 14:51:07 +01:00  
				
					
						
							
							
								 
						
							
							
								78744b8bcf 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3293  from matrix-org/travis/fix-karma  
							
							... 
							
							
							
							Misc fixes to karma webpack 
							
						 
						
							2019-08-08 17:31:39 -06:00  
				
					
						
							
							
								 
						
							
							
								ac9682a75b 
								
							
								 
							
						 
						
							
							
								
								Actually use argument in karma tests  
							
							
							
						 
						
							2019-08-08 16:00:14 -06:00  
				
					
						
							
							
								 
						
							
							
								a6347af320 
								
							
								 
							
						 
						
							
							
								
								Fix karma complaining about woff2 files  
							
							
							
						 
						
							2019-08-08 16:00:07 -06:00  
				
					
						
							
							
								 
						
							
							
								3214ed8829 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3289  from matrix-org/jryans/rm-bind-at-reg  
							
							... 
							
							
							
							Remove 3PID binding during registration 
							
						 
						
							2019-08-08 17:48:50 +01:00  
				
					
						
							
							
								 
						
							
							
								c2f81a00c4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3288  from matrix-org/jryans/user-settings-toggle-3pid  
							
							... 
							
							
							
							Add controls for toggling discovery in user settings 
							
						 
						
							2019-08-08 17:48:17 +01:00  
				
					
						
							
							
								 
						
							
							
								38e64ce966 
								
							
								 
							
						 
						
							
							
								
								Remove 3PID binding during registration  
							
							... 
							
							
							
							This disables 3PID binding at registration time, so users won't be discoverable
by 3PID by default. Instead, new discovery controls in settings allow you to
opt-in.
Fixes https://github.com/vector-im/riot-web/issues/10424  
							
						 
						
							2019-08-08 16:25:48 +01:00  
				
					
						
							
							
								 
						
							
							
								e0fb0de83d 
								
							
								 
							
						 
						
							
							
								
								Relock gemini-scrollbar deps  
							
							
							
						 
						
							2019-08-08 16:01:41 +01:00  
				
					
						
							
							
								 
						
							
							
								07d6fa7fdb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3286  from matrix-org/travis/immutable-dms/basic  
							
							... 
							
							
							
							Reuse DMs whenever possible instead of asking to reuse them 
							
						 
						
							2019-08-08 07:26:17 -06:00  
				
					
						
							
							
								 
						
							
							
								11cf7493d9 
								
							
								 
							
						 
						
							
							
								
								Disable binding 3PIDs when adding to account  
							
							... 
							
							
							
							Binding 3PIDs on the IS is now handled by a separate step in the Discovery
section of settings.
Fixes https://github.com/vector-im/riot-web/issues/10510  
							
						 
						
							2019-08-08 11:52:21 +01:00  
				
					
						
							
							
								 
						
							
							
								178d6605c4 
								
							
								 
							
						 
						
							
							
								
								Add controls for toggling discovery in user settings  
							
							... 
							
							
							
							This adds controls for each 3PID to allow the user to choose whether it's bound
on the IS.
Fixes https://github.com/vector-im/riot-web/issues/10159  
							
						 
						
							2019-08-08 11:35:35 +01:00  
				
					
						
							
							
								 
						
							
							
								54ca7b708e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3285  from matrix-org/dbkr/work_without_is  
							
							... 
							
							
							
							Work with no ID server set 
							
						 
						
							2019-08-08 09:48:44 +01:00  
				
					
						
							
							
								 
						
							
							
								f85898cdca 
								
							
								 
							
						 
						
							
							
								
								Remove ChatCreateOrReuseDialog  
							
							... 
							
							
							
							Part of https://github.com/vector-im/riot-web/issues/10416 
All usages of the dialog have been replaced with new DM logic. 
							
						 
						
							2019-08-07 12:18:41 -06:00  
				
					
						
							
							
								 
						
							
							
								24705d02b7 
								
							
								 
							
						 
						
							
							
								
								Replace DM logic in `view_start_chat_or_reuse`  
							
							... 
							
							
							
							Part of https://github.com/vector-im/riot-web/issues/10416 
This code is used by the welcome bot logic and the groups/communities section of the app. goHomeOnCancel can be removed because no matter what happens we'll end up in a room with the user (and we aren't showing a dialog anymore). 
							
						 
						
							2019-08-07 12:13:59 -06:00  
				
					
						
							
							
								 
						
							
							
								3144b9f1a2 
								
							
								 
							
						 
						
							
							
								
								Disable 'Start New Chat' button in MemberInfo if we already have chats  
							
							... 
							
							
							
							Part of https://github.com/vector-im/riot-web/issues/10416  
							
						 
						
							2019-08-07 12:06:27 -06:00  
				
					
						
							
							
								 
						
							
							
								2ecabd2195 
								
							
								 
							
						 
						
							
							
								
								Reuse direct chats when starting new ones  
							
							... 
							
							
							
							Part of https://github.com/vector-im/riot-web/issues/10416 
This section of code applies to the + button next to PEOPLE in the room list. 
							
						 
						
							2019-08-07 12:01:51 -06:00  
				
					
						
							
							
								 
						
							
							
								c09f86f347 
								
							
								 
							
						 
						
							
							
								
								re-run i18n  
							
							
							
						 
						
							2019-08-07 13:37:24 +01:00  
				
					
						
							
							
								 
						
							
							
								9fa5e01f2f 
								
							
								 
							
						 
						
							
							
								
								Disable password reset if no ID server  
							
							
							
						 
						
							2019-08-07 13:30:52 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								66ef08120e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3282  from matrix-org/bwindels/extract-common-editor-code  
							
							... 
							
							
							
							Split MessageEditor up in edit-specifics & reusable parts for main composer 
							
						 
						
							2019-08-07 07:58:52 +00:00  
				
					
						
							
							
								 
						
							
							
								610baff09a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2668  from azuenko/develop  
							
							... 
							
							
							
							Fix waste of space of collapsed left panel 
							
						 
						
							2019-08-06 13:54:04 -06:00  
				
					
						
							
							
								 
						
							
							
								f6dbeef204 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3257  from matrix-org/t3chguy/slashcommands_help  
							
							... 
							
							
							
							Add help slash command 
							
						 
						
							2019-08-06 18:50:49 +01:00  
				
					
						
							
							
								 
						
							
							
								5e76019b63 
								
							
								 
							
						 
						
							
							
								
								fix i18n  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-06 18:35:33 +01:00  
				
					
						
							
							
								 
						
							
							
								c022f58f3b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3278  from matrix-org/t3chguy/electron_keep_alt_menu  
							
							... 
							
							
							
							Allow setting in electron whether or not to auto hide menu bar 
							
						 
						
							2019-08-06 18:20:22 +01:00  
				
					
						
							
							
								 
						
							
							
								daf1a794e6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3276  from matrix-org/t3chguy/react16_1  
							
							... 
							
							
							
							Progress towards React 16 compatibility 
							
						 
						
							2019-08-06 18:09:30 +01:00  
				
					
						
							
							
								 
						
							
							
								1e8b304b3c 
								
							
								 
							
						 
						
							
							
								
								Remove /tint completely and dedup copyright  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-06 18:08:17 +01:00  
				
					
						
							
							
								 
						
							
							
								5d048972ab 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-06 18:06:47 +01:00  
				
					
						
							
							
								 
						
							
							
								ae834f8d05 
								
							
								 
							
						 
						
							
							
								
								Split out SlashCommandHelpDialog, group by category and style it  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-06 18:03:38 +01:00  
				
					
						
							
							
								 
						
							
							
								64afaa1df5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3284  from matrix-org/t3chguy/invite_hide_settings_context_button  
							
							... 
							
							
							
							Hide settings button on Room Tile Context Menu for myMembership=invite 
							
						 
						
							2019-08-06 17:18:56 +01:00  
				
					
						
							
							
								 
						
							
							
								2fd371e1dd 
								
							
								 
							
						 
						
							
							
								
								prune i18n and get rid of /help header  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-06 17:07:56 +01:00  
				
					
						
							
							
								 
						
							
							
								734ca0df6e 
								
							
								 
							
						 
						
							
							
								
								get rid of /tint for now  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-06 17:04:02 +01:00  
				
					
						
							
							
								 
						
							
							
								71338d5140 
								
							
								 
							
						 
						
							
							
								
								Hide settings button on Room Tile Context Menu for myMembership=invite  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-06 16:25:29 +01:00  
				
					
						
							
							
								 
						
							
							
								8c446bbd29 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3279  from matrix-org/t3chguy/remove_withMatrixClient  
							
							... 
							
							
							
							Remove withMatrixClient as we are committed to using Contexts 
							
						 
						
							2019-08-06 14:12:14 +01:00  
				
					
						
							
							
								 
						
							
							
								d99fb4796f 
								
							
								 
							
						 
						
							
							
								
								avoid using import * as Matrix  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-06 14:04:33 +01:00  
				
					
						
							
							
								 
						
							
							
								accb1eea9f 
								
							
								 
							
						 
						
							
							
								
								Move existing 3PID settings UX to account directory  
							
							
							
						 
						
							2019-08-06 13:03:49 +01:00  
				
					
						
							
							
								 
						
							
							
								aa0a2a579e 
								
							
								 
							
						 
						
							
							
								
								Add copyright headers  
							
							
							
						 
						
							2019-08-06 12:43:30 +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  
				
					
						
							
							
								 
						
							
							
								a3eb45e0b9 
								
							
								 
							
						 
						
							
							
								
								Fix waste of space of collapsed left panel  
							
							... 
							
							
							
							Signed-off-by: Anton Zuenko <anton@zuenko.ru> 
							
						 
						
							2019-08-05 18:03:20 +02:00