xenadmin/XenModel/XenSearch
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
..
Common.cs Merge remote-tracking branch 'upstream/master' into feature/hyperman 2021-05-25 15:51:42 +01:00
GroupAlg.cs CA-289182: Corrections to sorting (clearer handling of null cases, non-XenObjects, logic path inconsistencies). 2018-05-14 14:56:42 +01:00
GroupingTypes.cs Refactoring to simplify the code and make calculations more efficient: 2020-07-30 10:42:20 +01:00
MetricUpdater.cs CP-36392 pt.1: Removed unused using directives. 2021-04-07 10:04:47 +01:00
PropertyAccessorHelper.cs Converted remaining extension get and set properties of the API classes to methods 2017-09-05 02:15:38 +01:00
Query.cs CA-176169: Changed copyright statements to include the comma in Citrix Systems, 2017-01-16 19:59:50 +00:00
QueryScope.cs CP-36392 pt.1: Removed unused using directives. 2021-04-07 10:04:47 +01:00
QueryTypes.cs CP-36392 pt.1: Removed unused using directives. 2021-04-07 10:04:47 +01:00
Search.cs CP-31105: Replaced the hardcoded name patterns in the resource files with format placeholders. 2021-03-31 11:50:32 +01:00
SearchMarshalling.cs CA-116060: Stop saving the expanded state of the New Search panel with the other Search metadata. 2019-07-23 14:00:38 +01:00
Sort.cs CP-36392 pt.1: Removed unused using directives. 2021-04-07 10:04:47 +01:00