xenadmin/XenAdmin/Wizards/ConversionWizard
Konstantina Chremmou 67d1ddd1d1 Merge remote-tracking branch 'upstream/master' into feature/hyperman
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>

# Conflicts:
#	Branding/Branding.resx
#	Jenkinsfile
#	XenAdmin/Alerts/Types/GuiOldAlert.cs
#	XenAdmin/Alerts/Types/LicenseAlert.cs
#	XenAdmin/Commands/RestartToolstackCommand.cs
#	XenAdmin/Diagnostics/Problems/HostProblem/HostNotSafeToUpgradeWarning.cs
#	XenAdmin/Dialogs/AllowUpdatesDialog.cs
#	XenAdmin/Dialogs/OptionsPages/ConfirmationOptionsPage.cs
#	XenAdmin/Dialogs/RepairSRDialog.cs
#	XenAdmin/Dialogs/UpsellDialog.cs
#	XenAdmin/Plugins/UI/TabPageCredentialsDialog.cs
#	XenAdmin/Program.cs
#	XenAdmin/Wizards/ConversionWizard/ConversionNetworkPage.cs
#	XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateDestinationPage.cs
#	XenAdmin/Wizards/NewSRWizard_Pages/SrWizardType.cs
#	XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.cs
#	XenCenterLib/XSVersionAttribute.cs
#	XenModel/BrandManager.cs
#	XenModel/Messages.Designer.cs
#	XenModel/Messages.resx
2021-05-25 15:51:42 +01:00
..
ConversionNetworkPage.cs CP-36392 pt.1: Removed unused using directives. 2021-04-07 10:04:47 +01:00
ConversionWizard.cs CP-36392 pt.1: Removed unused using directives. 2021-04-07 10:04:47 +01:00
CredentialsPage.cs CP-31105: Replaced the hardcoded name patterns in the resource files with format placeholders. 2021-03-31 11:50:32 +01:00
CredentialsPage.Designer.cs CP-30958: Initial implementation of the Conversion Manager in XenCenter. (#2481) 2019-08-22 10:47:43 +01:00
CredentialsPage.ja.resx CA-350227: L10N- Translation Updates 2021-01-15 11:54:48 +00:00
CredentialsPage.resx CP-31105: Replaced the hardcoded name patterns in the resource files with format placeholders. 2021-03-31 11:50:32 +01:00
CredentialsPage.zh-CN.resx CA-350227: L10N- Translation Updates 2021-01-15 11:54:48 +00:00
SrSelectionPage.cs CA-330890: update storage select wazard in XCM 2019-12-09 11:06:25 +00:00
SrSelectionPage.Designer.cs Missing comma. Wrong AutoScaleMode. 2019-08-22 11:48:14 +01:00
SrSelectionPage.ja.resx CA-350227: L10N- Translation Updates 2021-01-15 11:54:48 +00:00
SrSelectionPage.resx Missing comma. Wrong AutoScaleMode. 2019-08-22 11:48:14 +01:00
SrSelectionPage.zh-CN.resx CA-350227: L10N- Translation Updates 2021-01-15 11:54:48 +00:00
SummaryPage.cs CP-30958: Initial implementation of the Conversion Manager in XenCenter. (#2481) 2019-08-22 10:47:43 +01:00
SummaryPage.Designer.cs CP-30958: Initial implementation of the Conversion Manager in XenCenter. (#2481) 2019-08-22 10:47:43 +01:00
SummaryPage.ja.resx CA-350227: L10N- Translation Updates 2021-01-15 11:54:48 +00:00
SummaryPage.resx CP-30958: Initial implementation of the Conversion Manager in XenCenter. (#2481) 2019-08-22 10:47:43 +01:00
SummaryPage.zh-CN.resx CA-350227: L10N- Translation Updates 2021-01-15 11:54:48 +00:00
VmSelectionPage.cs CP-30958: Initial implementation of the Conversion Manager in XenCenter. (#2481) 2019-08-22 10:47:43 +01:00
VmSelectionPage.Designer.cs Missing comma. Wrong AutoScaleMode. 2019-08-22 11:48:14 +01:00
VmSelectionPage.ja.resx CA-350227: L10N- Translation Updates 2021-01-15 11:54:48 +00:00
VmSelectionPage.resx Missing comma. Wrong AutoScaleMode. 2019-08-22 11:48:14 +01:00
VmSelectionPage.zh-CN.resx CA-350227: L10N- Translation Updates 2021-01-15 11:54:48 +00:00