Gabor Apati-Nagy
6cf7776795
CP-16097: Hide Thin Provosioning in XenCenter
...
Commented code out only for easier reverting.
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-02-17 11:42:19 +00:00
Gabor Apati-Nagy
f2d18520c9
Merge pull request #842 from cheng-z/CA-198924
...
CA-198924: Fix typo in CN resource
2016-02-16 12:04:19 +00:00
Cheng Zhang
2fc4185a4e
CA-198924: Fix typo in CN resource
...
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-16 19:30:33 +08:00
Gabor Apati-Nagy
755aa729e8
Merge pull request #841 from cheng-z/CA-198903
...
CA-198903: Fix unsigned package build failure
2016-02-16 11:25:58 +00:00
Gabor Apati-Nagy
977d4c0c76
Merge pull request #810 from huizh/CP-13123
...
CP-13123: Add two buttons on General Tab of docker container.
2016-02-16 11:25:33 +00:00
Cheng Zhang
6d2a4d06fc
CA-198903: Fix unsigned package build failure
...
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-16 15:32:15 +08:00
Stephen Turner
72b76f4356
Merge pull request #830 from GaborApatiNagy/master_CP-15402
...
CP-15402: New Home Page (html based)
2016-02-15 17:48:10 +00: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
Hui Zhang
c5d9445684
CP-13124: Use SSH private key for docker guest VM authentication.
...
1. Specify the key file location and name.
2. Update of the file name of docker command.
Signed-off-by: Hui Zhang <hui.zhang@citrix.com>
2016-02-15 18:24:37 +08:00
Stephen Turner
fe29a0bb7d
Merge pull request #835 from MihaelaStoica/CP-15576
...
CP-15576: Hide containers options that aren't available for Windows S…
2016-02-14 22:15:23 +00:00
Hui Zhang
784804c8d8
CP-13124: Invoke Putty, SSH to VM and run docker command.
...
1. Run 'docker attach' if user clicks 'View Console' button.
2. Run 'docker logs' if user clicks 'View Log' button.
3. Make IPAddressForSSH a property of VM for common usage.
Signed-off-by: Hui Zhang <hui.zhang@citrix.com>
2016-02-14 15:14:44 +08:00
Stephen Turner
5cf362cec4
Merge pull request #838 from stephen-turner/CA-198276
...
CA-198276: Fix tab order on modified pages
2016-02-12 18:54:11 +00:00
Stephen Turner
cf5b61ac7e
CA-198276: Fix tab order on modified pages
2016-02-12 18:52:31 +00:00
Stephen Turner
21fa6fd89c
Merge pull request #837 from ushamandya/master
...
CP-15481: Updated Help topics for SXM constraints removal, CPU Levelling,etc
2016-02-12 17:26:33 +00:00
Usha Mandya
d767f2fc54
CP-15481: Updated Help topics for SXM constraints removal, CPU Levelling, etc.
2016-02-12 17:19:59 +00:00
Mihaela Stoica
72619799d2
Merge pull request #836 from stephen-turner/CA-198276
...
CA-198276: Restrict number of sockets to 16
2016-02-12 17:18:41 +00:00
Stephen Turner
85c8cf0398
CA-198276: Restrict number of sockets to 16
2016-02-12 17:01:05 +00:00
Mihaela Stoica
cd8ed2d686
CP-15576: Hide containers options that aren't available for Windows Server
...
- Container pause is not available if the the container is on a Windows VM.
- Processes is not available if the the container is on a Windows VM.
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-12 16:48:52 +00:00
Stephen Turner
808f72422b
Merge pull request #834 from MihaelaStoica/CA-197622
...
CA-197622: Fixed exception "Unable to sort because the IComparer.Comp…
2016-02-12 16:24:58 +00:00
Mihaela Stoica
ac5eda5812
CA-197622: Fixed exception "Unable to sort because the IComparer.Compare() method returns inconsistent results"
...
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-12 16:19:12 +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
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