Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-12-21 07:56:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,481 Commits 12 Branches 48 Tags 186 MiB
be5aeae819
Commit Graph

4481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ji Jiang
be5aeae819 CA-249852: Add license status in pool general tab 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-10-12 13:50:24 +01:00
Joey
e4e423a05c Merge pull request #1813 from MihaelaStoica/master 
Merge REQ-528 into master
 2017-10-12 12:09:42 +01:00
Mihaela Stoica
8fbfe4c060 Merge branch 'REQ-528' into master 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

Conflicts:
	XenAdmin/MainWindow.Designer.cs
 2017-10-12 11:39:19 +01:00
Mihaela Stoica
7ba7b70a2c Merge pull request #1804 from vetrivelc/master 
L10N: CA-259356 Fixed button truncation in JA
 2017-10-12 10:47:12 +01:00
Mihaela Stoica
3eed721f64 Merge pull request #1810 from jijiang/CA-268683 
CA-268683: Turn on disable HA on unlicensed pool
 2017-10-11 17:07:49 +01:00
Ji Jiang
225474f913 CA-268683: Turn on disable HA on unlicensed pool 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-10-11 14:58:10 +01:00
Mihaela Stoica
3c284a463a Merge pull request #1809 from jijiang/CA-266843 
CP-266755 & CA-266843: Fix XC brand string improve
 2017-10-11 14:17:47 +01:00
Ji Jiang
ea16c33c0c CP-266755 & CA-266843: Fix XC brand string improve 
Fix the comment about the repetitive script code.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-10-11 12:16:02 +01:00
Gabor Apati-Nagy
010a5189ac Merge pull request #1803 from jijiang/CA-266843 
CP-266755 & CA-266843: Fix XC brand string
 2017-10-11 12:00:52 +01:00
Gabor Apati-Nagy
4a574a8728 Merge pull request #1807 from MihaelaStoica/CA-266814 
CA-266814: Fix the precheck that requires shared CDs to be ejected pr…
 2017-10-10 14:09:03 +01:00
Mihaela Stoica
be8f2c6897 CA-266842: Rebrand FriendlyErrorNames 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-10-09 16:56:59 +01:00
Mihaela Stoica
91de7501c4 CA-266814: Fix the precheck that requires shared CDs to be ejected prior to update installation 2017-10-09 16:34:59 +01:00
vetrivelc
795612720e L10N: CA-259356 Fixed button truncation in JA 2017-10-09 12:53:23 +05:30
Ji Jiang
89bc74583f CP-266755 & CA-266843: Fix XC brand string 
Following pattern would be caught when using "XenCenter" "XenServer" and
"Citrix":
1) not "[" or "/" or """ on left of the brand string
2) brand string followed by space followed by not "p", and optional letter
3) optional letter followed by space followed by the brand string
4) brand string followed by "," and optional letter
5) begin with the brand string
6) end with the brand string

tested with all .resx files

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-10-06 13:30:31 +01:00
Gabor Apati-Nagy
9ddcdfa7d0 Merge pull request #1801 from MihaelaStoica/master 
CA-268105: fix the bug where the pool item is disabled when an update…
 2017-10-06 11:28:51 +01:00
Mihaela Stoica
b79d7923cc CA-268105: fix the bug where the pool item is disabled when an update is already installed on one host in the pool 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-10-04 16:48:58 +01:00
Mihaela Stoica
d2d7fbdaba Merge pull request #1800 from MihaelaStoica/master 
Merge REQ-67 into master
 2017-10-04 16:15:53 +01:00
Mihaela Stoica
20d79ad6f4 Merge remote-tracking branch 'upstream/REQ-67' 
Conflicts:
	XenModel/Messages.Designer.cs
 2017-10-04 14:40:01 +01:00
Mihaela Stoica
d2c80cddbc Merge pull request #1799 from jijiang/master 
CA-267553: Fix offline XC showing up to date bug
 2017-10-03 20:33:18 +01:00
Ji Jiang
2f41bbfde1 CA-267553: Fix offline XC showing up to date bug 
Refactor the code.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-10-03 18:00:48 +01:00
Mihaela Stoica
a62c04a3a9 Merge pull request #1798 from GaborApatiNagy/master_CA-266911 
CA-266911: Exported data from Notification->updates page having incorrect values for "Web page"column
 2017-10-03 17:57:26 +01:00
Mihaela Stoica
e6a6a9cc83 Merge pull request #1790 from jijiang/master 
CA-267553: Fix offline XC showing up to date bug
 2017-10-03 17:52:35 +01:00
Gabor Apati-Nagy
b49c14fd92 CA-266911: Exported data from Notification->updates page having incorrect values for "Web page"column 
Displaying the full "Go to web page" URLs in the exported csv file

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2017-10-03 16:42:48 +01:00
Ji Jiang
7fa784ba96 CA-267553: Fix offline XC showing up to date bug 
Fix comments about considering whether XS version is found in updates XML file.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-10-03 15:32:57 +01:00
Mihaela Stoica
2cb1ab3040 Merge pull request #1795 from GaborApatiNagy/master_CP-24818 
CP-24818: [Update Wizard Improvements] Show the progress of the download in Automated mode
 2017-10-03 14:57:09 +01:00
Gabor Apati-Nagy
c00439bef4 CP-24818: [Update Wizard Improvements] Show the progress of the download in Automated mode 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2017-10-02 16:35:10 +01:00
Gabor Apati-Nagy
e4c56c3f65 Merge pull request #1793 from MihaelaStoica/REQ-528 
CP-24708: Fix the tests
 2017-09-29 13:19:25 +01:00
Mihaela Stoica
9431752d54 CP-24708: Fix the tests 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-09-29 12:48:36 +01:00
Mihaela Stoica
f983dd9e90 Merge pull request #1792 from GaborApatiNagy/master_REQ-411_merge 
Merge REQ-411 into master
 2017-09-29 12:12:09 +01:00
Gabor Apati-Nagy
a8db7bfae9 Merge remote-tracking branch 'github_xenadmin/REQ-411' into master_REQ-411_merge 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

Conflicts:
	XenAdmin/Core/Updates.cs
	XenAdmin/TabPages/ManageUpdatesPage.cs
	XenAdmin/Wizards/PatchingWizard/PatchingWizard_PrecheckPage.cs
	XenModel/Messages.Designer.cs
 2017-09-29 11:56:46 +01:00
Gabor Apati-Nagy
0cc907bb14 CP-24709: Add a warning in the New VM wizard and Import wizard if the pool is licensed using XD/XA entitlement (#1791) 
* CP-24709: Add a warning in the New VM wizard and Import wizard if the pool is licensed using XD/XA entitlement

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

* CP-24709: Add a warning in the New VM wizard and Import wizard if the pool is licensed using XD/XA entitlement

Fixed unintended designer code additions/changes

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2017-09-29 11:05:57 +01:00
Ji Jiang
a70307a3a6 CA-267553: Fix offline XC showing up to date bug 
The bug is that when XC does not connect to Internet, By Server Update
page shows all the hosts up to date.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-29 10:44:50 +01:00
Gabor Apati-Nagy
39026f300e CP-24707: Add license status information to the title bar for pool and hosts (#1783) 
* CP-24707: Add license status information to the title bar for pool and hosts

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

* CP-24707: Add license status information to the title bar for pool and hosts

Show expired licenses as Unlicensed in the Header

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

* CP-24707: Add license status information to the title bar for pool and hosts

Improvements, fixes following the code review

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

* CP-24707: Add license status information to the title bar for pool and hosts

More code to make it nicer

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

* CP-24707: Add license status information to the title bar for pool and hosts

More code to make it even more nicer

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2017-09-28 16:10:41 +01:00
Mihaela Stoica
21b941c20a Merge pull request #1784 from jijiang/REQ-528 
CP-24708: Show different unlicensed pool/host icon
 2017-09-28 14:11:54 +01:00
Mihaela Stoica
7f10e98727 Merge pull request #1787 from jijiang/master 
REQ-534: Fix some UI text display
 2017-09-27 16:50:39 +01:00
Ji Jiang
268b19421f REQ-534: Fix some UI text display 
Based on comments from doc team:
1) Column title "Patching Status" should be replaced by "Status" in csv file
2) In View dropdown, "By Host" should be replaced by "By Server"

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-27 15:14:15 +01:00
Mihaela Stoica
f43b607879 Merge pull request #1778 from jijiang/REQ-67-update 
Add message alert, license check and warning msg to CBT
 2017-09-27 13:19:23 +01:00
Ji Jiang
41df6e5c35 Fix alert message based on comments 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-27 12:57:25 +01:00
Joey
e971f0aff4 Merge pull request #1785 from MihaelaStoica/REQ-566 
CP-24498: RPU wizard to block the selection of unlicensed hosts
 2017-09-27 11:53:47 +01:00
Mihaela Stoica
99cd1423e4 CP-24498: RPU wizard to block the selection of unlicensed hosts 
Fixed the tests

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-09-27 11:43:55 +01:00
Ji Jiang
d0687e5ae3 CP-24708: Show different unlicensed pool/host icon 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-27 11:30:12 +01:00
Gabor Apati-Nagy
fb3cd9fc32 Merge pull request #1782 from MihaelaStoica/REQ-566 
CP-24498: RPU wizard to block the selection of unlicensed hosts
 2017-09-26 15:04:24 +01:00
Mihaela Stoica
8464712335 CP-24498: RPU wizard to block the selection of unlicensed hosts 
Changes following code review

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-09-26 15:01:35 +01:00
Ji Jiang
37499d81b6 CP-24477: Add licence check for CBT feature 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-25 18:19:15 +01:00
Ji Jiang
cb97e3788e CP-24405: Add message alert for CBT error msg 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-25 15:14:53 +01:00
Ji Jiang
a63ca0a030 CP-24344: Add HelpID and warning when disable CBT 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-25 15:14:09 +01:00
Mihaela Stoica
0e5f1335d4 CP-24498: RPU wizard to block the selection of unlicensed hosts 
Also includes some improvements to the Select Pools page of the RPU wizard
- do not show the checkbox if the item is disabled
- show the icon for the pool items, not only for hosts (making this consistent with the similar page in the Update Wizard)

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-09-25 13:27:06 +01:00
Mihaela Stoica
f32e0a710b Merge pull request #1780 from jijiang/CP-24704 
CP-24704: Add pool size license check
 2017-09-25 12:18:14 +01:00
Ji Jiang
0018981782 CP-24704: Add pool size license check 
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
 2017-09-25 09:53:37 +01:00
Mihaela Stoica
43a7533271 Merge pull request #1781 from MihaelaStoica/master 
Sort Messages.resx
 2017-09-23 02:20:30 +01:00