Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
67d1ddd1d1
xenadmin/XenModel
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
..
Actions Merge remote-tracking branch 'upstream/master' into feature/hyperman 2021-05-25 15:51:42 +01:00
Alerts CP-36392 pt.1: Removed unused using directives. 2021-04-07 10:04:47 +01:00
CustomFields Avoid duplicate logging; compact multiple logging calls. 2019-11-13 12:31:44 +00:00
Mappings CA-339584: Include CD VDI in the storage mapping for intra-pool migration 2020-08-11 08:46:42 +01:00
Network Merge remote-tracking branch 'upstream/master' into feature/hyperman 2021-05-25 15:51:42 +01:00
Properties Removed obsolete class XSVersionAttribute. Some refactoring of the usage of Program.Version. 2020-12-24 01:23:47 +00:00
ServerDBs CP-36392 pt.1: Removed unused using directives. 2021-04-07 10:04:47 +01:00
StorageLinkAPI CP-36392 pt.1: Removed unused using directives. 2021-04-07 10:04:47 +01:00
Utils Merge remote-tracking branch 'upstream/master' into feature/hyperman 2021-05-25 15:51:42 +01:00
WLB CP-36392 pt.1: Removed unused using directives. 2021-04-07 10:04:47 +01:00
XCM CP-36392 pt.1: Removed unused using directives. 2021-04-07 10:04:47 +01:00
XenAPI Merge remote-tracking branch 'upstream/master' into feature/REQ-797 2021-01-19 11:01:02 +00:00
XenAPI-Extensions Merge remote-tracking branch 'upstream/master' into feature/hyperman 2021-05-25 15:51:42 +01:00
XenSearch Merge remote-tracking branch 'upstream/master' into feature/hyperman 2021-05-25 15:51:42 +01:00
XenServerProxy CP-36392 pt.1: Removed unused using directives. 2021-04-07 10:04:47 +01:00
BrandManager.cs Merge remote-tracking branch 'upstream/master' into feature/hyperman 2021-05-25 15:51:42 +01:00
DockerContainer.cs New bindings (includes CP-29452, CA-75634, CA-280976). 2020-02-14 14:43:22 +00:00
DockerContainers.cs
Folder.cs CP-36392 pt.1: Removed unused using directives. 2021-04-07 10:04:47 +01:00
Folders.cs
FriendlyNameManager.cs CA-156873, CP-31105 (partial): Apply common branding and versioning to assemblies; branding refactoring 2020-01-22 14:47:39 +00:00
FriendlyNames.Designer.cs CP-31105: Replaced the hardcoded name patterns in the resource files with format placeholders. 2021-03-31 11:50:32 +01:00
FriendlyNames.ja.resx Moved several more brand related and untranslatable strings to Branding.resx. 2021-03-03 13:50:29 +00:00
FriendlyNames.resx CP-31105: Replaced the hardcoded name patterns in the resource files with format placeholders. 2021-03-31 11:50:32 +01:00
FriendlyNames.zh-CN.resx Moved several more brand related and untranslatable strings to Branding.resx. 2021-03-03 13:50:29 +00:00
HealthCheckSettings.cs Typo. 2020-06-05 11:48:54 +01:00
I18NException.cs CP-36392 pt.1: Removed unused using directives. 2021-04-07 10:04:47 +01:00
Icons.cs CP-20425: Added test to ensure all Resource images have a static counterpart. 2020-07-18 07:49:27 +01:00
InvisibleMessages.Designer.cs Removed obsolete or unused messages. 2021-03-03 13:50:29 +00:00
InvisibleMessages.ja.resx Removed obsolete or unused messages. 2021-03-03 13:50:29 +00:00
InvisibleMessages.resx Removed obsolete or unused messages. 2021-03-03 13:50:29 +00:00
InvisibleMessages.zh-CN.resx Removed obsolete or unused messages. 2021-03-03 13:50:29 +00:00
InvokeHelper.cs
Messages.Designer.cs Merge remote-tracking branch 'upstream/master' into feature/hyperman 2021-05-25 15:51:42 +01:00
Messages.ja.resx L10N : Translation Updates 2021-04-20 12:34:17 +01:00
Messages.resx Merge remote-tracking branch 'upstream/master' into feature/hyperman 2021-05-25 15:51:42 +01:00
Messages.zh-CN.resx L10N : Translation Updates 2021-04-20 12:34:17 +01:00
ObjectChange.cs CP-36392 pt.1: Removed unused using directives. 2021-04-07 10:04:47 +01:00
OtherConfigWatcher.cs Tidy up event registration and deregistration on the MainWindow. 2020-08-21 16:08:20 +01:00
PoolJoinRules.cs CA-338830: Pool join checks should not allow slave with enabled clustering to join. 2020-05-19 13:25:53 +01:00
RbacMethod.cs CP-36392 pt.1: Removed unused using directives. 2021-04-07 10:04:47 +01:00
Tags.cs Simplified signature of connection events. 2019-12-06 11:17:46 +00:00
XenAdminConfigManager.cs CP-15790: Implementation improvement aimed to make manual testing easier. 2020-11-12 11:04:33 +00:00
XenModel.csproj Merge remote-tracking branch 'upstream/master' into feature/hyperman 2021-05-25 15:51:42 +01:00
XenObjectDownloader.cs Merge branch 'master' into REQ-420 2018-01-25 13:38:58 +00:00
XenServerPlugins.cs CP-36392 pt.1: Removed unused using directives. 2021-04-07 10:04:47 +01:00