David Baker
							
						 
						
							 
							
							
							
								
							
								e2f5e16fa7 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show  
							
							 
							
							
							
						 
						
							2017-11-20 10:00:47 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								6d23182f5f 
								
							
								 
							
						 
						
							
							
								
								Fix the force TURN option  
							
							 
							
							... 
							
							
							
							The call object is created within the js-sdk for inbound calls, so
we never got the chance to set it. 
							
						 
						
							2017-11-17 14:54:44 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								65e1d49f37 
								
							
								 
							
						 
						
							
							
								
								More sensible buttons in UnknownDeviceDialog  
							
							 
							
							... 
							
							
							
							Just say 'Send' (or equiv) if you actually verify all the devices,
rather than 'Send Anyway'. 
							
						 
						
							2017-11-16 17:59:42 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								eea8a41ef9 
								
							
								 
							
						 
						
							
							
								
								Unused import  
							
							 
							
							
							
						 
						
							2017-11-16 16:20:13 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								8ba9d26d4b 
								
							
								 
							
						 
						
							
							
								
								Don't set the call state to ended on error  
							
							 
							
							... 
							
							
							
							This isn't always the case, eg. just because we fail to pick up,
the call is still ringing. 
							
						 
						
							2017-11-16 15:42:46 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								af8ff1b888 
								
							
								 
							
						 
						
							
							
								
								Don't blindly hangup on a call error.  
							
							 
							
							... 
							
							
							
							Not all errors means we want to send a hangup (in fact most don't,
but the most notable being when we fail to answer a call: we should
not then automatically reject it). 
							
						 
						
							2017-11-16 11:07:57 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b0027525f3 
								
							
								 
							
						 
						
							
							
								
								Wire up Unknown Devices popup for outbound calls  
							
							 
							
							
							
						 
						
							2017-11-15 17:21:04 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f8fc6dc83e 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show  
							
							 
							
							
							
						 
						
							2017-11-15 12:11:33 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								63919befd0 
								
							
								 
							
						 
						
							
							
								
								Catch call failures due to unknown devices  
							
							 
							
							... 
							
							
							
							And show a specific dialog that you can then launch the UDD from
(although currently with a 'Send Anyway' button which makes little
sense for VoIP) 
							
						 
						
							2017-11-15 10:49:29 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b1ec430523 
								
							
								 
							
						 
						
							
							
								
								Remove now-unused dispatches  
							
							 
							
							
							
						 
						
							2017-11-09 16:09:12 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								0d3f0eaf98 
								
							
								 
							
						 
						
							
							
								
								Convert local settings to granular settings  
							
							 
							
							... 
							
							
							
							This breaks language selection.
Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2017-10-29 16:53:00 -06:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								d3f9a3aeb5 
								
							
								 
							
						 
						
							
							
								
								Run eslint --fix  
							
							 
							
							... 
							
							
							
							Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase. 
							
						 
						
							2017-10-11 17:56:17 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								bf98c0da7c 
								
									
								
							
								 
							
						 
						
							
							
								
								un-i18n Modal Analytics  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-07-27 17:19:18 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								c1d1a1377c 
								
							
								 
							
						 
						
							
							
								
								allow forcing of TURN, pass account val per-call until UX is designed.  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-06-12 20:20:27 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								f75e714c3a 
								
							
								 
							
						 
						
							
							
								
								More translations..  
							
							 
							
							
							
						 
						
							2017-06-01 15:18:06 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								e5ef9f3e3a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #918  from matrix-org/t3chguy/electron_call_sleep  
							
							 
							
							... 
							
							
							
							pass call state through dispatcher, for poor electron 
							
						 
						
							2017-05-26 19:09:10 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								443ab1add7 
								
							
								 
							
						 
						
							
							
								
								Put back default strings on dialogs  
							
							 
							
							... 
							
							
							
							But make them work by calling _t in render rather than
getDefaultProps().
Also sort out some 'Warning!' strings 
							
						 
						
							2017-05-25 18:20:48 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c7776915f7 
								
							
								 
							
						 
						
							
							
								
								Kill off more tabs  
							
							 
							
							
							
						 
						
							2017-05-25 11:45:36 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								5c359e63ab 
								
							
								 
							
						 
						
							
							
								
								Bulk change counterpart imports  
							
							 
							
							... 
							
							
							
							to use languageHandler wrapper func 
							
						 
						
							2017-05-25 11:39:08 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d419c42a4f 
								
							
								 
							
						 
						
							
							
								
								Squash merge  https://github.com/matrix-org/matrix-react-sdk/pull/801  
							
							 
							
							
							
						 
						
							2017-05-23 15:16:31 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								024964aceb 
								
							
								 
							
						 
						
							
							
								
								pass call state through, for things that don't have access to full API  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-22 18:33:14 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								a2be764681 
								
							
								 
							
						 
						
							
							
								
								display err.message to user if available in error msgs  
							
							 
							
							
							
						 
						
							2017-04-23 01:48:27 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								3aaf37df1a 
								
							
								 
							
						 
						
							
							
								
								beautify a tonne more errors  
							
							 
							
							
							
						 
						
							2017-03-12 22:59:41 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								9515cf2cf2 
								
							
								 
							
						 
						
							
							
								
								Only hangup on call errors, not errors on sendEvent  
							
							 
							
							
							
						 
						
							2017-02-22 16:12:37 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								878e31eba2 
								
							
								 
							
						 
						
							
							
								
								Show UDDialog on m.call.invite failure  
							
							 
							
							... 
							
							
							
							Requires https://github.com/matrix-org/matrix-js-sdk/pull/378 
Also, refactored UDDialog creation into its own dispatch event, because there will be other parts of the code that will want to spawn one. 
							
						 
						
							2017-02-21 17:22:22 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								18d4d3392a 
								
							
								 
							
						 
						
							
							
								
								Fix a bunch of linting errors  
							
							 
							
							... 
							
							
							
							eslint --fix and a few manual ones 
							
						 
						
							2017-01-20 14:22:27 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								37d9108ceb 
								
							
								 
							
						 
						
							
							
								
								Add error popup if screen sharing fails  
							
							 
							
							
							
						 
						
							2017-01-11 10:06:48 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a16aae1124 
								
							
								 
							
						 
						
							
							
								
								Move screen sharing error check into platform  
							
							 
							
							... 
							
							
							
							Because on the browser it depends on HTTPS, on electron it doesn't
matter. 
							
						 
						
							2017-01-10 18:37:57 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Dent
							
						 
						
							 
							
							
							
								
							
								7c841a86ef 
								
							
								 
							
						 
						
							
							
								
								Unbranded error messages  
							
							 
							
							
							
						 
						
							2016-12-21 14:28:01 -08:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								2eb9d90b86 
								
							
								 
							
						 
						
							
							
								
								Disable conference calling for encrypted rooms  
							
							 
							
							
							
						 
						
							2016-11-11 15:49:21 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								9d303712f2 
								
							
								 
							
						 
						
							
							
								
								more s/Vector/Riot/  
							
							 
							
							
							
						 
						
							2016-10-03 10:18:43 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d782d5bbc7 
								
							
								 
							
						 
						
							
							
								
								Fix error dialog on conf call error  
							
							 
							
							
							
						 
						
							2016-09-05 17:03:10 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								35fff74477 
								
							
								 
							
						 
						
							
							
								
								oops, typo  
							
							 
							
							
							
						 
						
							2016-08-31 17:25:41 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								516369fb07 
								
							
								 
							
						 
						
							
							
								
								use promises to mediate access to HTMLAudioElements  
							
							 
							
							
							
						 
						
							2016-08-31 16:38:37 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								534d996582 
								
							
								 
							
						 
						
							
							
								
								ignore local busy - workaround for  https://github.com/vector-im/vector-web/issues/1964  
							
							 
							
							
							
						 
						
							2016-08-15 16:17:35 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								6632322029 
								
							
								 
							
						 
						
							
							
								
								spell out that conference calling is hit and miss  
							
							 
							
							
							
						 
						
							2016-08-03 19:56:13 +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  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								0d841551a0 
								
							
								 
							
						 
						
							
							
								
								prettyprint conference joins and parts properly  
							
							 
							
							
							
						 
						
							2016-03-05 02:30:57 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								0772f50fab 
								
							
								 
							
						 
						
							
							
								
								update copyright for 2016  
							
							 
							
							
							
						 
						
							2016-01-07 04:06:52 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								d979a028a5 
								
							
								 
							
						 
						
							
							
								
								position the inbound call box correctly, and fix various issues with when the video preview and callview are shown  
							
							 
							
							
							
						 
						
							2015-12-17 02:49:09 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								1e694da460 
								
							
								 
							
						 
						
							
							
								
								Move MatrixChat and login components to react SDK.  
							
							 
							
							... 
							
							
							
							Removed Modulator as it is no longer necessary in this form. ConferenceHandler
is injected in src/vector/index.js 
							
						 
						
							2015-11-30 18:11:04 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								fcb6db684b 
								
							
								 
							
						 
						
							
							
								
								Move and merge QuestionDialog and ErrorDialog  
							
							 
							
							
							
						 
						
							2015-11-30 14:11:04 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								3485a74036 
								
							
								 
							
						 
						
							
							
								
								Gracefully handle browsers which don't do VoIP  
							
							 
							
							... 
							
							
							
							Specifically:
 - Don't show inbound call ringing
 - Don't let users place calls/conf calls
 - Show call records with "not supported by this browser". 
							
						 
						
							2015-11-02 17:39:00 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								98ea35253a 
								
							
								 
							
						 
						
							
							
								
								shift-click the video button to screenshare rather than overriding the button entirely.  
							
							 
							
							
							
						 
						
							2015-10-21 01:21:21 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								8ff7d87b38 
								
							
								 
							
						 
						
							
							
								
								Bodge to make video = screen sharing  
							
							 
							
							
							
						 
						
							2015-10-20 16:45:26 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								5004a3a5b3 
								
							
								 
							
						 
						
							
							
								
								Make end call button work for conf calls  
							
							 
							
							
							
						 
						
							2015-10-01 09:42:58 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								cb89d3760a 
								
							
								 
							
						 
						
							
							
								
								Hacks to make sure we don't end up with multiple split-brain CallHandlers when npm linked.  
							
							 
							
							
							
						 
						
							2015-09-30 18:21:25 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b68665ead5 
								
							
								 
							
						 
						
							
							
								
								Add support for the basic notion of conference calls and an experimental concept of modules to provide the actual functionality. Rejig Skinner to be simpler.  
							
							 
							
							
							
						 
						
							2015-09-30 16:50:46 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								abeed92501 
								
							
								 
							
						 
						
							
							
								
								Partial porting over of vector controller logic to react sdk.  
							
							 
							
							
							
						 
						
							2015-09-17 18:23:38 +01:00