merge develop into removecitrix

This commit is contained in:
Faryan Rezagholi
2020-07-25 19:25:40 +02:00
9 changed files with 105 additions and 122 deletions

View File

@@ -1,38 +1,39 @@
# Contributors
## Current mRemoteNG dev team
David Sparer (http://github.com/sparerd)
Sean Kaim (http://github.com/kmscode)
Faryan Rezagholi (http://github.com/farosch)
Thanks for the awesome new website!
Bennett Blodinger (http://github.com/benwa)
[David Sparer](http://github.com/sparerd)
[Sean Kaim](http://github.com/kmscode)
[Faryan Rezagholi](http://github.com/farosch)
[Bennett Blodinger](http://github.com/benwa)
Joe Cefoli (http://github.com/jcefoli)
countchappy (http://github.com/countchappy)
[Joe Cefoli](http://github.com/jcefoli)
[countchappy](http://github.com/countchappy)
Tony Lambert
Julien Roncaglia (http://github.com/vbfox)
http://github.com/peterchenadded
Brandon Wulf (http://github.com/mrwulf)
Pedro Rodrigues (http://github.com/pedro2555)
http://github.com/dekelMP
Bruce (http://github.com/brucetp)
Camilo Alvarez (http://github.com/jotatsu)
http://github.com/DamianBis
http://github.com/pfjason
http://github.com/sirLoaf
http://github.com/Fyers
Vladimir Semenov (http://github.com/sli-pro)
Stephan (http://github.com/st-schuler)
Aleksey Reytsman (http://github.com/areytsman)
Cristian Abelleira (http://github.com/CrAbelleira)
http://github.com/MitchellBot
Filippo Ferrazini (http://github.com/Filippo125)
[Julien Roncaglia](http://github.com/vbfox)
[peterchenadded](http://github.com/peterchenadded)
[Brandon Wulf](http://github.com/mrwulf)
[Pedro Rodrigues](http://github.com/pedro2555)
[dekelMP](http://github.com/dekelMP)
[Bruce](http://github.com/brucetp)
[Camilo Alvarez](http://github.com/jotatsu)
[DamianBis](http://github.com/DamianBis)
[pfjason](http://github.com/pfjason)
[sirLoaf](http://github.com/sirLoaf)
[Fyers](http://github.com/Fyers)
[Vladimir Semenov](http://github.com/sli-pro)
[Stephan](http://github.com/st-schuler)
[Aleksey Reytsman](http://github.com/areytsman)
[Cristian Abelleira](http://github.com/CrAbelleira)
[MitchellBot](http://github.com/MitchellBot)
[Filippo Ferrazini](http://github.com/Filippo125)
## Past Contributors
Felix Deimel - mRemote original developer
Riley McArdle - mRemoteNG original developer
Hayato Iriumi (http://github.com/hiriumi)
[Hayato Iriumi](http://github.com/hiriumi)
Jason Barbier
Wiktor Beryt
Lionel Caignec
@@ -42,105 +43,85 @@ Tom Hiller
Apisitt Rattana
Andreas Rehm
David Vidmar
http://github.com/Brandhor
Dimitrij (http://github.com/Kvarkas)
[Brandhor](http://github.com/Brandhor)
[Dimitrij](http://github.com/Kvarkas)
## Translators
Eugenio "Ryo567" Martínez
Mathieu Pape
Emanuel Silva
Robert Siwiec
Hayato Iriumi
Sebastien Thieury (http://github.com/SebThieu)
[Sebastien Thieury](http://github.com/SebThieu)
Riza Emet
Lukas Plachy (http://github.com/rheingold)
[Lukas Plachy](http://github.com/rheingold)
Gyuha Shin
Stefan (http://github.com/polluks)
http://github.com/emazv72
Vladimir Semenov (http://github.com/sli-pro)
Marco Sousa (http://github.com/marcomsousa)
http://github.com/wwj402
http://github.com/Fyers
http://github.com/pablomh
Damian Szczepanik (http://github.com/damianszczepanik)
Mant1kor (http://github.com/Mant1kor)
[Stefan](http://github.com/polluks)
[emazv72](http://github.com/emazv72)
[Vladimir Semenov](http://github.com/sli-pro)
[Marco Sousa](http://github.com/marcomsousa)
[wwj402](http://github.com/wwj402)
[Fyers](http://github.com/Fyers)
[pablomh](http://github.com/pablomh)
[Damian Szczepanik](http://github.com/damianszczepanik)
[Mant1kor](http://github.com/Mant1kor)
## Included Source Code
Command Line Arguments Parser
# Included Source Code
**[Command Line Arguments Parser](http://www.codeproject.com/KB/recipes/command_line.aspx)**
Copyright © 2002 Richard Lopes
MIT License
http://www.codeproject.com/KB/recipes/command_line.aspx
FilteredPropertyGrid
Copyright © 2006 Azuria
http://www.codeproject.com/KB/cs/FilteredPropertyGrid.aspx
InputBox
Copyright © 2016 Jan Slama
http://www.csharp-examples.net/inputbox/
IP TextBox
Copyright © 2005 mawnkay
http://www.codeproject.com/Articles/11576/IP-TextBox
PortableSettingsProvider
Copyright © 2014 crdx
https://github.com/crdx/PortableSettingsProvider
## Included Components
ADTree
Copyright © 2004 Marc Merritt
Copyright © 2008 Felix Deimel
http://www.codeproject.com/KB/selection/ADPickerCtrl.aspx
CefSharp
Copyright © The CefSharp Authors
MIT License
https://github.com/cefsharp/CefSharp
**[FilteredPropertyGrid](http://www.codeproject.com/KB/cs/FilteredPropertyGrid.aspx)**
Copyright © 2006 Azuria
DockPanel Suite
**[InputBox](http://www.csharp-examples.net/inputbox/)**
Copyright © 2016 Jan Slama
**[IP TextBox](http://www.codeproject.com/Articles/11576/IP-TextBox)**
Copyright © 2005 mawnkay
**[PortableSettingsProvider](https://github.com/crdx/PortableSettingsProvider)**
Copyright © 2014 crdx
**[ADTree](http://www.codeproject.com/KB/selection/ADPickerCtrl.aspx)**
Copyright © 2004 Marc Merritt © 2008 Felix Deimel
# Included Components
**[CefSharp](https://github.com/cefsharp/CefSharp)**
Copyright © The CefSharp Authors
MIT License
**[DockPanel Suite](https://github.com/dockpanelsuite/dockpanelsuite)**
Copyright © 2018 @roken and @lextm (formerly Weifen Luo)
MIT License
https://github.com/dockpanelsuite/dockpanelsuite
log4net
Copyright © 2001-2015 The Apache Software Foundation
Apache License Version 2.0
http://logging.apache.org/log4net/
Magic Library
Copyright © 2002-2003 Crownwood Consulting, Ltd.
Freely redistributable with attribution
http://www.dotnetmagic.com/magic_download.html
PuTTY
Copyright © 1997-2017 Simon Tatham
MIT License
http://www.chiark.greenend.org.uk/~sgtatham/putty/
Silk Icon Set
Copyright © 2005-2008 FAMFAMFAM
Creative Commons Attribution 2.5 License
http://www.famfamfam.com/
SSH.NET
Copyright © 2016
MIT License
https://github.com/sshnet/SSH.NET
VncSharp
Copyright © 2004-2009 David Humphrey
GNU General Public License (GPL) Version 2
https://github.com/humphd/VncSharp [Archived]
ObjectListView
Copyright © 2006-2016 Phillip Piper
GNU General Public License (GPL) Version 3
https://sourceforge.net/projects/objectlistview/
ConsoleControl
Copyright © 2015 Dave Kerr
MIT License
https://github.com/dwmkerr/consolecontrol
**[log4net](http://logging.apache.org/log4net/)**
Copyright © 2001-2015 The Apache Software Foundation
Apache License Version 2.0
**[PuTTY](http://www.chiark.greenend.org.uk/~sgtatham/putty/)**
Copyright © 1997-2017 Simon Tatham
MIT License
**[Silk Icon Set](http://www.famfamfam.com/)**
Copyright © 2005-2008 FAMFAMFAM
Creative Commons Attribution 2.5 License
**[SSH.NET](https://github.com/sshnet/SSH.NET)**
Copyright © 2016
MIT License
**[VncSharp](https://github.com/humphd/VncSharp) (Archived)**
Copyright © 2004-2009 David Humphrey
GNU General Public License (GPL) Version 2
**[ObjectListView](https://sourceforge.net/projects/objectlistview/)**
Copyright © 2006-2016 Phillip Piper
GNU General Public License (GPL) Version 3
**[ConsoleControl](https://github.com/dwmkerr/consolecontrol)**
Copyright © 2015 Dave Kerr
MIT License

View File

@@ -44,20 +44,21 @@
| Update Channel | Build Status | Downloads |
| ---------------|--------------|-----------|
| Stable | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/master?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/master) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.15/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.15) |
| Stable | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/master?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/master) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.20/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.20) |
| Prerelease | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/develop?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.77.1/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.1) |
## Features
The following protocols are supported:
* RDP (Remote Desktop/Terminal Server)
* RDP (Remote Desktop Protocol)
* VNC (Virtual Network Computing)
* SSH (Secure Shell)
* Telnet (TELecommunication NETwork)
* HTTP/HTTPS (Hypertext Transfer Protocol)
* rlogin (Remote Login)
* Raw Socket Connections
* Powershell remoting
For a detailed feature list and general usage support, refer to the [Documentation](https://mremoteng.readthedocs.io/en/latest/).
@@ -107,14 +108,14 @@ mRemoteNG is available as a redistributable MSI package or as a portable ZIP pac
### Command line install
The MSI package og mRemoteNG can be installed using the command line:
The MSI package of mRemoteNG can be installed using the command line:
`msiexec /i C:\Path\To\mRemoteNG-Installer.exe [INSTALLDIR=value] [IGNOREPREREQUISITES=value]`
| Property | Value | Description |
|-|-|-|
| INSTALLDIR | `folder path` | This allows you to set the installation directory from the command line. For paths that contain spaces, enclose the path in double quotes (""). This overrides any value found in the registry. Introduced in v1.75 beta 2. |
| IGNOREPREREQUISITES | `0` or `1` | When the ``IGNOREPREREQUISITES`` property is set to ``1``, the installer will not be halted if any prerequisite check is not met. You must still run the installer as Admin - this flag will not remove that requirement. Introduced in v1.74. |
| INSTALLDIR | `folder path` | This allows you to set the installation directory from the command line. For paths that contain spaces, enclose the path in double quotes (""). This overrides any value found in the registry. |
| IGNOREPREREQUISITES | `0` or `1` | When set to `1`, the installer will not be halted if any prerequisite check is not met. You must still run the installer as administrator. |
#### Examples

View File

@@ -38,7 +38,7 @@ CREATE TABLE [dbo].[tblCons] (
[EnableDesktopComposition] bit NOT NULL,
[EnableFontSmoothing] bit NOT NULL,
[ExtApp] varchar(256),
[Favorite] tinyint(1) NOT NULL,
[Favorite] tinyint NOT NULL,
[Hostname] varchar(512),
[ICAEncryptionStrength] varchar(32) NOT NULL,
[Icon] varchar(128) NOT NULL,

View File

@@ -160,7 +160,7 @@ CREATE TABLE `tblCons` (
`InheritVNCProxyUsername` tinyint(1) NOT NULL,
`InheritVNCSmartSizeMode` tinyint(1) NOT NULL,
`InheritVNCViewOnly` tinyint(1) NOT NULL,
`InheritVmId` tinyint(1) DEFAULT NULL
`InheritVmId` tinyint(1) DEFAULT NULL,
PRIMARY KEY (`ConstantID`),
UNIQUE (`ID`)
) ENGINE=InnoDB AUTO_INCREMENT=3324 DEFAULT CHARSET=latin1;

View File

@@ -62,7 +62,7 @@ Files and Locations
Your backup files are located in the same place as your normal connections file.
This could be one of three places:
- Normal version: `%AppData%\mRemoteNG`
- Normal version: `%AppData%\\mRemoteNG`
- Portable version: In the same location as mRemoteNG.exe
- If you have saved your confCons.xml to a custom location, go there.

View File

@@ -799,7 +799,7 @@ Załadowano nowy plik połączeń.</value>
<value>&amp;Pokaż tekst pomocy</value>
</data>
<data name="ShowText" xml:space="preserve">
<value>Pokarz tekst</value>
<value>Pokaż tekst</value>
</data>
<data name="SmartSize" xml:space="preserve">
<value>Dopasuj (RDP/VNC)</value>

View File

@@ -29,7 +29,7 @@
private void InitializeComponent()
{
components = new System.ComponentModel.Container();
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
}
#endregion

View File

@@ -798,7 +798,7 @@ namespace mRemoteNG.UI.Window
{
var protocolBase = sender as ProtocolBase;
if (!(protocolBase?.InterfaceControl.Parent is ConnectionTab tabPage)) return;
if (tabPage.Disposing) return;
if (tabPage.Disposing || tabPage.IsDisposed) return;
tabPage.protocolClose = true;
Invoke(new Action(() => tabPage.Close()));
}

View File

@@ -1711,6 +1711,7 @@ powershell.exe -ExecutionPolicy Bypass -File "$(SolutionDir)Tools\postbuild_mrem
<UseVSHostingProcess>false</UseVSHostingProcess>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
</PropertyGroup>
<PropertyGroup>
<TargetZone>LocalIntranet</TargetZone>