Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-12-24 19:29:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,653 Commits 12 Branches 48 Tags 186 MiB
d9f5733c78
Commit Graph

1639 Commits

Author SHA1 Message Date
Gabor Apati-Nagy
e64779b4ce Merge pull request #868 from MihaelaStoica/CP-16205 
CP-16205: Add AdditionalFeatures branding variable
 2016-03-02 13:30:25 +00:00
Mihaela Stoica
b14a1dd72c Merge pull request #871 from GaborApatiNagy/master_CA-175498 
CA-175498: Better error message when patching fails
 2016-03-02 10:33:12 +00:00
Mihaela Stoica
2efdae0be6 Merge pull request #867 from GaborApatiNagy/master_CA-201083 
CA-201083: Incorrect help link in Copy VM wizard
 2016-03-01 22:02:53 +00:00
Mihaela Stoica
a91b17d125 CA-201414: Remove the background worker, which seemed to cause the Health Check dialog to be shown blank at startup. 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-03-01 21:52:15 +00:00
Gabor Apati-Nagy
ed43975454 CA-201083: Incorrect help link in Copy VM wizard 
Changed keys of help ids related to copy mode

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-03-01 18:12:16 +00:00
Gabor Apati-Nagy
9bf37f7d25 CA-201083: Incorrect help link in Copy VM wizard 
Removed redundant criterias from some ifs

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-03-01 18:07:53 +00:00
Gabor Apati-Nagy
e011ade0da CA-175498: Even more logging 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-03-01 16:51:01 +00:00
Gabor Apati-Nagy
b0c8004230 CA-175498: [HFP Tardy] Error "Remove the patch backup files" when patch-apply fails and user tries to re-apply the patch is not shown on XC. 
log the error message that is actually displayed on UI

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-03-01 16:10:24 +00:00
Gabor Apati-Nagy
6ec9257667 CA-175498: [HFP Tardy] Error "Remove the patch backup files" when patch-apply fails and user tries to re-apply the patch is not shown on XC. 
Show a more detailed error message

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-03-01 16:06:42 +00:00
Gabor Apati-Nagy
6506e48c28 Merge pull request #870 from ushamandya/master 
CP-15333: Draft changes for XS Tools update via Windows Updates
 2016-03-01 15:32:00 +00:00
Usha Mandya
d6c3e9ca2e CP-15333: Draft changes for XS Tools update via Windows Updates 2016-03-01 15:23:38 +00:00
Mihaela Stoica
a7b5c52e1c CP-16205: Add AdditionalFeatures branding variable 
We now have two branding variables, one for hidden features and one for additional features (empty by default)
 2016-02-29 14:54:26 +00:00
Gabor Apati-Nagy
bb592fc769 CA-201083: Incorrect help link in Copy VM wizard 
Copy VM or Copy Templates wizard will point to the same help: "Copying VMs and Templates"
Migrate and Move VM will show: "Migrate Virtual Machines"

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-26 18:21:51 +00:00
Gabor Apati-Nagy
6c560ec3bc Merge pull request #865 from MihaelaStoica/CA-196643 
CA-196643: Check the CPU feature compatibility in StartDiagnosisForm
 2016-02-26 14:15:43 +00:00
Mihaela Stoica
0504b5b295 CA-196643: Check the CPU feature compatibility in StartDiagnosisForm 
- The StartDiagnosisForm dialog shows the reasons why a VM cannot be started or resumed. XenCenter tries to get these reasons from a call to VM.assert_can_boot_here, but his function does not perform a CPU feature compatibility check.
- This commit adds the CPU feature compatibility check for resume operations.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-26 10:54:07 +00:00
Mihaela Stoica
ccbc07e25d Merge pull request #864 from stephen-turner/CA-201421 
CA-201421: tools ISO is missing in drop-down list
 2016-02-25 17:23:18 +00:00
Stephen Turner
5093ef677c CA-201421: tools ISO is missing in drop-down list 2016-02-25 17:18:48 +00:00
Gabor Apati-Nagy
6c62806fd6 CA-199145: Home page missing the page icons that are used as list bullets 
Now the Mhtml file contains this image as well. I used IE to save it and apparently (like other browsers) it does not save css-specified background images, so had to add a 0x0px sized img into the html to have IE to save it. Easy workaround and no change to the layout.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-25 14:15:04 +00:00
Stephen Turner
7867901e0d Merge pull request #858 from xenserver/revert-746-CA-178985 
CA-190986: Revert "CA-178985: Removed ova.xml import from XenCenter"
 2016-02-25 09:30:58 +00:00
Stephen Turner
9924d88747 Merge pull request #859 from ushamandya/master 
CP-13969: Incorporated review comments from Mihaela.
 2016-02-24 16:28:45 +00:00
Usha Mandya
a539e0b473 CP-13969: Incorporated review comments from Mihaela. 2016-02-24 16:24:44 +00:00
Gabor Apati-Nagy
1ca313c1e0 Revert "CA-178985: Removed ova.xml import from XenCenter" 2016-02-24 15:33:18 +00:00
Gabor Apati-Nagy
88a3291630 CA-201032: Made automatic option not visible in the Install Patches Wizard 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-24 15:31:58 +00:00
Gabor Apati-Nagy
ebec8b1d7e CA-197423: Incorrect UI text and help link in Copy Template wizard 
One missing helpid fixed

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-24 13:52:10 +00:00
Gabor Apati-Nagy
0c56385921 CA-197423: Incorrect UI text and help link in Copy Template wizard 
Fixed helpids

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-24 11:10:09 +00:00
Gabor Apati-Nagy
4bdc5ffa79 CA-197423: Incorrect UI text and help link in Copy Template wizard 
Fixing UI text (template instead of VM where needed)

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-24 10:44:37 +00:00
Gabor Apati-Nagy
44e05b75eb Merge pull request #852 from ushamandya/master 
CP-16118: Contains TLS SSL updates
 2016-02-19 17:21:48 +00:00
Usha Mandya
712271f919 CP-16118: Contains TLS SSL updates 2016-02-19 16:23:05 +00:00
Gabor Apati-Nagy
6cde7d9c3f CP-15830: Add Help IDs for new dialogs in Dundee 2016-02-18 13:09:53 +00:00
Stephen Turner
6949349830 Merge pull request #845 from GaborApatiNagy/master_CP-16097 
CP-16097: Hide Thin Provosioning in XenCenter
 2016-02-17 13:58:20 +00:00
Gabor Apati-Nagy
0f20df0f4b CP-16097: Hide Thin Provosioning in XenCenter 
Added the same comment to all the changes

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-17 13:14:42 +00:00
Stephen Turner
675ae4f057 Merge pull request #846 from ushamandya/master 
CP-15334, CP-16118: Modified XC Help topics for GVT-g and TLS SSL updates
 2016-02-17 12:48:30 +00:00
Usha Mandya
6c0cb6b267 CP-15334, CP-16118: Modified XC Help topics for GVT-g and TLS SSL updates 2016-02-17 12:33:54 +00:00
Gabor Apati-Nagy
6cf7776795 CP-16097: Hide Thin Provosioning in XenCenter 
Commented code out only for easier reverting.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-17 11:42:19 +00:00
Stephen Turner
5a6283c5ec Merge pull request #843 from GaborApatiNagy/homepage2 
CP-15402: Improvements to the new HomePage
 2016-02-17 09:31:52 +00:00
Gabor Apati-Nagy
ccb57a3e79 CP-15402: HomePage: Added localized MHT files 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-16 18:54:20 +00:00
Gabor Apati-Nagy
f7961b3fbe CP-15402: HomePage 
Fixed css file to restore alignment to center. /* Note to myself: comments in css are like this note and not double slashes */
Removed bottom-padding so the scrollbars are not going to be shown too early

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-16 18:26:18 +00:00
Gabor Apati-Nagy
f5e833b230 CP-15402: New Home Page (html based) 
Localized the url of the Home Page. Globalization team can now reference different files per localization in InvisibleMessages.resx. (Eg. HomePage.ja.mht) The file then has to be added to XenAdmin.csproj, similarly to HomePage.mht.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-16 15:09:06 +00:00
Gabor Apati-Nagy
94b0f438c8 CP-15402: New Home Page (html based) 
Changed layout a bit to get rid of the scrollbars that appeared in a default sized XenCenter

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-16 14:47:04 +00:00
Gabor Apati-Nagy
977d4c0c76 Merge pull request #810 from huizh/CP-13123 
CP-13123: Add two buttons on General Tab of docker container.
 2016-02-16 11:25:33 +00:00
Gabor Apati-Nagy
f0f883042a CP-15402: New Home Page (html based) 
Removed images that are now no longer needed.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-15 17:31:13 +00:00
Gabor Apati-Nagy
8d7bff1b45 CP-15402: New Home Page (html based) 
Changes following the code review

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-15 16:25:17 +00:00
Gabor Apati-Nagy
5e8c3b4f62 CP-15402: Replaced existing to a new, html-based Home Page 
* Changed the installer to use the (yet) manually generated MHT file that encapsulates all the source files of the HomePage, so we don't have to have the installer to deploy every single file, so have changed the installer as well. This also makes branding easier.
* Added the license to the LegalNoticesDialog

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-15 15:37:21 +00:00
Gabor Apati-Nagy
bfb1213580 Merge branch 'master' of https://github.com/xenserver/xenadmin into 
homepage2
 2016-02-15 14:03:00 +00:00
Gabor Apati-Nagy
8a0f4512d7 CP-15402: Replaced existing to a new, html-based Home Page 
Tried to keep changes at one place while not abstracting things too much as we have don't need any complex functionality yet.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-15 14:01:37 +00:00
Hui Zhang
c5d9445684 CP-13124: Use SSH private key for docker guest VM authentication. 
1. Specify the key file location and name.
2. Update of the file name of docker command.

Signed-off-by: Hui Zhang <hui.zhang@citrix.com>
 2016-02-15 18:24:37 +08:00
Stephen Turner
fe29a0bb7d Merge pull request #835 from MihaelaStoica/CP-15576 
CP-15576: Hide containers options that aren't available for Windows S…
 2016-02-14 22:15:23 +00:00
Hui Zhang
784804c8d8 CP-13124: Invoke Putty, SSH to VM and run docker command. 
1. Run 'docker attach' if user clicks 'View Console' button.
2. Run 'docker logs' if user clicks 'View Log' button.
3. Make IPAddressForSSH a property of VM for common usage.

Signed-off-by: Hui Zhang <hui.zhang@citrix.com>
 2016-02-14 15:14:44 +08:00
Stephen Turner
5cf362cec4 Merge pull request #838 from stephen-turner/CA-198276 
CA-198276: Fix tab order on modified pages
 2016-02-12 18:54:11 +00:00
Stephen Turner
cf5b61ac7e CA-198276: Fix tab order on modified pages 2016-02-12 18:52:31 +00:00
Stephen Turner
21fa6fd89c Merge pull request #837 from ushamandya/master 
CP-15481: Updated Help topics for SXM constraints removal, CPU Levelling,etc
 2016-02-12 17:26:33 +00:00
Usha Mandya
d767f2fc54 CP-15481: Updated Help topics for SXM constraints removal, CPU Levelling, etc. 2016-02-12 17:19:59 +00:00
Mihaela Stoica
72619799d2 Merge pull request #836 from stephen-turner/CA-198276 
CA-198276: Restrict number of sockets to 16
 2016-02-12 17:18:41 +00:00
Stephen Turner
85c8cf0398 CA-198276: Restrict number of sockets to 16 2016-02-12 17:01:05 +00:00
Mihaela Stoica
cd8ed2d686 CP-15576: Hide containers options that aren't available for Windows Server 
- Container pause is not available if the the container is on a Windows VM.
- Processes is not available if the the container is on a Windows VM.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-12 16:48:52 +00:00
Stephen Turner
808f72422b Merge pull request #834 from MihaelaStoica/CA-197622 
CA-197622: Fixed exception "Unable to sort because the IComparer.Comp…
 2016-02-12 16:24:58 +00:00
Mihaela Stoica
ac5eda5812 CA-197622: Fixed exception "Unable to sort because the IComparer.Compare() method returns inconsistent results" 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-12 16:19:12 +00:00
Mihaela Stoica
f7e0f61093 Merge pull request #832 from stephen-turner/CA-198487 
CA-198487: Log at Info level not Debug level
 2016-02-12 12:22:28 +00:00
Stephen Turner
e940ed8bb0 CA-198487: Log at Info level not Debug level 2016-02-12 11:29:19 +00:00
Mihaela Stoica
7a46698141 CP-16068: Pick up new RPU hotfixes 
- XenCenter build system picks up the RPU hotfixes from Artifactory
- RPU001 and RPU002 replace XS62E006 and XS65ESP1006
- Removed hotfixes from the solution, moved  XS60E001 to Branding folder
- also cleaned up code in the HotfixFactory class, removing MNR and Cowley hotfixes (not supported anymore)

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-11 22:18:06 +00:00
Gabor Apati-Nagy
efe9c807b3 Merge pull request #827 from MihaelaStoica/rename 
CP-16012: Rename branding variables
 2016-02-10 15:19:29 +00:00
Gabor Apati-Nagy
98f5c06f18 Merge pull request #823 from MihaelaStoica/CA-198187 
CA-198187: All images included in xenadmin project should appear in t…
 2016-02-10 15:18:43 +00:00
Gabor Apati-Nagy
b211ab4a09 Merge pull request #821 from MihaelaStoica/CA-197388 
CA-197388: Fix error where License Manager displays "Standard feature…
 2016-02-10 15:18:23 +00:00
Mihaela Stoica
4263d2f152 Merge pull request #822 from GaborApatiNagy/CA-196315 
CA-196315: XS65ESP1018 not showing up in XenCenter Updates (on staging)
 2016-02-10 13:40:51 +00:00
Mihaela Stoica
9f99c37f83 CP-16012: Rename branding variables 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-10 11:52:30 +00:00
Mihaela Stoica
acd2a52823 Fix null reference exception that can occur when running the tests 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-10 10:48:08 +00:00
Gabor Apati-Nagy
0834cdf559 Merge pull request #825 from MihaelaStoica/CP-15399 
CP-15399: Changed Branding.cs so that only the constants get rebranded
 2016-02-09 15:41:33 +00:00
Mihaela Stoica
040058924d CP-15399: Changed Branding.cs so that only the constants get rebranded 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-09 15:18:05 +00:00
Mihaela Stoica
272c753fdf Merge pull request #820 from stephen-turner/CA-194025 
CA-194025: Variable $date-of-software replaced with actual year.
 2016-02-08 17:10:39 +00:00
Mihaela Stoica
5f7a6abc5c CA-198187: All images included in xenadmin project should appear in the Images folder in solution explorer 
- also removed some references to non-existent image files

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-08 16:51:29 +00:00
Gabor Apati-Nagy
39ae204363 Merge remote-tracking branch 'github_xenadmin/master' 2016-02-08 10:14:25 +00:00
Gabor Apati-Nagy
b8e447afa3 CA-196315: XS65ESP1018 not showing up in XenCenter Updates (on staging) 
Fixed code to treat uuids of patches case-insensitive when consuming, but not changing them (eg. to lowercase) to keep compatibility with older XAPIs.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-08 10:14:05 +00:00
Mihaela Stoica
7b2a0c6922 CA-197388: Fix error where License Manager displays "Standard features only" for Premium edition 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-08 10:10:01 +00:00
Hui Zhang
73c8bf4604 CP-13123: Add two buttons on General Tab of docker container. 
1. Add "View Console" and "View Log" on general tab of docker container.
2. Grey the two buttons if the container is on Windows (Server 2016) VM.
3. Enable the two buttons when the container is running on Linux VM.

Signed-off-by: Hui Zhang <hui.zhang@citrix.com>
 2016-02-06 15:34:09 +08:00
Stephen Turner
e36cc9f6e0 Merge pull request #819 from ushamandya/master 
CP-15481: Updated Migrate VMs, NFS, and SMB topics
 2016-02-05 16:07:18 +00:00
Stephen Turner
9906cf561f CA-194025: Variable $date-of-software replaced with actual year. 
I used the year the code was added to XenCenter: it may be older than that,
but I couldn't easily find out the exact date.

I also made the LegalNoticesDialog resizable, because it's silly trying to
read the legal notices in a teeny tiny window.
 2016-02-05 16:01:25 +00:00
Usha Mandya
dd0f639784 CP-15481: Updated Migrate VMs, NFS, and SMB topics 2016-02-05 15:59:17 +00:00
Mihaela Stoica
265f52d823 Merge pull request #812 from GaborApatiNagy/master_CA-153143 
CA-153143: [SCTX-1925] Workflow bug in adding a VIF
 2016-02-05 11:57:48 +00:00
Gabor Apati-Nagy
ce80c8a9a7 Merge pull request #811 from MihaelaStoica/CP-15399 
CP-15399: Move check for updates url to Branding.cs
 2016-02-04 17:04:44 +00:00
Mihaela Stoica
86ec959e26 CP-15399: Improvements to the way we handle rebranding of saved searches 
- InvisibleMessages.resx contains the default value for the saved search (xensearch), which can be overwritten in Branding.cs

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-04 12:04:33 +00:00
Mihaela Stoica
8e1493209d CP-15399: Improvements to the way we handle rebranding of update file 
- InvisibleMessages.resx contains the default value for the update file extension (xsupdate), which can be overwritten in Branding.cs

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-04 10:55:18 +00:00
Mihaela Stoica
20970ff122 CP-15399: Move check for updates url to Branding.cs 
- InvisibleMessages.resx contains the default url for check for updates, which can be overwritten in Branding.cs
- Added an extra parameter to DownloadUpdatesXmlAction for the updates url. If this is not specified (or null), then the default one (from InvisibleMessages) is used

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-04 10:39:14 +00:00
Mihaela Stoica
093feba229 CP-15825: Fix error where the About dialog pops up when a connection status changes 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-04 09:54:42 +00:00
Gabor Apati-Nagy
77bbb67bf8 CA-153143: [SCTX-1925] Workflow bug in adding a VIF 
Fixed bug: "Depending on your workflow you can add a VIF to a VM with a duplicate MAC address without warning."

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-03 16:40:41 +00:00
Cheng Zhang
88a725d746 CP-15404: Remove unused resxs in XenAdmin 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-02-03 17:16:33 +08:00
Usha Mandya
baa03c7586 CP-15337: Draft Help for FCoE and Storage topics 2016-02-02 14:43:55 +00:00
Mihaela Stoica
a34cffbd64 Merge pull request #806 from cheng--zhang/CP-15404 
CP-15404: Make help file rebrandable
 2016-02-02 11:00:20 +00:00
Mihaela Stoica
b555781f8d Merge pull request #805 from cheng--zhang/CP-15162 
CP-15162: Make installer rebrandable
 2016-02-02 10:58:29 +00:00
Mihaela Stoica
8d0d3c0c8e Merge pull request #801 from GaborApatiNagy/CP-15711 
CP-15711: Modify Select Update Page
 2016-02-02 10:46:08 +00:00
Cheng Zhang
c209bae16e CP-15404: Make help file rebrandable 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-02-02 13:19:14 +08:00
Cheng Zhang
7e88a4a16a CP-15951: Remove enbeded bmps in WLB credential dialog 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-02-02 09:45:29 +08:00
Rob Hoes
4d7693a503 CA-196231: Don't confuse start-on with migration 
The "Start on Server" VM context menu incorrectly enabled hosts that a VM can
only be started on after a storage migration.  This was due to the fact that
the VMOperationToolStripMenuItem class is used for both "Start on Server" as
well as "Migrate to Server".

This change ensures that start checks are done when a start is requested, and
migration checks otherwise.

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
 2016-02-01 17:34:24 +00:00
Mihaela Stoica
49e07882a6 CP-15825: Set Roaming=true for the new setting 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-01 11:21:17 +00:00
Gabor Apati-Nagy
f0e6d53103 CP-15711: Modify Select Update Page 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-01-29 18:06:31 +00:00
Gabor Apati-Nagy
b04c4d10dd CP-15711: Modify Select Update Page 
Added Automatic option, but the option itself is disabled for now.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-01-29 18:01:53 +00:00
Mihaela Stoica
fb64d19853 CP-15825: Show About dialog at startup detailing company names that the connected hosts have been licensed to 
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
 2016-01-29 14:38:58 +00:00
Mihaela Stoica
2689f0bd9e Merge pull request #797 from cheng--zhang/CA-192539 
CA-192539: Adding iNode host to XenCenter should be restricted
 2016-01-29 10:40:10 +00:00
Mihaela Stoica
25c787e61e CP-14817: Skip the product brand check in automated test mode 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-01-29 18:07:16 +08:00
Mihaela Stoica
2747ab702b CP-14817: Fixed "Unreachable code" warning 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

Conflicts:

	XenAdmin/MainWindow.cs
 2016-01-29 14:28:47 +08:00
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