Commit Graph

72 Commits

Author SHA1 Message Date
Mihaela Stoica
a7b5c52e1c CP-16205: Add AdditionalFeatures branding variable
We now have two branding variables, one for hidden features and one for additional features (empty by default)
2016-02-29 14:54:26 +00:00
Gabor Apati-Nagy
cd27e6ad7c CP-15915: fixed typo2 2016-02-26 15:05:03 +00:00
Mihaela Stoica
17a315c907 CA-201074: Added the localised home pages to the installer script
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-25 10:49:03 +00:00
Mihaela Stoica
8dbdd3487b CA-200937: The localised XenCenter installer (XenCenterSetup.l10n.exe) should also install the English help files
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-25 10:18:38 +00:00
Gabor Apati-Nagy
ec1e4ca067 Merge pull request #840 from cheng-z/CA-198895
CA-198895: Have parameter Languages back in xencenter.l10n.diff
2016-02-18 16:44:12 +00:00
Cheng Zhang
bf1f25af61 CA-198895: Have parameter Languages back in xencenter.l10n.diff
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-16 14:37:38 +08:00
Gabor Apati-Nagy
8d7bff1b45 CP-15402: New Home Page (html based)
Changes following the code review

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-02-15 16:25:17 +00:00
Gabor Apati-Nagy
5e8c3b4f62 CP-15402: Replaced existing to a new, html-based Home Page
* Changed the installer to use the (yet) manually generated MHT file that encapsulates all the source files of the HomePage, so we don't have to have the installer to deploy every single file, so have changed the installer as well. This also makes branding easier.
* Added the license to the LegalNoticesDialog

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-02-15 15:37:21 +00:00
Gabor Apati-Nagy
bfb1213580 Merge branch 'master' of https://github.com/xenserver/xenadmin into
homepage2
2016-02-15 14:03:00 +00:00
Gabor Apati-Nagy
8a0f4512d7 CP-15402: Replaced existing to a new, html-based Home Page
Tried to keep changes at one place while not abstracting things too much as we have don't need any complex functionality yet.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-02-15 14:01:37 +00:00
Stephen Turner
1cbeda9784 Merge pull request #833 from MihaelaStoica/master
CP-16075: Fix the diff file, after some lines have been removed in a …
2016-02-12 12:24:44 +00:00
Mihaela Stoica
12700a638a CP-16075: Fix the diff file, after some lines have been removed in a previous commit
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-12 12:20:15 +00:00
Stephen Turner
95b395401d Merge pull request #831 from MihaelaStoica/CP-16068
CP-16068: Pick up new RPU hotfixes
2016-02-12 12:15:11 +00:00
Mihaela Stoica
7a46698141 CP-16068: Pick up new RPU hotfixes
- XenCenter build system picks up the RPU hotfixes from Artifactory
- RPU001 and RPU002 replace XS62E006 and XS65ESP1006
- Removed hotfixes from the solution, moved  XS60E001 to Branding folder
- also cleaned up code in the HotfixFactory class, removing MNR and Cowley hotfixes (not supported anymore)

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-11 22:18:06 +00:00
Gabor Apati-Nagy
eb9bd591aa Merge remote-tracking branch 'github_xenadmin/master' into inst
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

Conflicts:
	WixInstaller/XenCenter.l10n.diff
	WixInstaller/XenCenter.wxs
2016-02-11 18:55:54 +00:00
Gabor Apati-Nagy
2be155f4b5 CP-16075: Removed unneeded lines from diff
This makes sure the latest changes to the WXS will not brake the diff.
2016-02-10 14:43:47 +00:00
Gabor Apati-Nagy
7e67c37e99 CP-16075: Installer: HealthCheckService as subcomponent 2016-02-10 14:41:57 +00:00
Mihaela Stoica
9f99c37f83 CP-16012: Rename branding variables
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-10 11:52:30 +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
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
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
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
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
38a50e1754 CP-15404: Make install dir rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-02 09:45:04 +08: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
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
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
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
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
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
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
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
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
b74ae83300 CP-15396: Rename dir of XenAdmin-Branding to Branding
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-11 17:28:31 +08:00
Cheng Zhang
a9214c3463 CP-15396: Use xenadmin-branding and change the location of icons
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-08 16:29:59 +08:00
Stephen Turner
d0e955ff0d CP-14647: Remove two deleted files from the wxs file 2015-11-09 15:49:29 +00:00
Mihaela Stoica
cf8de9ae86 CA-179515: Move to online help: update the installer not to install the .chm
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2015-10-09 13:22:05 +01:00
Gabor Apati-Nagy
2dc496491d CP-13390: Update XenCenter installer to require .NET 4.5
fix for XenCenter.l10n.diff
2015-08-06 16:15:57 +01:00
Gabor Apati-Nagy
32c36118db CP-13390: Update XenCenter installer to require .NET 4.5 2015-08-05 17:53:08 +01:00
Mihaela Stoica
b62f8c4cd3 CA-176895: [CAR-1866] Include XS 6.5 RPU hotfix in XenCenter
- changed the build script and the installer to copy the XS65ESP1006.xsupdate hotfix
- also updated the source package for XS62E006 hotfix
2015-07-22 12:51:58 +01:00
Gabor Apati-Nagy
8d79f8a1e1 CP-13248: Installer: Install the Service by default. (Feature will be selected, but users can disable it) 2015-07-20 18:10:31 +01:00
Sorin Sbarnea
93280441aa Made the build output less verbose by default and configured wget not to download files again if they already exists locally with the same datetime stamps. 2015-07-19 20:12:38 +01:00
Sorin Sbarnea
2d6ff407f9 Corrected line endings for WIX patch and added few missing temp dirs to gitignore. 2015-07-19 19:06:59 +01:00