Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-12-23 08:56:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,548 Commits 12 Branches 48 Tags 186 MiB
3cbc9332e6
Commit Graph

2548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Mihaela Stoica
bff6237167 Merge pull request #779 from cheng--zhang/CP-15398 
CP-15398: Make texture rebrandable
 2016-01-19 10:45:05 +00: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
23bed48f8e CP-15398: Make installer bmps rebrandable 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-01-19 18:40:56 +08:00
Cheng Zhang
b794112536 CP-15398: Fix test failures 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-01-19 18:40:55 +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
e4d97dcef4 CP-15398: Make texture XenServer for health check 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-01-19 18:40:53 +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
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
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
Mihaela Stoica
0bf44398df CP-15408: Add license restriction for VM migration 
Cherry picked from cream-indigo:
CP-14848: Add license restriction key to the another test database
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-01-18 15:47:32 +00:00
Mihaela Stoica
63ee0f4110 CP-15408: Add license restriction for VM migration 
Cherry picked from cream-indigo:
CP-14848: Add license restriction key to the test database
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-01-18 15:46:40 +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
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
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
Mihaela Stoica
2b03930baa Merge pull request #770 from cheng--zhang/CP-15403 
CP-15403: Add rebranding phase in xenadmin
 2016-01-14 11:26:03 +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
1e7d9e649e CP-15403: Force update xenadmin-braning 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-01-14 10:42:47 +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