Commit Graph

1775 Commits

Author SHA1 Message Date
Gabor Apati-Nagy
c252f73165 Merge pull request #900 from MihaelaStoica/CA-204188
CA-204188: Select "Optimize manually" when the shadow multiplier valu…
2016-03-15 15:54:05 +00:00
Gabor Apati-Nagy
347efe3305 Merge pull request #898 from MihaelaStoica/CA-203434
CA-203434: License Status displayed as "Not Found" on General tab
2016-03-15 15:53:58 +00:00
Gabor Apati-Nagy
640a20514e Merge pull request #896 from MihaelaStoica/CA-202483
CA-202483: Change the Search tab title to "New Search" when a new sea…
2016-03-15 15:53:52 +00:00
Gabor Apati-Nagy
cb31f6cbed Merge pull request #894 from MihaelaStoica/CA-203428
CA-203428: XenCenter not allowing SXM from/between Cream hosts
2016-03-15 15:06:51 +00:00
Mihaela Stoica
3a42554fdf CA-204188: Select "Optimize manually" when the shadow multiplier value changes (not when the control is entered)
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-03-14 15:03:50 +00:00
Stephen Turner
da21dac32c Merge pull request #897 from ushamandya/master
CP-15333: XC Help for Windows Update feature + reverted TP3 changes
2016-03-11 14:24:35 +00:00
Mihaela Stoica
c4b7ca3514 CA-203434: License Status displayed as "Not Found" on General tab
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-03-11 14:17:58 +00:00
Usha Mandya
d756f1cf15 CP-15333: XC Help for Windows Update feature + reverted TP3 changes 2016-03-11 14:05:35 +00:00
Mihaela Stoica
a63fe3fd66 CA-202483: Change the Search tab title to "New Search" when a new search is created
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-03-11 13:57:21 +00:00
Mihaela Stoica
ac4378a45d CA-202477: XenCenter enables the Enter Maintenance mode button for a host even when the VM suspend is in progress 2016-03-11 13:53:12 +00:00
Mihaela Stoica
ee0b20e626 Merge pull request #893 from GaborApatiNagy/master_CA-202417
CA-202417: New VM Wizard Memory Modify button is not working reliably…
2016-03-11 13:49:49 +00:00
Mihaela Stoica
379de1f414 CA-203428: Check the CPU feature compatibility on migration only if the VM is on a Dundee or higher host
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-03-10 14:07:12 +00:00
Gabor Apati-Nagy
8091a9bc63 CA-202417: New VM Wizard Memory Modify button is not working reliably when specified in MB
Now we set Increment exactly as on other pages
when the unit is MB: the increment it will be calculated dynamically (1, 2, 4,...)
when GB, increment will be 1 GB for values >=10GB, 0.1GB otherwise

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-03-10 11:52:04 +00:00
Rob Hoes
bf9fdb2a85 Add Standard license edition
Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
2016-03-09 16:14:05 +00:00
Gabor Apati-Nagy
88e0a1c1fa Merge pull request #876 from MihaelaStoica/CA-201645
CA-201645: The Install Update wizard should delete patch installation…
2016-03-09 11:29:34 +00:00
Gabor Apati-Nagy
4ca88573f0 Merge pull request #879 from MihaelaStoica/CA-202371
CA-202371: Change wording on VM Advanced options page
2016-03-09 11:23:49 +00:00
Gabor Apati-Nagy
05f5f01eaa Merge pull request #889 from MihaelaStoica/CA-203178
CA-203178: Unable to create HBA SR using new storage repository wizard in XC
2016-03-09 11:13:39 +00:00
Gabor Apati-Nagy
f49e2be36e Merge pull request #890 from MihaelaStoica/CA-202476
CA-202476: Hide Scheduled snapshots option on the Snapshots page …
2016-03-09 11:10:14 +00:00
Mihaela Stoica
a62726254a CA-202476: Hide Scheduled snapshots option on the Snapshots page for hosts version 6.2.0 and higher
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-03-08 15:35:19 +00:00
Mihaela Stoica
2db694323c Merge pull request #888 from xenserver/master_CA-202068
CA-202068: License Manager wizard showing "Activate Free XenServer" b…
2016-03-08 15:11:44 +00:00
Mihaela Stoica
1eac78ac00 CA-203178: Unable to create HBA SR using new storage repository wizard in XC
- Removed the Storage provisioning page from the New SR Wizard
2016-03-08 14:47:55 +00:00
Gabor Apati-Nagy
09819b2a02 CA-202068: License Manager wizard showing "Activate Free XenServer" button even no host selected for editing license
Fixed, now the button is only shown when needed

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-03-08 13:51:39 +00:00
Mihaela Stoica
a7ad8bd58a Merge pull request #875 from GaborApatiNagy/master_CA-201576
CA-201576: Windows Update capable text does not fit into the control
2016-03-07 17:00:45 +00:00
Gabor Apati-Nagy
081359811f Merge pull request #880 from ushamandya/master
XC Help for TP3. Removed references to XS 7.0
2016-03-04 13:23:14 +00:00
Usha Mandya
0b117cd26d XC Help for TP3. Removed references to XS 7.0 2016-03-04 13:18:52 +00:00
Mihaela Stoica
b30e80b054 CA-202371: Change wording on VM Advanced options page
- Changes to the the layout: order of radio buttons, removed group box around the manual setting of shadow multiplier;
- Shadow multiplier edit box no longer disabled when "Optimize manually" not checked

- Also changed the wording on the Name page of the new VM wizard
2016-03-04 10:44:01 +00:00
Gabor Apati-Nagy
cb2fc58654 Merge pull request #878 from ushamandya/master
CP-16119: incorporated feedback on Dundee licensing topics
2016-03-04 10:15:53 +00:00
Usha Mandya
f30421d165 CP-16119: incorporated feedback on Dundee licensing topics 2016-03-04 09:34:30 +00:00
Mihaela Stoica
72ec9df41a CA-201645: The Install Update wizard should delete patch installation file if manual mode is selected
- Added PoolPatchCleanAction which is called for each pool after the patch has been applied on all selected hosts

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-03-03 11:34:00 +00:00
Gabor Apati-Nagy
eb3d6b30a6 CA-201576: *Windows Update* filter search in XC not properly fit into box
Resized them accordingly

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-03-02 17:37:28 +00:00
Stephen Turner
9adcc6a7c3 Merge pull request #874 from ushamandya/master
CP-15334: Incorporated review comments on GTV-g + minor updates to in…
2016-03-02 16:14:55 +00:00
Usha Mandya
9907d66b75 CP-15334: Incorporated review comments on GTV-g + minor updates to install XS Tools 2016-03-02 15:54:34 +00:00
Mihaela Stoica
aac3b75214 Merge pull request #873 from GaborApatiNagy/master_CA-202295
CA-202295: Hotkeys should not be part of the branding tag
2016-03-02 14:16:53 +00:00
Gabor Apati-Nagy
066bf9876a CA-202295: Hotkeys should not be part of the branding tag
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-03-02 14:06:58 +00:00
Gabor Apati-Nagy
9571322b7b CA-202295: Hotkeys should not be part of the branding tag
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-03-02 14:00:18 +00:00
Gabor Apati-Nagy
bcc607ef4d Merge pull request #872 from MihaelaStoica/CA-201414
CA-201414: Remove the background worker, which seemed to cause the He…
2016-03-02 13:35:43 +00:00
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
Mihaela Stoica
fc5ebd2d40 CP-15401: Move HiddenFeatures to a new class
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-01-28 21:43:15 +00:00
Mihaela Stoica
a9d7d95f56 CA-196887: New function for reading registry key written by the installer
- When the installer writes HiddenFeatures registry entry, it specifies registry key HKMU, that means that it will be written in HKLM if the user selected "All Users" for installation, or to HKCU if the user selected "Just Me".
- Added a new function to read an installed key by trying CurrentUser first, then Local Machine.
This function specifies a registry view (RegistryView.Registry32) when it opens the key (On the 64-bit version of Windows, portions of the registry are stored separately for 32-bit and 64-bit applications. There is a 32-bit view for 32-bit applications and a 64-bit view for 64-bit applications).

Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-01-28 14:57:16 +00:00
Cheng Zhang
8e64199497 CP-15267: Remove some help ID in helpmanager
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-28 18:13:39 +08:00
Cheng Zhang
4ba9981d28 Revert "CA-179515: Move to online help"
This reverts commit 0d0cf47523.

Conflicts:

	XenAdmin/Help/HelpManager.resx
	XenModel/InvisibleMessages.Designer.cs
	XenModel/InvisibleMessages.resx
2016-01-28 17:35:51 +08:00
Cheng Zhang
29ea52f6de Revert "CA-179515: Move to online help: remove .chm files"
This reverts commit 81761c33b0.
2016-01-28 17:09:18 +08:00
Mihaela Stoica
5461838925 Merge branch 'master' into CP-15410
Conflicts:
	XenAdmin/Core/Registry.cs
2016-01-27 14:06:13 +00:00
Mihaela Stoica
2c41a4cfeb CP-15410: Show license expiry alerts
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-26 16:30:24 +00:00
Mihaela Stoica
f12b4765b6 CP-15409: Add read-only mode to License manager
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-26 14:49:02 +00:00
Gabor Apati-Nagy
249489220b Merge pull request #786 from MihaelaStoica/CP-15407
CP-15407: Add license editions
2016-01-26 11:32:54 +00:00
Gabor Apati-Nagy
fd314b2440 Merge pull request #787 from koushikcgit/master
Removing possible null object reference
2016-01-26 11:32:27 +00:00
Mihaela Stoica
a53b23fe03 Merge pull request #788 from cheng--zhang/CP-15623
CP-15623: Remove Messages FEATURE_NOT_AVAILABLE_NEED_ENTERPRISE_OR_PL…
2016-01-26 09:32:25 +00:00
Mihaela Stoica
3416707fd2 Merge pull request #785 from cheng--zhang/CP-15401
CP-15401: Show/Hide rdpPolling, upsell and optimize for XenApp depend…
2016-01-26 09:31:24 +00:00
Cheng Zhang
5be8c8978b CP-15623: Remove Messages FEATURE_NOT_AVAILABLE_NEED_ENTERPRISE_OR_PLATINUM_PLURAL
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-26 13:40:15 +08:00
Cheng Zhang
5c399ab4ba CP-15401: Avoid have null in URL constructor
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-26 11:16:39 +08:00
Koushik Chakravarty
c2e6c79670 Removing possible null object reference
Signed-off-by: Koushik Chakravarty <Koushik.Chakravarty@citrix.com>
2016-01-25 16:43:33 +05:30
Cheng Zhang
6b2490dea7 CP-15401: Hide upload option by reg key
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-25 16:23:31 +08:00
Cheng Zhang
b33e579f28 CP-15401: Hide HealthCheck by reg key
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-25 13:40:45 +08:00
Cheng Zhang
04d3b81d92 CP-15401: Changed WarningWithInformationUrl and ProblemWithInformationUrl to cope with empty URL string
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-25 11:15:30 +08:00
Mihaela Stoica
26d9e0a3f9 CP-15401: Rearrange the legal notice dialog
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-22 14:02:14 +00:00
Mihaela Stoica
3ccfcc7e3a Merge pull request #782 from cheng--zhang/CP-15398
CP-15398: Make version, xsupdate and xensearch rebrandable
2016-01-22 13:16:03 +00:00
Cheng Zhang
d4ec1289c2 CP-15401: Move hidden check out of designer
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 17:02:59 +08:00
Cheng Zhang
7793f8547e CP-15401: Make legal notice change by reg key
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 16:51:37 +08:00
Cheng Zhang
e488c62175 CP-15401: Make Cross-server private network hide by reg key
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 14:30:28 +08:00
Cheng Zhang
3157f8dd30 CP-15404: Rebranding the installer and fix translation issue
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 13:50:20 +08:00
Cheng Zhang
1485a056e9 CP-15399: Make xsupdate rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 13:50:12 +08:00
Cheng Zhang
88d881b126 CP-15401: Show/Hide rdpPolling, upsell and optimize for XenApp depending on XenCenter registry keys
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 13:31:22 +08:00
Mihaela Stoica
6feab75fb4 CP-15407: Add license editions
Cherry-picked from cream-indigo:
CP-14857: Add "premium" license edition
CP-14857: Add premium license edition for CN version
CA-190342: Add friendly name for "basic" edition
- also hide the Status field from the License Details section if the license is basic

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-21 12:31:33 +00:00
Gabor Apati-Nagy
e5545b3011 Merge pull request #781 from MihaelaStoica/CP-15408
CP-15408: Add license restrictions
2016-01-20 14:04:08 +00:00
Mihaela Stoica
c423fff1dc CP-15408: Renamed RestrictInterPoolMigrate function
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-20 13:48:36 +00:00
Mihaela Stoica
9aee7a4f9b Merge pull request #773 from GaborApatiNagy/CA-187681
CA-187681: xs-tools ISO doesn't get mounted on dlvm xva(Centos 7 HVM)
2016-01-20 12:27:29 +00:00
Mihaela Stoica
e3f5490a03 Merge pull request #783 from robhoes/master
CA-186237: Add links to citrix.com
2016-01-20 12:26:48 +00:00
Gabor Apati-Nagy
50b297e743 Merge pull request #778 from MihaelaStoica/CP-15390
CP-15390: Bring back "restrict_pooling"
2016-01-20 12:20:34 +00:00
Gabor Apati-Nagy
04e5820db2 Merge pull request #776 from MihaelaStoica/CP-14472
CP-14472: Remove the lock in the License Manager and ensure that all the updates are done on the main thread.
2016-01-20 12:19:07 +00:00
Rob Hoes
a887faa5f1 –CA-186237: Add link to citrix.com to SSR wizard
Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
2016-01-20 12:03:18 +00:00
Rob Hoes
7e31b484ed CA-186237: Add link to citrix.com to HealthCheck settings dialog
Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
2016-01-20 12:03:12 +00:00
Cheng Zhang
992ee9e62f CP-15400: Make xensearch rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-20 11:33:54 +08:00
Cheng Zhang
91f7f0646f CP-15398: Make version rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-20 11:33:07 +08:00
Cheng Zhang
75ebed8831 CP-15398: Add missed @
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:42:50 +08:00
Cheng Zhang
dc0b468cbc CP-15398: Change the messages in legal notices
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:42:49 +08:00
Cheng Zhang
98f638027f CP-15398: Rework on comments
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:42:49 +08:00
Cheng Zhang
31b7337026 CP-15398: Remove enbedded icons
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:56 +08:00
Cheng Zhang
15ef3410a3 CP-15398: Make file name and dir rebrandablei
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:55 +08:00
Cheng Zhang
07c9301637 CP-15398: Change the about dialog texture
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:54 +08:00
Cheng Zhang
08741a1fa0 CP-15398: Make texture company name rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:54 +08:00
Cheng Zhang
d71a20706b CP-15398: Make textue with control key rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:53 +08:00
Cheng Zhang
4f0270d049 CP-15398: Make texture XenServer Host rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:52 +08:00
Cheng Zhang
010ff919c1 CP-15398: Make texture XenServer product rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:36:21 +08:00
Mihaela Stoica
89694b98e3 Merge pull request #775 from GaborApatiNagy/CA-159790_2
CA-159790: [XSO-208] & CA-103752
2016-01-18 21:58:21 +00:00
Cheng Zhang
a57a610b08 CP-15408: Add license restriction for VSS snapshots
- The license restriction for vss snapshots already exists in trunk. This commit just amends the message displayed when the feature is not available.

Cherry picked from cream-indigo:
CA-190395: Replace the usage of FEATURE_NOT_AVAILABLE_NEED_ENTERPRISE_OR_PLATINUM_PLURAL
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-18 15:48:32 +00:00
Cheng Zhang
4a1a9914d6 CP-15408: Add license restriction for VM migration
Cherry picked from cream-indigo:
CP-14848: License restriction for migration for DragDropMigrateVMCommand
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-18 15:48:06 +00:00
Cheng Zhang
ea690581d0 CP-15408: Add license restriction for VM migration
Cherry picked from cream-indigo:
CP-14848: XenCenter: Implement license restriction for migration
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-18 15:44:50 +00:00
Mihaela Stoica
0d08b143d1 CP-15390: Bring back "restrict_pooling"
(partially revert commit 8ea7e73b55)

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-15 14:42:36 +00:00
Gabor Apati-Nagy
5e48d730c1 CA-159790: [XSO-208] MeddlingActions don't show location information
Set the Host to the pool master if the task.resident_on host doesn't resolve

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-01-15 13:43:09 +00:00
Mihaela Stoica
11362f22d2 CP-14472: Remove the lock in the License Manager and ensure that all the updates are done on the main thread.
- changed the licenseStatus_ItemUpdated event handler to invoke on the main thread, as this is the only case when a background thread needs to update the storedRows list..All the other reads and writes are taken place on the main (UI) thread
- removed the storedRowsLock as it is not needed since we do all the updates to storedRows on one thread.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-14 16:22:13 +00:00
Gabor Apati-Nagy
3f9db9f98b CA-159790: [XSO-208] MeddlingActions don't show location information
Found a better solution

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-01-14 14:33:06 +00:00
Cheng Zhang
a33d10bade CP-15398: Make texture XenCenter rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-14 18:52:53 +08:00
Cheng Zhang
9dcbd0a430 CP-15403: Remove year information in copyright
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-14 10:42:46 +08:00
Cheng Zhang
766cb72cbe CP-15403: Add rebranding phase in xenadmin
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-14 10:42:45 +08:00
Gabor Apati-Nagy
69cbb9445d CA-187681: xs-tools ISO doesn't get mounted on dlvm xva(Centos 7 HVM)
There were times when "HasUpgradeSupportInManagementAgent" was needed, but not anymore, so this commit is changing code to use only VirtualisationStatus.MANAGEMENT_INSTALLED again.
2016-01-13 13:26:37 +00:00
Gabor Apati-Nagy
ae05d9de17 CA-159790: [XSO-208] MeddlingActions don't show location information
Updated the GetLocation extension method for ActionBase objects to return action.Connection.FriendlyName should it have no Host or Pool set up. This way we see location for MeddlingActions.
Also changed some messages (Task Names) to include "VM" in them too, because xe command line initiated VM lifecycle actions looked really misleading after the above fix in XenCenter (Eg. restarting a VM would show up as "Restarting", "server" which would suggest that not just the VM, but the host is being restarted.)

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-01-12 19:16:29 +00:00
Cheng Zhang
b74ae83300 CP-15396: Rename dir of XenAdmin-Branding to Branding
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-11 17:28:31 +08:00
Cheng Zhang
a9214c3463 CP-15396: Use xenadmin-branding and change the location of icons
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-08 16:29:59 +08:00
Hui Zhang
c53e25d2d3 CA-194940: WLB - Hide host disk IO settings for XenServer previous to Dundee.
1. Check the Xenserver platform version and display the host disk read/write
threshold and metric weighting for Dundee or later XenServer.
2. Update the metric weighting page to make it autosize-able.

Signed-off-by: Hui Zhang <hui.zhang@citrix.com>
2016-01-06 15:02:44 +08:00
Stephen Turner
648d3733c8 Merge pull request #749 from GaborApatiNagy/CA-188553
CA-188553: [PAR-80] Creating a VLAN with MTU 9000 should be disabled …
2015-12-22 16:33:26 +00:00