diff --git a/CHANGELOG b/CHANGELOG
index ebcdad8..b69726e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,14 +1,11 @@
-<<<<<<< HEAD
2018-05-28 Verions 2.0.0 (beta)
SSH terminal support
Include prompt for user credentials in enterprise mode
fix login failure when passing domain in enterprise mode if IP is used instead of FQDN
-=======
2018-06-09 Version 1.9.1 (stable)
reinstated the hotfix removed into version 1.9.0, forcing IP connection when using FQDN; fact is, some people still have issues even with openssl 1.1.x (unable to reproduce, may depend on a specific configuration). more details here: https://github.com/FreeRDP/FreeRDP/issues/4525#issuecomment-380635647
improved performance mitigation in case of high latency network
the installer no longer requires administrator rights by default (but may still needs elevation during the installation, depending on the installed component(s))
->>>>>>> refs/remotes/cedrozor/master
2018-05-24 Version 1.9.0 (stable)
resynced FreeRDP (version 2.0-RC2-dev3), now using the openssl 1.1.x architecture. Should fix any previously reported FQDN and NLA issues
diff --git a/Myrtille.Common/Helpers/ClientIPHelper.cs b/Myrtille.Common/Helpers/ClientIPHelper.cs
index 7550788..e478522 100644
--- a/Myrtille.Common/Helpers/ClientIPHelper.cs
+++ b/Myrtille.Common/Helpers/ClientIPHelper.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2018 Paul Oliver
+ Copyright(c) 2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Enterprise/ActiveDirectory.cs b/Myrtille.Enterprise/ActiveDirectory.cs
index 8ad6411..c3cc23b 100644
--- a/Myrtille.Enterprise/ActiveDirectory.cs
+++ b/Myrtille.Enterprise/ActiveDirectory.cs
@@ -3,7 +3,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2018 Paul Oliver
+ Copyright(c) 2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Enterprise/Data/Host.cs b/Myrtille.Enterprise/Data/Host.cs
index 3f857e6..0ea90dc 100644
--- a/Myrtille.Enterprise/Data/Host.cs
+++ b/Myrtille.Enterprise/Data/Host.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2014-2018 Paul Oliver
+ Copyright(c) 2014-2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Enterprise/Data/HostAccessGroups.cs b/Myrtille.Enterprise/Data/HostAccessGroups.cs
index 2b9d19d..c8a5206 100644
--- a/Myrtille.Enterprise/Data/HostAccessGroups.cs
+++ b/Myrtille.Enterprise/Data/HostAccessGroups.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2014-2018 Paul Oliver
+ Copyright(c) 2014-2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Enterprise/Data/MigrationConfiguration.cs b/Myrtille.Enterprise/Data/MigrationConfiguration.cs
index 11b55b9..011b2ca 100644
--- a/Myrtille.Enterprise/Data/MigrationConfiguration.cs
+++ b/Myrtille.Enterprise/Data/MigrationConfiguration.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2014-2018 Paul Oliver
+ Copyright(c) 2014-2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Enterprise/Data/MyrtilleEnterpriseDBContext.cs b/Myrtille.Enterprise/Data/MyrtilleEnterpriseDBContext.cs
index 0933d42..5d72d79 100644
--- a/Myrtille.Enterprise/Data/MyrtilleEnterpriseDBContext.cs
+++ b/Myrtille.Enterprise/Data/MyrtilleEnterpriseDBContext.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2018 Paul Oliver
+ Copyright(c) 2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Enterprise/Data/Session.cs b/Myrtille.Enterprise/Data/Session.cs
index d76701e..69950b0 100644
--- a/Myrtille.Enterprise/Data/Session.cs
+++ b/Myrtille.Enterprise/Data/Session.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2018 Paul Oliver
+ Copyright(c) 2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Enterprise/Data/SessionGroup.cs b/Myrtille.Enterprise/Data/SessionGroup.cs
index a1a38b4..3afe75f 100644
--- a/Myrtille.Enterprise/Data/SessionGroup.cs
+++ b/Myrtille.Enterprise/Data/SessionGroup.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2018 Paul Oliver
+ Copyright(c) 2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Enterprise/Data/SessionHostCredential.cs b/Myrtille.Enterprise/Data/SessionHostCredential.cs
index b0e293f..ab52602 100644
--- a/Myrtille.Enterprise/Data/SessionHostCredential.cs
+++ b/Myrtille.Enterprise/Data/SessionHostCredential.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2018 Paul Oliver
+ Copyright(c) 2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Enterprise/Helpers/DirectoryExceptionHelper.cs b/Myrtille.Enterprise/Helpers/DirectoryExceptionHelper.cs
index e6917e4..27b6704 100644
--- a/Myrtille.Enterprise/Helpers/DirectoryExceptionHelper.cs
+++ b/Myrtille.Enterprise/Helpers/DirectoryExceptionHelper.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2018 Paul Oliver
+ Copyright(c) 2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.SSH/KeyboardIgnoreKeys.cs b/Myrtille.SSH/KeyboardIgnoreKeys.cs
index 98ad5bc..07ecf30 100644
--- a/Myrtille.SSH/KeyboardIgnoreKeys.cs
+++ b/Myrtille.SSH/KeyboardIgnoreKeys.cs
@@ -1,7 +1,7 @@
/*
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
- Copyright(c) 2018 Olive Innovations
+ Copyright(c) 2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.SSH/PipeMessaging.cs b/Myrtille.SSH/PipeMessaging.cs
index 8337e48..0285d7e 100644
--- a/Myrtille.SSH/PipeMessaging.cs
+++ b/Myrtille.SSH/PipeMessaging.cs
@@ -1,7 +1,7 @@
/*
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
- Copyright(c) 2018 Olive Innovations
+ Copyright(c) 2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.SSH/Program.cs b/Myrtille.SSH/Program.cs
index cf3e1ed..3ce44b6 100644
--- a/Myrtille.SSH/Program.cs
+++ b/Myrtille.SSH/Program.cs
@@ -1,7 +1,7 @@
/*
Myrtille: A native HTML4/5 Remote Desktop and SSH Protocol client.
- Copyright(c) 2018 bigpjo/Olive Innovations
+ Copyright(c) 2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Services.Contracts/Adapters/IEnterpriseAdapter.cs b/Myrtille.Services.Contracts/Adapters/IEnterpriseAdapter.cs
index d9bda1c..2a3c3f3 100644
--- a/Myrtille.Services.Contracts/Adapters/IEnterpriseAdapter.cs
+++ b/Myrtille.Services.Contracts/Adapters/IEnterpriseAdapter.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2018 Paul Oliver
+ Copyright(c) 2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Services.Contracts/Adapters/IMultifactorAuthenticationAdapter.cs b/Myrtille.Services.Contracts/Adapters/IMultifactorAuthenticationAdapter.cs
index cac77b6..b4f1f7f 100644
--- a/Myrtille.Services.Contracts/Adapters/IMultifactorAuthenticationAdapter.cs
+++ b/Myrtille.Services.Contracts/Adapters/IMultifactorAuthenticationAdapter.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2018 Paul Oliver
+ Copyright(c) 2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Services.Contracts/IEnterpriseService.cs b/Myrtille.Services.Contracts/IEnterpriseService.cs
index dafefc0..4a6ea4b 100644
--- a/Myrtille.Services.Contracts/IEnterpriseService.cs
+++ b/Myrtille.Services.Contracts/IEnterpriseService.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2014-2018 Paul Oliver
+ Copyright(c) 2014-2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Services.Contracts/IMFAAuthentication.cs b/Myrtille.Services.Contracts/IMFAAuthentication.cs
index fad8abb..acdfcaa 100644
--- a/Myrtille.Services.Contracts/IMFAAuthentication.cs
+++ b/Myrtille.Services.Contracts/IMFAAuthentication.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2014-2018 Paul Oliver
+ Copyright(c) 2014-2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Services.Contracts/Models/EnterpriseAuthenticationErrorHelper.cs b/Myrtille.Services.Contracts/Models/EnterpriseAuthenticationErrorHelper.cs
index ae09958..44ce1a0 100644
--- a/Myrtille.Services.Contracts/Models/EnterpriseAuthenticationErrorHelper.cs
+++ b/Myrtille.Services.Contracts/Models/EnterpriseAuthenticationErrorHelper.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2014-2018 Paul Oliver
+ Copyright(c) 2014-2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Services.Contracts/Models/EnterpriseConnectionDetails.cs b/Myrtille.Services.Contracts/Models/EnterpriseConnectionDetails.cs
index 7a89a88..3a0eea9 100644
--- a/Myrtille.Services.Contracts/Models/EnterpriseConnectionDetails.cs
+++ b/Myrtille.Services.Contracts/Models/EnterpriseConnectionDetails.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2014-2018 Paul Oliver
+ Copyright(c) 2014-2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Services.Contracts/Models/EnterpriseHost.cs b/Myrtille.Services.Contracts/Models/EnterpriseHost.cs
index 8ca5dd4..0786989 100644
--- a/Myrtille.Services.Contracts/Models/EnterpriseHost.cs
+++ b/Myrtille.Services.Contracts/Models/EnterpriseHost.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2014-2018 Paul Oliver
+ Copyright(c) 2014-2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Services.Contracts/Models/EnterpriseHostEdit.cs b/Myrtille.Services.Contracts/Models/EnterpriseHostEdit.cs
index 6817f75..f68356c 100644
--- a/Myrtille.Services.Contracts/Models/EnterpriseHostEdit.cs
+++ b/Myrtille.Services.Contracts/Models/EnterpriseHostEdit.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2014-2018 Paul Oliver
+ Copyright(c) 2014-2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Services.Contracts/Models/EnterpriseHostSessionCredentials.cs b/Myrtille.Services.Contracts/Models/EnterpriseHostSessionCredentials.cs
index 0092a7d..887e6e7 100644
--- a/Myrtille.Services.Contracts/Models/EnterpriseHostSessionCredentials.cs
+++ b/Myrtille.Services.Contracts/Models/EnterpriseHostSessionCredentials.cs
@@ -1,7 +1,7 @@
/*
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
- Copyright(c) 2014-2018 Paul Oliver
+ Copyright(c) 2014-2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Services.Contracts/Models/EnterpriseSession.cs b/Myrtille.Services.Contracts/Models/EnterpriseSession.cs
index 2b9888b..ed1d24f 100644
--- a/Myrtille.Services.Contracts/Models/EnterpriseSession.cs
+++ b/Myrtille.Services.Contracts/Models/EnterpriseSession.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2014-2018 Paul Oliver
+ Copyright(c) 2014-2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Services.Contracts/Models/SecurityProtocolEnum.cs b/Myrtille.Services.Contracts/Models/SecurityProtocolEnum.cs
index d1c704b..d824dbb 100644
--- a/Myrtille.Services.Contracts/Models/SecurityProtocolEnum.cs
+++ b/Myrtille.Services.Contracts/Models/SecurityProtocolEnum.cs
@@ -2,7 +2,7 @@
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
Copyright(c) 2014-2018 Cedric Coste
- Copyright(c) 2014-2018 Paul Oliver
+ Copyright(c) 2014-2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Myrtille.Setup/Myrtille.Setup.vdproj b/Myrtille.Setup/Myrtille.Setup.vdproj
index 1f966d0..e21464a 100644
--- a/Myrtille.Setup/Myrtille.Setup.vdproj
+++ b/Myrtille.Setup/Myrtille.Setup.vdproj
@@ -1929,24 +1929,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Myrtille"
-<<<<<<< HEAD
"ProductCode" = "8:{BD1F5393-5FC8-44AF-B727-66A6F3F4AAF3}"
"PackageCode" = "8:{A627694D-412A-4C48-AA5B-D3381E465E22}"
-=======
- "ProductCode" = "8:{B00BCC6F-3958-4726-9D99-DBAC78513C26}"
- "PackageCode" = "8:{E6FD7D5C-27F8-486C-8166-3E434880C4AF}"
->>>>>>> refs/remotes/cedrozor/master
"UpgradeCode" = "8:{86A6145E-11DB-4EE7-9CE0-53F997050716}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
-<<<<<<< HEAD
"ProductVersion" = "8:2.0.0"
-=======
- "ProductVersion" = "8:1.9.1"
->>>>>>> refs/remotes/cedrozor/master
"Manufacturer" = "8:Cedric Coste"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://cedrozor.github.io/myrtille"
diff --git a/Myrtille.Web/Web.config b/Myrtille.Web/Web.config
index 5ab7b29..e4a1517 100644
--- a/Myrtille.Web/Web.config
+++ b/Myrtille.Web/Web.config
@@ -42,7 +42,7 @@
-
+
@@ -57,6 +57,7 @@
+
@@ -79,6 +80,7 @@
+
diff --git a/Myrtille.Web/js/display.js b/Myrtille.Web/js/display.js
index af32ea7..4d46aba 100644
--- a/Myrtille.Web/js/display.js
+++ b/Myrtille.Web/js/display.js
@@ -120,26 +120,16 @@ function Display(config, dialog)
checkWebpSupport();
}
-<<<<<<< HEAD
// image count per second; currently just an information but could be used for throttling display, if needed
window.setInterval(function()
{
//dialog.showDebug('checking image count per second');
dialog.showStat(dialog.getShowStatEnum().IMAGE_COUNT_PER_SEC, imgCountPerSec);
+ lastImgCountPerSec = imgCountPerSec;
imgCountPerSec = 0;
},
1000);
-=======
- // image count per second; currently just an information but could be used for throttling display, if needed
- window.setInterval(function()
- {
- //dialog.showDebug('checking image count per second');
- dialog.showStat(dialog.getShowStatEnum().IMAGE_COUNT_PER_SEC, imgCountPerSec);
- lastImgCountPerSec = imgCountPerSec;
- imgCountPerSec = 0;
- },
- 1000);
->>>>>>> refs/remotes/cedrozor/master
+
// reasonable number of images to display when using divs
dialog.showStat(dialog.getShowStatEnum().IMAGE_COUNT_OK, (config.getDisplayMode() == config.getDisplayModeEnum().CANVAS ? 'N/A' : config.getImageCountOk()));
diff --git a/Myrtille.Web/popups/CredentialsPrompt.aspx b/Myrtille.Web/popups/CredentialsPrompt.aspx
index 7126854..dbb8508 100644
--- a/Myrtille.Web/popups/CredentialsPrompt.aspx
+++ b/Myrtille.Web/popups/CredentialsPrompt.aspx
@@ -1,7 +1,7 @@
<%--
Myrtille: A native HTML4/5 Remote Desktop Protocol client.
- Copyright(c) 2018 Paul Oliver
+ Copyright(c) 2018 Paul Oliver (Olive Innovations)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.