Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 15:29:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
67d1ddd1d1
xenadmin/WixInstaller
History
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
..
Bitmaps CA-334125: Restructured the feature selection tree. Localised some strings. UI tweaks. 2020-02-07 11:04:30 +00:00
branding.wxi Minor corrections to enable local build without applying external branding. 2021-02-17 02:54:04 +00:00
branding.wxs Minor corrections to enable local build without applying external branding. 2021-02-17 02:54:04 +00:00
candleList.txt CP-31105: Refactored installer branding. Sign only the combined msi file. 2020-01-10 12:00:50 +00:00
codepagechange.vbs CP-4816: Initial commit to git repo 2013-06-24 12:41:48 +01:00
en-us.wxl CP-32921: Target .NET Framework 4.8 and build using VS2019 tools. 2020-05-19 23:10:41 +01:00
ja-jp.wxl CP-32921: Target .NET Framework 4.8 and build using VS2019 tools. 2020-05-19 23:10:41 +01:00
License.rtf CP-4816: Initial commit to git repo 2013-06-24 12:41:48 +01:00
litList.txt CP-31105: Refactored installer branding. Sign only the combined msi file. 2020-01-10 12:00:50 +00:00
msidiff.js CP-4816: Initial commit to git repo 2013-06-24 12:41:48 +01:00
WiSubStg.vbs CP-4816: Initial commit to git repo 2013-06-24 12:41:48 +01:00
wix_src.patch CA-334125: Restructured the feature selection tree. Localised some strings. UI tweaks. 2020-02-07 11:04:30 +00:00
XenCenter.wxs Merge remote-tracking branch 'upstream/master' into feature/hyperman 2021-05-25 15:51:42 +01:00
zh-cn.wxl CP-32921: Target .NET Framework 4.8 and build using VS2019 tools. 2020-05-19 23:10:41 +01:00