Commit Graph

26 Commits

Author SHA1 Message Date
Mihaela Stoica
54c7ff3c29 Merge pull request #1570 from xenserver/master
Merge master into REQ-378
2017-05-03 09:43:42 +01:00
Mihaela Stoica
8a4a2ab716 CP-21904: Update RPU hotfixes in XenCenter
- Added RPU004 for Ely and updated the code to upload and apply the iso format hotfix

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2017-04-20 10:36:27 +01:00
Kun Ma
6dc10c1490 CP-19453: XenCenter: Add mail-language to other-config parameters when configure e-mail options
Signed-off-by: Kun Ma <kun.ma@citrix.com>
2017-04-01 11:21:21 +08:00
Mihaela Stoica
be5500e250 CA-246344: Update the script with the new folder structure to fix the build
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2017-03-08 16:33:57 +00:00
Konstantina Chremmou
83d92aa573 Merge remote-tracking branch 'upstream/master' into CAR-2205
# Conflicts:
#	Branding/branding.sh
#	mk/archive-unsigned.sh
#	mk/build.sh
#	mk/bumpBuildNumber.sh
#	mk/copy-build-output.sh
#	mk/declarations.sh
#	mk/tests-checks-cover.sh
#	mk/tests-checks.sh
2017-01-24 13:54:42 +00:00
Gabor Apati-Nagy
c8116a46ab CA-176169: Further copyright statement changes
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-01-18 17:07:59 +00:00
Konstantina Chremmou
88b7cd53b4 CP-20149: Build overhaul: build XenCenter using a Jenkinsfile.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2017-01-18 13:48:42 +00:00
Konstantina Chremmou
44fb5a11a3 Corrected comparison.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2016-12-15 15:26:44 +00:00
Konstantina Chremmou
bedd0f7b44 Moved the code printing out the tip of the branding repo to the branding script
so it can be overriden.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2016-12-13 12:50:54 +00:00
Konstantina Chremmou
b68e0bd731 Removed duplicate variable.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2016-12-07 08:59:27 +00:00
Konstantina Chremmou
d33832dea6 Change location where the product versions are to be found. Retrieve it from the
source repo instead of the latest build (where it is output within an rpm which
XenCenter does not really need to consume).

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2016-12-02 11:51:51 +00:00
Callum McIntyre
5cb4cc8ba1 Add the branding for 6.0 to branding.sh and re-branding.sh 2016-10-21 10:58:32 +01:00
Cheng Zhang
76f7946ec4 CA-213045: Make server backup file name rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-06-30 10:31:10 +08:00
Mihaela Stoica
abfa51a64f Fix Unbound variable
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-05-13 00:39:24 +01:00
Gabor Apati-Nagy
e64779b4ce Merge pull request #868 from MihaelaStoica/CP-16205
CP-16205: Add AdditionalFeatures branding variable
2016-03-02 13:30:25 +00:00
Mihaela Stoica
d358b2ddb2 CA-202103: Add branding variable for version 7.0
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-29 15:08:01 +00:00
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
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
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
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
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
91f7f0646f CP-15398: Make version rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-20 11:33:07 +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
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
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