Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-11 20:52:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,808 Commits 12 Branches 48 Tags 186 MiB
90c601bbb9
Commit Graph

1756 Commits

Author SHA1 Message Date
Mihaela Stoica
7e648810b8 CP-26618: Log more at INFO level when downloading an update (#1919) 
* CP-26618: Log more at INFO level when downloading an update

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2018-01-19 13:34:20 +00:00
Mihaela Stoica
b9e85f93d5
Merge pull request #1914 from serencorbett1/REQ-477 
CP-26253: changed "images" to "virtual disks" to avoid confusion
 2018-01-18 15:39:51 +00:00
Mihaela Stoica
5fb9709b8a Merge master into REQ-477 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

# Conflicts:
#	XenModel/FriendlyNames.resx
#	XenModel/Messages.resx
#	XenModel/XenAPI/ApiVersion.cs
 2018-01-15 14:41:40 +00:00
Mihaela Stoica
6cefd4d202 CA-276976: Add a new precheck in the Update Wizard 
- The new "server selection" precheck is added for Inverness or greater pools and checks if all the servers in the pool are selected (if update not already applied) when applying an update that has the "enforce-homogeneity" flag set to true

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2018-01-12 14:34:50 +00:00
serenc
92a809e433 CP-26253: changed "images" to "virtual disks" to avoid confusion 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2018-01-12 14:05:01 +00:00
Mihaela Stoica
27979638df CA-276732: Replaced "Buy XenServer online" link 
Also replaced another broken link, on GuiOldAlert

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2018-01-12 12:11:46 +00:00
Mihaela Stoica
01327288f7 CA-250148: Replaced XenCenter plugins link 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2018-01-12 12:11:46 +00:00
Mihaela Stoica
f62cc5c521 CA-279502: Added check for the server version before calling VM.get_is_default_template 
This fixes the error thrown when importing templates with XenCenter 7.3 on servers earlier than 7.2

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2018-01-12 11:01:09 +00:00
Mihaela Stoica
018dfb8e79 Rename resource string which causes Messages.resx to become unsorted 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2018-01-11 12:45:37 +00:00
serencorbett1
16d0c1cc77 CP-26253: Added changes to UI based on feedback (#1906) 
* CP-26253: Added changes to UI based on feedback

Signed-off-by: serenc <seren.corbett@citrix.com>

* CP-26253: Corrected spelling mistake

Signed-off-by: serenc <seren.corbett@citrix.com>

* CP-26253: Changed "Thin Provisioning (GFS2) SRs"  to "thinly provisioned"

Signed-off-by: serenc <seren.corbett@citrix.com>
 2018-01-10 15:13:55 +00:00
Konstantina Chremmou
43079c6e17 CP-26469: Added version 2.9 to the API bindings. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2018-01-10 12:57:12 +00:00
Mihaela Stoica
13a8b26fc4 Merge release/jura/master into REQ-637 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

# Conflicts:
#	XenModel/Utils/Helpers.cs
 2017-12-19 13:12:39 +00:00
Mihaela Stoica
4d55a1c08b
Merge pull request #1899 from krizex/private/yangqi/CA-178651 
CA-178651 FCoE NIC is not prevented from unplugging
 2017-12-19 11:00:02 +00:00
Yang Qian
61b73aa9a8 CA-178651 FCoE NIC is not prevented from unplugging 
Add api errors

Signed-off-by: Yang Qian <yang.qian@citrix.com>
 2017-12-19 17:46:35 +08:00
Mihaela Stoica
59bcf97133
Updated bindings with new API version 2.10. (#1902) 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-12-18 13:41:37 +00:00
Mihaela Stoica
ffa42c086b CP-26290: Add new edition 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-12-18 13:22:17 +00:00
Mihaela Stoica
8ab61cf12e Added JuraOrGreater function 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-12-18 11:39:58 +00:00
Michael
035f4c234e CA-272797: Limit user to select 8 SRs at most in DR Configure dialog. (#1896) 
* CA-272797: Limit user to select 8 SRs at most in DR Configure dialog.

Signed-off-by: Michael Zhao <michael.zhao@citrix.com>
 2017-12-18 09:55:45 +00:00
Gabor Apati-Nagy
00040b5761
Merge pull request #1897 from MihaelaStoica/REQ-477 
CP-26131: IP Address Configuration when clustering is enabled
 2017-12-15 11:11:40 +00:00
serencorbett1
89ae8534fa CP-26193: Disable remove IP address button when clustering enabled on… (#1898) 
* CP-26193: Disable remove IP address button when clustering enabled on network

* CP-25967: Combine two if statements

* CP-25967: Changed ClusteringEnabled boolean method

* CP-25967: Removed var

Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-15 11:09:26 +00:00
Mihaela Stoica
080b69befa CP-26131: Use SR.GetSR.GetSRType()instead of type 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-12-15 10:47:12 +00:00
Mihaela Stoica
bb0c0ae552 CP-26131: IP Address Configuration when clustering is enabled 
When configuring the IP address on the cluster network, we need to temporarily unplug all GFS2 SRs and disable clustering.

This commit also includes a fix to the action progress calculation.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-12-12 13:46:42 +00:00
serencorbett1
f4d501474a CP-25564: Changed clusteringEnabled variable (#1891) 
* CP-25564: Changed clusteringEnabled variable

* CP-26026: Added a link to enable clustering on SR Wizard

* CP-26026: Tweaked according to PR feedback

* CP-25967: Added license restriction for GFS2

Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-12 13:36:09 +00:00
Konstantina Chremmou
4ce1388077 Updated bindings with new API version 2.10. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-12-11 13:10:03 +00:00
Jisheng Xing
449dfe7f56 CA-272130: modify truncated linklabel and text on the memory settings wizard 2017-12-07 17:28:03 +08:00
Michael
1d0a2b76a0 CA-272769: Enable user to cancel URL testing in rolling upgrade wizard. (#1882) 
* CA-272769: Enable user to cancel URL testing in rolling upgrade wizard.

* CA-272769: Sort messages resource file.
 2017-12-06 12:06:36 +00:00
serenc
1e63b128b5 Added cluster-destroy bindings 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-05 14:05:44 +00:00
serenc
5eab6903d5 CP-25967: Add temporary license check 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-05 13:26:15 +00:00
serenc
7790bed4ca Merge remote-tracking branch 'upstream/REQ-477' into REQ-477 
Signed-off-by: serenc <seren.corbett@citrix.com>

# Conflicts:
#	XenAdmin/Dialogs/NetworkingPropertiesPage.cs
#	XenAdmin/Help/HelpManager.resx
 2017-12-05 11:16:16 +00:00
serenc
dd2bde777a CP-25564: Disable IP configuration if clustering is enabled 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-04 16:51:14 +00:00
Mihaela Stoica
72071a3334 Merge master into REQ-477 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

Conflicts:
	XenModel/XenAPI/Proxy.cs
 2017-12-04 13:37:12 +00:00
Mihaela Stoica
a2d9993d08 Added KolkataOrGreater function 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-12-04 13:06:13 +00:00
Konstantina Chremmou
817ea3654e Updated API bindings including fix to regression in the Session constructors. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-12-03 17:02:42 +00:00
serenc
9f9754c8b0 CP-25563: Added Clustering page 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-01 14:47:50 +00:00
Konstantina Chremmou
1c579565ac Create the settings object only in DEBUG mode. 2017-11-30 15:34:36 +00:00
Konstantina Chremmou
1ec3ba6ff9 Removed association of japanese resource files with the (Public)ResxFileCodeGenerator custom tool. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-30 13:56:32 +00:00
Konstantina Chremmou
fb8434819d Namespace tidy 3/several: replaced XenAdmin.Core (instances in XenCenterLib) with XenCenterLib. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-30 13:56:32 +00:00
Konstantina Chremmou
7f1ee0b30e Namespace tidy 2/several: replaced XenAdmin with XenCenterLib. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-30 13:56:32 +00:00
Konstantina Chremmou
566c6f0219 Namespace tidy 1/several: replaced Citrix.XenCenter with XenCenterLib. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-30 13:56:32 +00:00
Konstantina Chremmou
a623e28a06 CP-24558: Created a method in XenObject converting it to JObject, so that this method can be unit tested in isolation. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-30 13:49:15 +00:00
Mihaela Stoica
ba55a778b5 CA-250229: Fix typo in dialog box when assigning a VM already part of schedule to another schedule. 2017-11-29 17:20:24 +00:00
serencorbett1
584b214ac1 CA-272131 Added messages to show status of autostart (#1857) 
* CA-272131 Added messages to show status of autostart

* CA-272131 Tidied Disable and Enable Autostart Messages

* CA-272131: Changed parameter

Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-11-29 09:51:19 +00:00
Mihaela Stoica
343311635d
Merge pull request #1872 from michael2012z/private/fengyangz/CA-272606 
CA-272606: AD user can not log out when closing XenCenter.
 2017-11-28 14:31:38 +00:00
serenc
ecdbaee2f3 CP-25563: Return false to test UI 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-11-28 14:06:25 +00:00
serenc
7e7a6d9c46 CP-25551 and CP-25565: Updated branch based on PR comments 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-11-28 13:34:38 +00:00
serenc
5bb7a07711 CP-25551: Added Provisioning Page to the Wizard 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-11-28 10:51:44 +00:00
serenc
4837c0a5df CP-25565: Added new classes to cache and project 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-11-28 10:35:51 +00:00
Konstantina Chremmou
058854046d Provisional correction to the version for which JsonRpc is supported. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-27 13:17:22 +00:00
Michael Zhao
44851325fe CA-272606: AD user can not log out when closing XenCenter. 2017-11-27 14:50:05 +08:00
Konstantina Chremmou
1b302bb095 Added converter for reference/string-set maps. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-24 16:03:12 +00:00
Konstantina Chremmou
2ff121fb55 CA-266891: fixed issue where enum properties were not serialised correctly. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-23 15:13:54 +00:00
Konstantina Chremmou
bcab8a5c6c Added initial values to the JsonRpc classes to correct errors when building in Release mode. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-23 15:13:54 +00:00
Konstantina Chremmou
25f1971b2d Renamed converter as the previous name had the wrong meaning. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-23 15:13:54 +00:00
Konstantina Chremmou
23a9c50389 Merge remote-tracking branch 'upstream/master' into REQ-420 2017-11-23 14:07:21 +00:00
serenc
3e9e2609e8 CP-25565: Update XenCenter API binding 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-11-23 11:06:37 +00:00
serenc
c4b228e8da CP-25551: Change Type page, Add provisioning page 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-11-23 10:59:15 +00:00
Konstantina Chremmou
906619e4eb Updated API bindings with API version bumped to 2.8. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-22 14:33:26 +00:00
Mihaela Stoica
0c2af2074a
Merge pull request #1866 from vetrivelc/release/inverness/staging 
L10N: Translation Checkins
 2017-11-22 21:25:28 +08:00
Mihaela Stoica
407c59b8b9 CA-273163: Fix the error where XenCenter did not set XenServer log destination and the iSCSI IQN settings 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-11-22 13:18:45 +00:00
Vetrivel Chinnasamy
5f594dae8a L10N: Translation Checkins 2017-11-22 16:03:36 +05:30
Mihaela Stoica
681f77bfd9 CA-273307: Replaced the links in the Upsell dialogs 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-11-17 12:24:43 +00:00
Konstantina Chremmou
a170ec33e2 Merge remote-tracking branch 'upstream/master' into REQ-420 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>

# Conflicts:
#	autogenerated XenModel/XenAPI/* files
 2017-11-17 11:53:41 +00:00
Konstantina Chremmou
c2e71875af Updated bindings with the latest API objects. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-17 11:19:01 +00:00
Mihaela Stoica
8e5b40b84c Update XenAPI based on XS/master 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-11-17 10:52:02 +00:00
Gabor Apati-Nagy
0a8f9b8aa1
Merge pull request #1855 from serencorbett1/master 
CA-273674 Added warning when shutting down pool master
 2017-11-17 10:43:53 +00:00
Mihaela Stoica
6ab0fb7ba5 CA-266926: Change the description of the LICENSE_EXPIRES_SOON alert message 
... to avoid descriptions like "The license on host 'A' will expire at Never"

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-11-13 17:09:36 +00:00
serenc
e041b2d2b9 CA-273674 Added warning when shutting down pool master 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-11-13 15:07:32 +00:00
Vetrivel Chinnasamy
6a7e911eea L10N: Translation Checkins 2017-11-13 15:44:08 +05:30
Mihaela Stoica
53a4593394
Merge pull request #1847 from serencorbett1/master 
CA-271883 - Corrected order of Licenses
 2017-11-10 12:43:37 +00:00
serenc
6398c94383 CA-271883 - Corrected order of Licenses 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-11-10 11:38:11 +00:00
Mihaela Stoica
7ac856943e CA-272143: Import wizard stuck in "Waiting for Import template wizard to complete" when importing a default template 
When trying to import a default template from xva, xapi notices that it is a default template, finds an existing one on the host and returns that one.
With these changes, XenCenter handles this case and displays an error, instead of waiting for the returned VM to be linked to the import task (which never happens).

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-11-09 11:31:00 +00:00
Vetrivel Chinnasamy
282ea74224 L10N:CA-270723 Translation Checkins 2017-11-03 16:42:41 +05:30
Michael Zhao
df92e2ee9b CP-25375: Remove double quotation marks around string USB_DEVICE_VENDOR_PRODUCT. 2017-11-01 15:06:35 +08:00
Gabor Apati-Nagy
93935e5e48
Merge pull request #1833 from jijiang/master 
CA-270505: Use generic msg if VM migr not allowed
 2017-10-31 14:18:46 +00:00
Mihaela Stoica
de32523d04 Merge pull request #1834 from vetrivelc/master 
L10N: Fixed [XenServer] fix in zh-CN resource
 2017-10-25 09:38:35 +01:00
vetrivelc
06e11b5852 L10N: Fixed [XenServer] fix in zh-CN resource 2017-10-25 14:03:27 +05:30
Mihaela Stoica
95323239a0 Merge pull request #1827 from vetrivelc/master 
L10N:Translation Updates
 2017-10-25 08:48:23 +01:00
Ji Jiang
92db28f62a CA-270505: Use generic msg if VM migr not allowed 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-10-24 15:08:35 +01:00
Michael Zhao
b093082bcd REQ-158: Merge master to fix conflicts. 2017-10-24 18:51:24 +08:00
Ji Jiang
0390bc3f6e CA-265405: Fix string bug in vmss history dialog 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-10-24 10:40:46 +01:00
vetrivelc
d05fd0efd3 L10N:Translation Updates 2017-10-23 19:01:14 +05:30
Mihaela Stoica
6249663ae2 CP-17098: Integrate gfs2 in New SR wizard for HBA and FCOE SRs 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

Conflicts:
	XenAdmin/Wizards/NewSRWizard.cs
	XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs
	XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs
	XenAdmin/Wizards/NewSRWizard_Pages/SrWizardType.cs
 2017-10-20 11:05:45 +01:00
Mihaela Stoica
a56338861c CP-16484: Integrate gfs2 in New SR wizard for iSCSI SRs 
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>

Conflicts:
	XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoISCSI.cs
	XenAdmin/Wizards/NewSRWizard_Pages/SrWizardType.cs
	XenAdmin/XenAdmin.csproj
 2017-10-20 10:42:35 +01:00
Mihaela Stoica
b23ec8136a CP-16480: Add gfs2 to the list of XenCenter known sr types 
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>

Conflicts:
	XenModel/FriendlyNames.Designer.cs
	XenModel/FriendlyNames.resx
	XenModel/XenAPI-Extensions/SR.cs
 2017-10-20 10:34:56 +01:00
Kun Ma
1889cbafbd CP-25329: Refine API reference for PUSB & VUSB in xenadmin 
Signed-off-by: Kun Ma <kun.ma@citrix.com>
 2017-10-20 17:30:21 +08:00
Michael
a375c8a119 CP-25081: Set platform parameters. (#1820) 
* CP-25081: Set platform parameters.

* Optimize qemu-upstream handling code.

* Support Enter/Esc keyboard handling in AttachUsbDialog.

* Fix a logic error in showing qemu-upstream warning.

* Update bindings from REQ-158 XenServer build 129.
 2017-10-18 12:52:53 +01:00
Joey
2dc9c00e41 Merge pull request #1817 from GaborApatiNagy/master_new 
CA-267330: [Update Wizard Improvements] The Update wizard: block the installation of an update on slaves if a reboot or a toolstack restart is pending on master
 2017-10-18 09:53:51 +01:00
Ji Jiang
5fb9442632 Update XC XenAPI binding based on XS master 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-10-17 11:37:37 +01:00
Michael
16b52d1c3f CP-25081: UI improvements for USB passthrough (#1811) 
* CP-25081: UI improvements for USB passthrough

* CP-25081: Show text when AttachUsbDialog list is empty.

* Fix comments.

* Improve the presentation of warnings in USBEditPage.

* Update warning text of attach usb dialog.

* Simplify the layout of Attach USB Dialog.

* Check if USB devices plugged before showing UI.

* Fix comments.

* Fix comments.

* Improve code.
 2017-10-17 09:57:50 +01:00
Gabor Apati-Nagy
b589d0dd9e CA-267330: [Update Wizard Improvements] The Update wizard: block the installation of an update on slaves if a reboot or a toolstack restart is pending on master 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2017-10-13 13:55:19 +01:00
Mihaela Stoica
4a6b860f3d CA-268975: Do not allow multiple hosts to join the pool if the new pool size will exceed the max size 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-10-13 10:14:00 +01:00
Ji Jiang
be5aeae819 CA-249852: Add license status in pool general tab 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-10-12 13:50:24 +01:00
Mihaela Stoica
8fbfe4c060 Merge branch 'REQ-528' into master 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

Conflicts:
	XenAdmin/MainWindow.Designer.cs
 2017-10-12 11:39:19 +01:00
Ji Jiang
225474f913 CA-268683: Turn on disable HA on unlicensed pool 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-10-11 14:58:10 +01:00
Michael
e8cb4ad7d6 CP-24412 & CP-24333: USB device list filter in Attach dialog. (#1789) 
* CP-24412: Apply a filter before adding USBs to candidate list in Attach Dialog.

* CP-24333: Apply HA restraint.

* CP-24412: Fix a merge error.

* CP-24412: implement actions to attach/detach/passthrough.

* CP-24412: Add license check before making UI components visible.

* CP-24412: Change layout of new components to Dpi.

* Fixed all comments.

* Fix comments.

* fixed comments
 2017-10-10 09:05:22 +01:00
Ji Jiang
89bc74583f CP-266755 & CA-266843: Fix XC brand string 
Following pattern would be caught when using "XenCenter" "XenServer" and
"Citrix":
1) not "[" or "/" or """ on left of the brand string
2) brand string followed by space followed by not "p", and optional letter
3) optional letter followed by space followed by the brand string
4) brand string followed by "," and optional letter
5) begin with the brand string
6) end with the brand string

tested with all .resx files

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-10-06 13:30:31 +01:00
Mihaela Stoica
20d79ad6f4 Merge remote-tracking branch 'upstream/REQ-67' 
Conflicts:
	XenModel/Messages.Designer.cs
 2017-10-04 14:40:01 +01:00
Gabor Apati-Nagy
c00439bef4 CP-24818: [Update Wizard Improvements] Show the progress of the download in Automated mode 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2017-10-02 16:35:10 +01:00
Gabor Apati-Nagy
a8db7bfae9 Merge remote-tracking branch 'github_xenadmin/REQ-411' into master_REQ-411_merge 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

Conflicts:
	XenAdmin/Core/Updates.cs
	XenAdmin/TabPages/ManageUpdatesPage.cs
	XenAdmin/Wizards/PatchingWizard/PatchingWizard_PrecheckPage.cs
	XenModel/Messages.Designer.cs
 2017-09-29 11:56:46 +01:00
Gabor Apati-Nagy
0cc907bb14 CP-24709: Add a warning in the New VM wizard and Import wizard if the pool is licensed using XD/XA entitlement (#1791) 
* CP-24709: Add a warning in the New VM wizard and Import wizard if the pool is licensed using XD/XA entitlement

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

* CP-24709: Add a warning in the New VM wizard and Import wizard if the pool is licensed using XD/XA entitlement

Fixed unintended designer code additions/changes

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2017-09-29 11:05:57 +01:00