Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,445 Commits 11 Branches 48 Tags 186 MiB
85c8cf0398
Commit Graph

903 Commits

Author SHA1 Message Date
Stephen Turner
85c8cf0398 CA-198276: Restrict number of sockets to 16 2016-02-12 17:01:05 +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
Rob Hoes
b9f4d24ca7 Use new SR.is_tools_sr and VDI.is_tools_iso fields to detect the Tools SR/VDI 
If the new field is not present, we'll fall back to the old method, which is by
name_label (SR.is_tools_sr/VDI.is_tools_iso will be false in that case).

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
 2016-01-29 15:40:49 +00:00
Rob Hoes
27bd60a77f Update to latest XenAPI bindings 
Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
 2016-01-29 15:40:49 +00:00
Cheng Zhang
352cb28270 CA-192539: Add CN resource for INCOMPATIBLE_PRODUCTS 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-01-29 14:35:03 +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
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
Gabor Apati-Nagy
1990980228 Merge pull request #793 from MihaelaStoica/CP-15407 
CP-15407: Update the function that calculates pool license
 2016-01-27 13:35:49 +00:00
unknown
59226cd1aa CP-15407: Update the function that calculates pool license 
Cherry-picked from cream-indigo:
CA-190393: Update the function that calculates pool license
- use Host.GetEdition function, as this function interprets xapi license string "basic" as Free license in XenCenter

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-01-26 16:39:43 +00:00
Mihaela Stoica
9e5bcb5488 CP-15394: Update FriendlyErrorNames.resx with unbranded error messages 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-01-26 15:16:48 +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
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
Mihaela Stoica
bd7c378f50 CP-15407: Add license editions 
- added case for "basic" edition, being treated as Free

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-01-25 12:07:58 +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
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
Mihaela Stoica
77a255c2ad Merge pull request #784 from robhoes/master 
CA-192640: Don't log exceptions when HealthCheck service is not insta…
 2016-01-20 14:52:29 +00:00
Rob Hoes
1de9f35566 CA-192640: Don't log exceptions when HealthCheck service is not installed (part 2) 
Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
 2016-01-20 14:47:39 +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
89a91bd247 CA-187681: Improvement for VM.IsWindows property 
vm.guest_metrics.PV_drivers_up_to_date is obsolete (and can be wrong) for new type Windows VMs and this led to early escape from this action.
 2016-01-20 12:13:35 +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
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
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
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
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
cadcfeb91a Merge pull request #780 from robhoes/master 
Add FriendlyNames for new status report items
 2016-01-18 21:59:56 +00: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
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
Rob Hoes
a0764d3005 Add FriendlyNames for new status report items 
Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
 2016-01-18 14:42:35 +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
8ca9f1d727 Merge pull request #774 from robhoes/master 
CA-192640: Don't log exceptions when HealthCheck service is not insta…
 2016-01-15 14:25:57 +00:00
Gabor Apati-Nagy
5d82d9e3ff CA-103752: XenCenter ‘Event Log’ window does not show any host/pool information for ‘Actions’ level logs while applying license to host 
Setting Host or Pool on the ApplyLicenseEditionAction when there is one XenObject in the list

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-01-15 13:45:54 +00:00
Rob Hoes
f5a12452ca CA-192640: Don't log exceptions when HealthCheck service is not installed 
Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
 2016-01-14 13:52:20 +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
Mihaela Stoica
6f568e103a Merge pull request #771 from GaborApatiNagy/CA-159790_2 
CA-159790: [XSO-208] MeddlingActions don't show location information
 2016-01-13 13:39:12 +00:00