Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-12-30 07:40:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,811 Commits 12 Branches 48 Tags 186 MiB
10261a85e9
Commit Graph

2811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Turner
675ae4f057 Merge pull request #846 from ushamandya/master 
CP-15334, CP-16118: Modified XC Help topics for GVT-g and TLS SSL updates
 2016-02-17 12:48:30 +00:00
Usha Mandya
6c0cb6b267 CP-15334, CP-16118: Modified XC Help topics for GVT-g and TLS SSL updates 2016-02-17 12:33:54 +00:00
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
Cheng Zhang
900d152301 CA-198962: Fix compile error of rebranding 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-02-17 18:33:37 +08:00
Stephen Turner
5a6283c5ec Merge pull request #843 from GaborApatiNagy/homepage2 
CP-15402: Improvements to the new HomePage
 2016-02-17 09:31:52 +00:00
Gabor Apati-Nagy
27df0a609b CP-15402: HomePage 
Chanegd build script to pick up the mht file as well for translators

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-16 19:01:11 +00:00
Gabor Apati-Nagy
ccb57a3e79 CP-15402: HomePage: Added localized MHT files 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-16 18:54:20 +00:00
Gabor Apati-Nagy
f7961b3fbe CP-15402: HomePage 
Fixed css file to restore alignment to center. /* Note to myself: comments in css are like this note and not double slashes */
Removed bottom-padding so the scrollbars are not going to be shown too early

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-16 18:26:18 +00:00
Gabor Apati-Nagy
86f51c2125 CP-15402: New Home Page (html based) 
Fixed alphabetical order in InvisibleMessages
 2016-02-16 15:15:30 +00:00
Gabor Apati-Nagy
f5e833b230 CP-15402: New Home Page (html based) 
Localized the url of the Home Page. Globalization team can now reference different files per localization in InvisibleMessages.resx. (Eg. HomePage.ja.mht) The file then has to be added to XenAdmin.csproj, similarly to HomePage.mht.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-16 15:09:06 +00:00
Gabor Apati-Nagy
94b0f438c8 CP-15402: New Home Page (html based) 
Changed layout a bit to get rid of the scrollbars that appeared in a default sized XenCenter

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-16 14:47:04 +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
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
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
f0f883042a CP-15402: New Home Page (html based) 
Removed images that are now no longer needed.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-15 17:31:13 +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