Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-12-22 08:26:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,480 Commits 12 Branches 48 Tags 186 MiB
d3a50d73fb
Commit Graph

3480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
f7e0f61093 Merge pull request #832 from stephen-turner/CA-198487 
CA-198487: Log at Info level not Debug level
 2016-02-12 12:22:28 +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
Stephen Turner
e940ed8bb0 CA-198487: Log at Info level not Debug level 2016-02-12 11:29:19 +00:00
Mihaela Stoica
f2fc3a3116 Merge pull request #828 from GaborApatiNagy/inst 
CP-16075: Installer improvement
 2016-02-12 10:17:21 +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
efe9c807b3 Merge pull request #827 from MihaelaStoica/rename 
CP-16012: Rename branding variables
 2016-02-10 15:19:29 +00:00
Gabor Apati-Nagy
98f5c06f18 Merge pull request #823 from MihaelaStoica/CA-198187 
CA-198187: All images included in xenadmin project should appear in t…
 2016-02-10 15:18:43 +00:00
Gabor Apati-Nagy
b211ab4a09 Merge pull request #821 from MihaelaStoica/CA-197388 
CA-197388: Fix error where License Manager displays "Standard feature…
 2016-02-10 15:18:23 +00:00
Gabor Apati-Nagy
8d400f74c6 CP-16075: Fixing a fix in a diff of a diff... 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-10 15:03:18 +00:00
Gabor Apati-Nagy
5cb004547b Merge branch 'inst' of https://github.com/GaborApatiNagy/xenadmin into inst 2016-02-10 14:51:00 +00:00
Gabor Apati-Nagy
24a7648397 CP-16075: typo fix in diff 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-10 14:49:22 +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
Gabor Apati-Nagy
016c967e29 CA-182819: Changed the layout of the CustomizeDialog 
to have more space for the SelectionTree control. This will be needed when changing the features to be hierarchically displayed.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-10 14:32:53 +00:00
Mihaela Stoica
4263d2f152 Merge pull request #822 from GaborApatiNagy/CA-196315 
CA-196315: XS65ESP1018 not showing up in XenCenter Updates (on staging)
 2016-02-10 13:40:51 +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
Gabor Apati-Nagy
9fdec14cd1 Merge pull request #826 from MihaelaStoica/master 
Fix null reference exception that can occur when running the tests
 2016-02-10 10:51:12 +00:00
Mihaela Stoica
acd2a52823 Fix null reference exception that can occur when running the tests 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-10 10:48:08 +00:00
Gabor Apati-Nagy
0834cdf559 Merge pull request #825 from MihaelaStoica/CP-15399 
CP-15399: Changed Branding.cs so that only the constants get rebranded
 2016-02-09 15:41:33 +00:00
Mihaela Stoica
040058924d CP-15399: Changed Branding.cs so that only the constants get rebranded 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-09 15:18:05 +00:00
Mihaela Stoica
272c753fdf Merge pull request #820 from stephen-turner/CA-194025 
CA-194025: Variable $date-of-software replaced with actual year.
 2016-02-08 17:10:39 +00:00
Mihaela Stoica
5f7a6abc5c CA-198187: All images included in xenadmin project should appear in the Images folder in solution explorer 
- also removed some references to non-existent image files

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-08 16:51:29 +00:00
Gabor Apati-Nagy
39ae204363 Merge remote-tracking branch 'github_xenadmin/master' 2016-02-08 10:14:25 +00:00
Gabor Apati-Nagy
b8e447afa3 CA-196315: XS65ESP1018 not showing up in XenCenter Updates (on staging) 
Fixed code to treat uuids of patches case-insensitive when consuming, but not changing them (eg. to lowercase) to keep compatibility with older XAPIs.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-08 10:14:05 +00:00
Mihaela Stoica
7b2a0c6922 CA-197388: Fix error where License Manager displays "Standard features only" for Premium edition 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-08 10:10:01 +00:00
Hui Zhang
73c8bf4604 CP-13123: Add two buttons on General Tab of docker container. 
1. Add "View Console" and "View Log" on general tab of docker container.
2. Grey the two buttons if the container is on Windows (Server 2016) VM.
3. Enable the two buttons when the container is running on Linux VM.

Signed-off-by: Hui Zhang <hui.zhang@citrix.com>
 2016-02-06 15:34:09 +08:00
Stephen Turner
e36cc9f6e0 Merge pull request #819 from ushamandya/master 
CP-15481: Updated Migrate VMs, NFS, and SMB topics
 2016-02-05 16:07:18 +00:00
Stephen Turner
9906cf561f CA-194025: Variable $date-of-software replaced with actual year. 
I used the year the code was added to XenCenter: it may be older than that,
but I couldn't easily find out the exact date.

I also made the LegalNoticesDialog resizable, because it's silly trying to
read the legal notices in a teeny tiny window.
 2016-02-05 16:01:25 +00:00
Usha Mandya
dd0f639784 CP-15481: Updated Migrate VMs, NFS, and SMB topics 2016-02-05 15:59:17 +00:00
Mihaela Stoica
a1e2032e65 Merge pull request #818 from MihaelaStoica/CP-15405 
CP-15405: Build scripts changes
 2016-02-05 12:08:35 +00:00
Mihaela Stoica
265f52d823 Merge pull request #812 from GaborApatiNagy/master_CA-153143 
CA-153143: [SCTX-1925] Workflow bug in adding a VIF
 2016-02-05 11:57:48 +00:00
Mihaela Stoica
f0a1f37472 CP-15405: Add support for writing the latest-successful-build file to a different repository 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-05 11:52:42 +00:00
Mihaela Stoica
ec5ac17b48 CP-15405: Fix build failure (XenCenter.wxs not found) 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-05 11:42:47 +00:00
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
Gabor Apati-Nagy
618283e051 CP-15710: Code to Construct an Update Sequence 
Comments

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-03 12:00:41 +00:00