Commit Graph

939 Commits

Author SHA1 Message Date
Koushik Chakravarty
556229c0a1 CAR-2146: Removed enum typecast, fixed some texts in UI
Signed-off-by: Koushik Chakravarty <Koushik.Chakravarty@citrix.com>
2016-02-19 17:32:18 +05:30
Koushik Chakravarty
217264aae6 CAR-2146: Fixed FriendlyNames, removed CreateVMSS file and refactored some
code

Signed-off-by: Koushik Chakravarty <Koushik.Chakravarty@citrix.com>
2016-02-18 17:33:38 +05:30
Koushik Chakravarty
025e263a4c CAR-2146: Reworked and removed some more redundant code
Signed-off-by: Koushik Chakravarty <Koushik.Chakravarty@citrix.com>
2016-02-18 16:27:17 +05:30
Koushik Chakravarty
e13b2b7beb CAR-2146: Changed the SDK API naming terminology
Signed-off-by: Koushik Chakravarty <Koushik.Chakravarty@citrix.com>
2016-02-18 16:27:17 +05:30
Koushik Chakravarty
6889e15872 CAR-2146: Isolated type specific checks in VMGroup helper class
Signed-off-by: Koushik Chakravarty <Koushik.Chakravarty@citrix.com>
2016-02-18 16:27:17 +05:30
Koushik Chakravarty
d5db0335db CAR-2146: Initial Review comments incorporated
1. Changed the Messages to remove ambiguity between scheduled snapshots and
snapshot schedules
2. Made some functions as properties in IVMPolicy
3. Removed some redundant code

Signed-off-by: Koushik Chakravarty <Koushik.Chakravarty@citrix.com>
2016-02-18 16:27:17 +05:30
Koushik Chakravarty
89e16d46e7 CAR-2146: Changed short-cut key to unused value
Signed-off-by: Koushik Chakravarty <Koushik.Chakravarty@citrix.com>
2016-02-18 16:27:17 +05:30
Koushik Chakravarty
e11974d864 CAR-2146: Integrated new SDK changes, re-using existing VMPP Dialog
Signed-off-by: Koushik Chakravarty <Koushik.Chakravarty@citrix.com>
2016-02-18 16:27:17 +05:30
Koushik Chakravarty
e838a49814 CAR-2146: Removing Email page and some code review comment resolutions
Signed-off-by: Koushik Chakravarty <Koushik.Chakravarty@citrix.com>
2016-02-18 16:27:17 +05:30
Koushik Chakravarty
cf5040e9a9 CAR-2146: SDK Integration for VMSS and Testing
Signed-off-by: Koushik Chakravarty <Koushik.Chakravarty@citrix.com>
2016-02-18 16:27:17 +05:30
Koushik Chakravarty
2a3c62a931 CAR-2146: Added new VMSS Dialog, made text modifications in existing
wizard

Signed-off-by: Koushik Chakravarty <Koushik.Chakravarty@citrix.com>
2016-02-18 16:27:17 +05:30
Koushik Chakravarty
034063a708 CAR-2146: Sorted Messages file
Signed-off-by: Koushik Chakravarty <Koushik.Chakravarty@citrix.com>
2016-02-18 16:27:17 +05:30
Koushik Chakravarty
b3fe4aa2a3 CAR-2146: VMSS - Wizard modifications - framework ready
Signed-off-by: Koushik Chakravarty <Koushik.Chakravarty@citrix.com>
2016-02-18 16:27:17 +05:30
Stephen Turner
6949349830 Merge pull request #845 from GaborApatiNagy/master_CP-16097
CP-16097: Hide Thin Provosioning in XenCenter
2016-02-17 13:58:20 +00:00
Gabor Apati-Nagy
0f20df0f4b CP-16097: Hide Thin Provosioning in XenCenter
Added the same comment to all the changes

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-02-17 13:14:42 +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
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
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
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
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
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
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
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
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
Stephen Turner
e940ed8bb0 CA-198487: Log at Info level not Debug level 2016-02-12 11:29:19 +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
efe9c807b3 Merge pull request #827 from MihaelaStoica/rename
CP-16012: Rename branding variables
2016-02-10 15:19:29 +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
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
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
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
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
Rob Hoes
b9f4d24ca7 Use new SR.is_tools_sr and VDI.is_tools_iso fields to detect the Tools SR/VDI
If the new field is not present, we'll fall back to the old method, which is by
name_label (SR.is_tools_sr/VDI.is_tools_iso will be false in that case).

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
2016-01-29 15:40:49 +00:00
Rob Hoes
27bd60a77f Update to latest XenAPI bindings
Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
2016-01-29 15:40:49 +00:00
Cheng Zhang
352cb28270 CA-192539: Add CN resource for INCOMPATIBLE_PRODUCTS
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-29 14:35:03 +08:00
Mihaela Stoica
30aa9affc7 CP-14817: Add a check to refuse connection to a server that have different product brand
Change PRODUCT_BRAND to BRANDING_PRODUCT_BRAND

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

Conflicts:

	XenAdmin/Branding.cs
	XenAdmin/MainWindow.cs
	mk/xenadmin-build.sh
2016-01-29 14:26:53 +08:00
Cheng Zhang
4ba9981d28 Revert "CA-179515: Move to online help"
This reverts commit 0d0cf47523.

Conflicts:

	XenAdmin/Help/HelpManager.resx
	XenModel/InvisibleMessages.Designer.cs
	XenModel/InvisibleMessages.resx
2016-01-28 17:35:51 +08:00
Gabor Apati-Nagy
1990980228 Merge pull request #793 from MihaelaStoica/CP-15407
CP-15407: Update the function that calculates pool license
2016-01-27 13:35:49 +00:00
unknown
59226cd1aa CP-15407: Update the function that calculates pool license
Cherry-picked from cream-indigo:
CA-190393: Update the function that calculates pool license
- use Host.GetEdition function, as this function interprets xapi license string "basic" as Free license in XenCenter

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-26 16:39:43 +00:00
Mihaela Stoica
9e5bcb5488 CP-15394: Update FriendlyErrorNames.resx with unbranded error messages
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-26 15:16:48 +00:00
Gabor Apati-Nagy
249489220b Merge pull request #786 from MihaelaStoica/CP-15407
CP-15407: Add license editions
2016-01-26 11:32:54 +00:00
Mihaela Stoica
a53b23fe03 Merge pull request #788 from cheng--zhang/CP-15623
CP-15623: Remove Messages FEATURE_NOT_AVAILABLE_NEED_ENTERPRISE_OR_PL…
2016-01-26 09:32:25 +00:00