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
..
ActionBaseExtensions.cs	CP-36392 pt.1: Removed unused using directives.	2021-04-07 10:04:47 +01:00
Clip.cs	Avoid duplicate logging; compact multiple logging calls.	2019-11-13 12:31:44 +00:00
CueBannersManager.cs	CP-36392 pt.1: Removed unused using directives.	2021-04-07 10:04:47 +01:00
Drawing.cs	Merge remote-tracking branch 'upstream/master' into feature/hyperman	2021-05-25 15:51:42 +01:00
ExtensionMethods.cs	CA-293813: Patch pools in parallel when installing a single update/patch or supplemental package. (#2183)	2018-08-17 12:05:16 +01:00
FormFontFixer.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
HealthCheck.cs	CP-36392 pt.1: Removed unused using directives.	2021-04-07 10:04:47 +01:00
HelpersGUI.cs	Ensure there are servers whose CPU will be downlevelled before showing the warning.	2021-05-17 14:52:57 +01:00
HiddenFeatures.cs	CP-36392 pt.1: Removed unused using directives.	2021-04-07 10:04:47 +01:00
History.cs	Merge remote-tracking branch 'upstream/master' into feature/hyperman	2021-05-25 15:51:42 +01:00
Metadata.cs	CP-35687: Detach update mechanism from update wizard (#2812)	2021-05-21 15:13:45 +01:00
Registry.cs	Rebrand Branding.resx instead of the BrandManager.cs. Sorted variables alphabetically and removed unused variable.	2021-03-03 13:50:29 +00:00
Updates.cs	CP-35687: Detach update mechanism from update wizard (#2812)	2021-05-21 15:13:45 +01:00
VMGroup.cs	Normalised usage of the UpsellDialog.	2021-03-03 13:50:29 +00:00
WebBrowser2.cs	CP-36392 pt.1: Removed unused using directives.	2021-04-07 10:04:47 +01:00
Win32Window.cs	Enforce failure if MWWaitFor times out without a message, ortherwise failures	2019-01-14 09:45:13 +00:00