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,782 Commits 12 Branches 48 Tags 186 MiB
67e4e2113f
Commit Graph

2782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mihaela Stoica
5461838925 Merge branch 'master' into CP-15410 
Conflicts:
	XenAdmin/Core/Registry.cs
 2016-01-27 14:06:13 +00: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
Gabor Apati-Nagy
7217352a14 Merge pull request #791 from MihaelaStoica/CP-15409 
CP-15409: Add read-only mode to License manager
 2016-01-27 13:33:58 +00:00
Gabor Apati-Nagy
9059a25863 Merge pull request #790 from MihaelaStoica/CP-15394 
CP-15394: Update FriendlyErrorNames.resx with unbranded error messages
 2016-01-27 13:26:10 +00:00
Mihaela Stoica
5a90ef7f57 Merge pull request #789 from cheng--zhang/CP-15404 
CP-15404: Make installer rebrandable
 2016-01-26 16:48:13 +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
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
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
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
9f09d8cb60 CP-15404: Make component GUID rebrandable 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-01-26 14:55:59 +08:00
Cheng Zhang
58575a7d15 CP-15404: Install test repo by required 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-01-26 14:21:55 +08:00
Cheng Zhang
a2d62b2c2b CP-15404: Add reg key to hide feature 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-01-26 14:21:47 +08:00
Cheng Zhang
9b4d772250 CP-15404: Install readme files based on condition 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-01-26 14:21:26 +08: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
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
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
25b60eb220 CP-15404: Install HealthCheck by condition 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-01-25 16:51:43 +08:00
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
Cheng Zhang
ac04f3342b Merge pull request #1 from MihaelaStoica/cheng--zhang-CP-15401 
CP-15401: Rearrange the legal notice dialog
 2016-01-25 10:37:28 +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
d03a570b6b CP-15400: Use condition check to install xenserver updates 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-01-22 13:50:29 +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
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