Commit Graph

14 Commits

Author SHA1 Message Date
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
Konstantina Chremmou
abf4ae3f35 CP-36392 pt.1: Removed unused using directives.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2021-04-07 10:04:47 +01:00
Konstantina Chremmou
0c572a1d6d Normalised usage of the UpsellDialog.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2021-03-03 13:50:29 +00:00
Konstantina Chremmou
eef3320eca Removed code applicable to servers earlier than dundee since connection to them is now blocked.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2019-02-06 09:25:38 +00:00
Mihaela Stoica
681f77bfd9 CA-273307: Replaced the links in the Upsell dialogs
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2017-11-17 12:24:43 +00:00
Gabor Apati-Nagy
7c0bc50b4a CA-176169: Changed copyright statements to include the comma in Citrix Systems,
Inc.

Signed-off-by: Gabor Apati-Nagy<gabor.apati-nagy@citrix.com>
2017-01-16 19:59:50 +00:00
Mihaela Stoica
62870544c6 CP-17161: Add 'using' statement around dialogs to ensure garbage collection
- fix UpsellDialog usages

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-06-20 13:26:52 +01:00
Mihaela Stoica
fc5ebd2d40 CP-15401: Move HiddenFeatures to a new class
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-01-28 21:43:15 +00:00
Cheng Zhang
88d881b126 CP-15401: Show/Hide rdpPolling, upsell and optimize for XenApp depending on XenCenter registry keys
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 13:31:22 +08:00
Stephen Turner
b587ab832e CP-14647: Intermediate check-in #1 2015-11-08 11:27:56 +00:00
zheng chai
5d19c679cf CP-7527: update version according to Creedence version number.
Signed-off-by: zheng chai <zheng.chai@citrix.com>
2014-04-29 11:12:53 +08:00
zheng chai
96dc014da9 CP-7527: Rework comments to handle CLearwater case specifically.
Signed-off-by: zheng chai <zheng.chai@citrix.com>
2014-04-28 15:17:21 +08:00
zheng chai
e10125fbce CP-7527: Restore WLB for Creedence XenCenter changes.
Signed-off-by: zheng chai <zheng.chai@citrix.com>
2014-04-22 19:14:53 +08:00
Mihaela Stoica
bd36a85bff CP-4816: Initial commit to git repo
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-06-24 12:41:48 +01:00