Commit Graph

2690 Commits

Author SHA1 Message Date
Gabor Apati-Nagy
50b7132aa2 Merge pull request #816 from MihaelaStoica/CP-15405
CP-15405: Copy all DotNetInstaller files to the local folder before b…
2016-02-04 17:25:57 +00:00
Gabor Apati-Nagy
ce80c8a9a7 Merge pull request #811 from MihaelaStoica/CP-15399
CP-15399: Move check for updates url to Branding.cs
2016-02-04 17:04:44 +00:00
Mihaela Stoica
874d19d7b9 Merge pull request #813 from cheng-z/CP-15404
Avoid sed cygwin replace CRLF to IF by using -b
2016-02-04 12:43:22 +00:00
Mihaela Stoica
0c5698b76f CP-15405: Copy all DotNetInstaller files to the local folder before building the installer
- Fixes build error "build-installers.sh: line 134: ./InstallerLinker.exe: Accessing a corrupted shared library"

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-04 12:41:20 +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
Gabor Apati-Nagy
8026ad9b65 Merge pull request #815 from MihaelaStoica/CP-15825
CP-15825: Fix error where the About dialog pops up when a connection …
2016-02-04 11:16:42 +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
Mihaela Stoica
6e66144ad9 Merge pull request #814 from cheng-z/CP-15404-2
Revert "CP-15162: Change the use of HKCU -> HKMU"
2016-02-04 09:59:32 +00:00
Mihaela Stoica
093feba229 CP-15825: Fix error where the About dialog pops up when a connection status changes
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-04 09:54:42 +00:00
Cheng Zhang
1d46add5d2 Revert "CP-15162: Change the use of HKCU -> HKMU"
This reverts commit e8856343de.
2016-02-04 12:46:55 +08:00
Cheng Zhang
6e33547393 CP-15404: Use local binary replace to avoid using linux ending
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-04 10:44:52 +08:00
Gabor Apati-Nagy
77bbb67bf8 CA-153143: [SCTX-1925] Workflow bug in adding a VIF
Fixed bug: "Depending on your workflow you can add a VIF to a VM with a duplicate MAC address without warning."

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-02-03 16:40:41 +00:00
Mihaela Stoica
a9b36d2e36 Merge pull request #809 from cheng-z/CP-15404
CP-15404: Remove unused resxs in XenAdmin
2016-02-03 10:24:17 +00:00
Cheng Zhang
88a725d746 CP-15404: Remove unused resxs in XenAdmin
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-03 17:16:33 +08:00
Gabor Apati-Nagy
6cff4d546a Merge pull request #803 from MihaelaStoica/CP-15405
CP-15405: Signing and packaging changes
2016-02-02 15:48:28 +00:00
Gabor Apati-Nagy
2ffe750dd6 Merge pull request #807 from ushamandya/master
CP-15337: Draft Help for FCoE and Storage topics
2016-02-02 15:46:42 +00:00
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