xenadmin/XenAdmin
Mihaela Stoica 30aa9affc7 CP-14817: Add a check to refuse connection to a server that have different product brand
Change PRODUCT_BRAND to BRANDING_PRODUCT_BRAND

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

Conflicts:

	XenAdmin/Branding.cs
	XenAdmin/MainWindow.cs
	mk/xenadmin-build.sh
2016-01-29 14:26:53 +08:00
..
Actions CP-15398: Rework on comments 2016-01-19 18:42:49 +08:00
Alerts CP-15401: Changed WarningWithInformationUrl and ProblemWithInformationUrl to cope with empty URL string 2016-01-25 11:15:30 +08:00
Commands Merge pull request #785 from cheng--zhang/CP-15401 2016-01-26 09:31:24 +00:00
ConsoleView CP-14780: Revert Windows Update changes (part2) 2015-11-10 13:13:23 +00:00
Controls CP-15409: Add read-only mode to License manager 2016-01-26 14:49:02 +00:00
Core Merge branch 'master' into CP-15410 2016-01-27 14:06:13 +00:00
Diagnostics CP-15401: Avoid have null in URL constructor 2016-01-26 11:16:39 +08:00
Dialogs CP-15409: Add read-only mode to License manager 2016-01-26 14:49:02 +00:00
Help CP-15267: Remove some help ID in helpmanager 2016-01-28 18:13:39 +08:00
Images CP-15396: Use xenadmin-branding and change the location of icons 2016-01-08 16:29:59 +08:00
Network CP-14647: Intermediate check-in #5 2015-11-08 11:28:02 +00:00
Plugins CP-15398: Make file name and dir rebrandablei 2016-01-19 18:40:55 +08:00
Properties CP-15398: Make texture XenCenter rebrandable 2016-01-14 18:52:53 +08:00
RDP
ReportViewer
ServerDBs
SettingsPanels CP-15401: Move hidden check out of designer 2016-01-22 17:02:59 +08:00
TabPages Merge pull request #786 from MihaelaStoica/CP-15407 2016-01-26 11:32:54 +00:00
TestResources CP-14647: Intermediate check-in #6 2015-11-08 11:28:03 +00:00
Utils
Wizards Merge pull request #788 from cheng--zhang/CP-15623 2016-01-26 09:32:25 +00:00
Wlb CP-14647: Intermediate check-in #1 2015-11-08 11:27:56 +00:00
XenSearch CA-190904: Remove obsolete SR.upgrade and SR.share menu items 2015-11-30 11:53:54 +00:00
app.config CP-15398: Make file name and dir rebrandablei 2016-01-19 18:40:55 +08:00
Branding.cs CP-15399: Make xsupdate rebrandable 2016-01-22 13:50:12 +08:00
Content.ja.resx CP-15398: Make texture XenServer Host rebrandable 2016-01-19 18:40:52 +08:00
Content.zh-CN.resx CP-15398: Make texture XenServer Host rebrandable 2016-01-19 18:40:52 +08:00
FriendlyNames.ja.resx CP-15398: Make texture XenServer Host rebrandable 2016-01-19 18:40:52 +08:00
FriendlyNames.zh-CN.resx CP-15398: Make texture XenServer Host rebrandable 2016-01-19 18:40:52 +08:00
GroupingTag.cs
Images.cs CA-190904: Remove obsolete SR.upgrade and SR.share menu items 2015-11-30 11:53:54 +00:00
IMainWindow.cs
InvisibleMessages.ja.resx CP-15398: Make texture XenServer Host rebrandable 2016-01-19 18:40:52 +08:00
InvisibleMessages.zh-CN.resx CP-15398: Make texture XenServer Host rebrandable 2016-01-19 18:40:52 +08:00
LicenseTimer.cs CP-15410: Show license expiry alerts 2016-01-26 16:30:24 +00:00
MainWindow.cs CP-14817: Add a check to refuse connection to a server that have different product brand 2016-01-29 14:26:53 +08:00
MainWindow.Designer.cs CP-15401: Move hidden check out of designer 2016-01-22 17:02:59 +08:00
MainWindow.ja.resx CP-15398: Make texture XenServer Host rebrandable 2016-01-19 18:40:52 +08:00
MainWindow.resx CP-15398: Make file name and dir rebrandablei 2016-01-19 18:40:55 +08:00
MainWindow.zh-CN.resx CP-15398: Make texture XenServer Host rebrandable 2016-01-19 18:40:52 +08:00
MainWindowTreeBuilder.cs CP-15398: Make texture XenCenter rebrandable 2016-01-14 18:52:53 +08:00
Messages.ja.resx CP-15398: Make texture XenServer Host rebrandable 2016-01-19 18:40:52 +08:00
Messages.zh-CN.resx CP-15398: Make texture XenServer Host rebrandable 2016-01-19 18:40:52 +08:00
OrganizationalView.cs
PasswordsRequest.cs
PowerManagment.cs
Program.cs Merge pull request #787 from koushikcgit/master 2016-01-26 11:32:27 +00:00
Settings.cs CP-14647: Intermediate check-in #5 2015-11-08 11:28:02 +00:00
SettingsUpdate.cs
UpdateManager.cs
UpdateManager.DelayCalculator.cs
WinformsXenAdminConfigProvider.cs
XCPluginSchema.xsd
XenAdmin.csproj Revert "CA-179515: Move to online help: remove .chm files" 2016-01-28 17:09:18 +08:00
XenAdmin.manifest
XenAdmin.rc
XS56E008.xsupdate CA-158591: Get new RPU hotfixes in XenCenter 2015-01-21 14:52:57 +00:00
XS56EFP1002.xsupdate CA-158591: Get new RPU hotfixes in XenCenter 2015-01-21 14:52:57 +00:00
XS60E001-src-pkgs.tar.gz
XS60E001.xsupdate
XS62E006-src-pkgs.tar.gz CA-183816: Updated RPU hotfixes in XenCenter 2015-09-25 12:47:39 +01:00
XS62E006.xsupdate CA-183816: Updated RPU hotfixes in XenCenter 2015-09-25 12:47:39 +01:00
XS65ESP1006.xsupdate CA-183816: Updated RPU hotfixes in XenCenter 2015-09-25 12:47:39 +01:00