Commit Graph

16 Commits

Author SHA1 Message Date
Konstantina Chremmou
f5075e8eac Sorted string prior to merging from master (where there are sorted).
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2022-03-30 15:00:27 +01:00
Danilo Del Busso
ccf7fbe01a CP-39128: Make UPDATES_URL a branded string
- Add VS Enterprise as option for building project
 Also add to `re-branding.sh` replacement list
- Bump branding version to v4.3
- Add default `UPDATES_URL` to `branding.sh`

Signed-off-by: Danilo Del Busso <Danilo.Del.Busso@citrix.com>
2022-03-30 13:59:17 +01:00
Konstantina Chremmou
5078c4db0d CP-38086: Block upgrade for PV guests.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>

# Conflicts:
#	Branding/Branding.resx
#	XenAdmin/Diagnostics/Checks/PVGuestsCheck.cs
#	XenAdmin/Wizards/PatchingWizard/PatchingWizard_PrecheckPage.cs
#	XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardPrecheckPage.cs
#	XenModel/BrandManager.cs
#	XenModel/Utils/Helpers.cs
2021-11-15 15:49:39 +00:00
Konstantina Chremmou
e0bedb88a9 Tests fixes and minor refactoring:
- Fixed broken test due to missing static images.
- Fixed NUnitEngineExeption thrown due to StackOverflowException when searching
  for non-existing assembly (due to wrong branding).
- Commented out ignored tests causing the overall NUnit result to be reported as
  Warning instead of Passed.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2021-07-30 17:17:54 +01:00
Konstantina Chremmou
36beaa5180 CA-355166: Updated help links.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2021-06-08 15:56:29 +01:00
Konstantina Chremmou
33295bfc1b CA-354879, CA-354877: Branding and version corrections.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2021-05-26 00:37:25 +01:00
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
5676334c8d CP-36917: Updated server version.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2021-05-24 09:56:20 +01:00
Konstantina Chremmou
a0e2967792 CP-31105: Replaced the hardcoded name patterns in the resource files with format placeholders.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2021-03-31 11:50:32 +01:00
Ji Jiang
96c3d5e1c0 CP-35345: Add pre-cloud connection warning
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2021-03-17 10:32:17 +00:00
Mihaela Stoica
b0dd36d1b3 Add branding and helper function for the next version
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2021-03-11 09:30:52 +00:00
Konstantina Chremmou
40440f5f98 Moved several more brand related and untranslatable strings to Branding.resx.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2021-03-03 13:50:29 +00:00
Konstantina Chremmou
51dedff3c4 Rebrand Branding.resx instead of the BrandManager.cs. Sorted variables alphabetically and removed unused variable.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2021-03-03 13:50:29 +00:00
Joey
5a29a8fd9b
CP-35838: Add health check precheck into RPU wizard (#2778)
* CP-35838: Add health check precheck into RPU wizard
* CP-35838: Add disable Health Check in RPU precheck warning

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2021-03-02 09:53:21 +00:00
Konstantina Chremmou
d3c5769a70 CP-32844: Check and warn if DVSC is configured when updating or upgrading a pool.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2020-03-02 17:46:29 +00:00
Konstantina Chremmou
f7391e991b
CA-156873, CP-31105 (partial): Apply common branding and versioning to assemblies; branding refactoring
Added brand management files and refactored the following brand variables:
* BRANDING_XENSERVER_UPDATE_URL
* BRANDING_PERF_ALERT_MAIL_LANGUAGE_DEFAULT
* BRANDING_SEARCH
* BRANDING_UPDATE
* BRANDING_BACKUP
* BRANDING_LEGACY_PRODUCT_BRAND
* ISO
* BRANDING_VERSION_5_6
* BRANDING_VERSION_6_2
* BRANDING_VERSION_6_0
* BRANDING_VERSION_6_5
* BRANDING_VERSION_7_0
* BRANDING_VERSION_7_1_2
* BRANDING_VERSION_8_0
* BRANDING_VERSION_8_1
* BRANDIND_COPYRIGHT
* BRANDING_COPYRIGHT_2

Also: Try passing the timestamp server as parameter
2020-01-22 14:47:39 +00:00