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
Cheng Zhang
e8856343de
CP-15162: Change the use of HKCU -> HKMU
...
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-02 18:57:12 +08: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
Mihaela Stoica
f68c6a6cae
Merge pull request #804 from robhoes/starton
...
CA-196231: Don't confuse start-on with migration
2016-02-02 10:40:55 +00:00
Mihaela Stoica
1726f8ce63
CP-15405: Fix packaging issues
...
(Cherry picked from cream-indigo)
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-02-02 10:23:02 +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
Cheng Zhang
38a50e1754
CP-15404: Make install dir rebrandable
...
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-02 09:45:04 +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
8637187bc2
CP-15405: Sign dlls brought from dotnet-packages
...
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-02-01 15:01:45 +00:00
Mihaela Stoica
74a759c44d
CP-15405: Add script for signing and packaging
...
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-02-01 14:26:04 +00:00
Mihaela Stoica
7085ad5672
CP-15405: Add script to collect unsigned files
...
- Only collect the unsigned files if the option is specified
- When collecting the unsigned files, also copy all DotNetInstaller files
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-02-01 14:15:55 +00:00
Mihaela Stoica
46d982cc49
CP-15405: Move packaging and signing steps into a separate script file
...
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-02-01 14:04:47 +00:00
Mihaela Stoica
49fc17e51a
Merge pull request #802 from MihaelaStoica/CP-15825
...
CP-15825: Set Roaming=true for the new setting
2016-02-01 11:35:59 +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
6122acd93b
Merge pull request #799 from MihaelaStoica/CP-15825
...
CP-15825: Show About dialog at startup detailing company names that t…
2016-02-01 11:01:05 +00:00
Mihaela Stoica
ad2656a692
Merge pull request #800 from robhoes/master
...
CP15894: Find the Tools SR/VDI using the new fields
2016-02-01 10:58:47 +00:00
Cheng Zhang
40e3ba3d66
CP-15162: Add desktop shortcut to installdlg
...
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-01 18:38:55 +08: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
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
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
f6a6451e56
Merge pull request #796 from MihaelaStoica/CA-196887
...
CA-196887: New function for reading registry key written by the installer
2016-01-29 09:20:11 +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
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
Gabor Apati-Nagy
615a8cffe1
Merge pull request #795 from GaborApatiNagy/master_wix
...
CP-15922: Investigate and fix WiX installer for InstallDir Extension UI
2016-01-28 18:58:10 +00:00
Gabor Apati-Nagy
2adb9d1f43
CP-15922: Investigate and fix WiX installer for InstallDir Extension UI
...
This changeset makes it possible to use InstallDir again - it hasn't worked since we changed to 3.9 from 3.5.
2016-01-28 18:50:56 +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
Mihaela Stoica
3601f8fba9
Merge pull request #794 from cheng--zhang/CP-15267
...
CP-15267: Move back to CHM for XenCenter help
2016-01-28 10:32:59 +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
4da4cf9b86
Revert "CA-179515: Move to online help: update the installer not to install the .chm"
...
This reverts commit cf8de9ae86
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-28 17:24:41 +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
Gabor Apati-Nagy
1841522ac4
Merge pull request #792 from MihaelaStoica/CP-15410
...
CP-15410: Show license expiry alerts
2016-01-27 14:39:27 +00:00
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