Commit Graph

1467 Commits

Author SHA1 Message Date
Milamber
9b3a553efd Update L10N resource files on 4.4 branch with 4.4 translation strings from Transifex (20150730) 2015-07-30 11:20:09 +01:00
Daan Hoogland
412016567f Updating pom.xml version numbers for release 4.4.5-SNAPSHOT
Signed-off-by: Daan Hoogland <daan@onecht.net>
2015-06-24 21:44:59 +02:00
Daan Hoogland
eccd94dda1 Merge branch '4.4-RC20150618T1117' into 4.4 2015-06-24 21:35:37 +02:00
Daan Hoogland
6f41061e14 Updating pom.xml version numbers for release 4.4.4
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
2015-06-18 11:17:09 +02:00
Milamber
824c101aba Update L10N resource files on 4.4 branch with 4.4 translation strings from Transifex (20150618)
Signed-off-by: Milamber <milamber@apache.org>
2015-06-18 07:39:15 +00:00
Milamber
11d99b0ca8 Update L10N resource files on 4.4 branch with 4.4 translation strings from Transifex (20150522) 2015-05-22 07:49:11 +01:00
Milamber
b82ebb74eb Fix some typo
Thanks Atalanttore from Transifex way
2015-04-19 15:21:00 +01:00
Daan Hoogland
28bcd6aeb7 Updating pom.xml version numbers for release 4.4.4-SNAPSHOT
Signed-off-by: Daan Hoogland <daan@onecht.net>
2015-04-19 15:52:25 +02:00
Daan Hoogland
a22c334be5 Merge branch '4.4-RC20150415T1700' into 4.4 2015-04-19 15:48:06 +02:00
Milamber
bd4ef5f4e1 Update L10N resource files on 4.4 branch with 4.4 translation strings from Transifex 2015-04-19 10:01:08 +01:00
Daan Hoogland
e9441d4786 Updating pom.xml version numbers for release 4.4.3
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2015-04-15 17:00:24 -05:00
Harikrishna Patnala
f68b407283 CS-17504: Weak SSL ciphers supported by the management server
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f947fad197)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	packaging/centos63/cloud.spec
2015-03-16 15:50:26 +05:30
Min Chen
84c6cc361b CS-19734:Session cookie is exposed to scripts.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 0b5b9c91e4)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-16 15:49:33 +05:30
Rohit Yadav
0269456152 CLOUDSTACK-8160: use preferable protocols
(cherry picked from commit debfcdef78)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	client/tomcatconf/server7-nonssl.xml.in
	client/tomcatconf/server7-ssl.xml.in
	plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java
	pom.xml
	services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
	utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
2015-01-21 18:11:38 +05:30
Jessica Wang
5e5d830635 CLOUDSTACK-5576: UI > IP Address > EnableVPN, DisableVPN: change label.
(cherry picked from commit e796d418b4)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	ui/scripts/network.js

Conflicts:
	ui/scripts/network.js
2014-12-11 20:51:56 +05:30
Daan Hoogland
7e409ea300 Updating pom.xml version numbers for release 4.4.3-SNAPSHOT
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-11-25 15:36:02 +01:00
Daan Hoogland
e0420a6fec Updating pom.xml version numbers for release 4.4.2
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-11-21 03:41:26 +01:00
Milamber
87b1aa2c93 Update L10N resource files on 4.4 branch with 4.4 translation strings from Transifex 2014-11-15 08:55:01 +00:00
Daan Hoogland
b9620c2cbe Updating pom.xml version numbers for release 4.4.2-SNAPSHOT
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-10-19 20:46:15 +02:00
Hugo Trippaers
b4601be4bf CLOUDSTACK-6892 Create separate package for the mysql HA component
(cherry picked from commit 539db08956)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	packaging/centos63/cloud.spec
2014-08-20 12:11:37 +02:00
Jessica Wang
d0ff6cd461 CLOUDSTACK-6695: Added support to the UI for uploading a chain of certificates
In the "SSL Certificate" dialog we added:
- new field for the root certificate;
- a button to add intermediate certificates if necessary; when this is pressed, a new field, called "Intermediate certificate 1" is added; pressed again, "Intermediate certificate 2" field is added, and so on.

We upload the certificates in order: first the root certificate (with id=1), then the intermediate certificates (with id=2,3,..) and finally the server certificate.
When uploading a certificate, we wait for the upload to be completed successfully and only then we proceed to uploading the next one. If one fails, we report failure and don't continue with the remaining.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2014-08-08 11:39:38 -07:00
Nitin Mehta
6f709f59cc CLOUDSTACK-7000: ListSnapshotPolicy should list by policyid. Introduce updateSnapshotPolicy command
(cherry picked from commit fce21439fa)

Conflicts:
	api/src/com/cloud/event/EventTypes.java
2014-07-30 13:31:14 +02:00
Koushik Das
25b4159723 CLOUDSTACK-6445: Simulator enhancements
Refer FS - https://cwiki.apache.org/confluence/display/CLOUDSTACK/Simulator+enhancements

(cherry picked from commit 617826d16b)
2014-07-28 13:58:55 +02:00
Daan Hoogland
c9383c441e Updating pom.xml version numbers for release 4.4.1-SNAPSHOT
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-07-23 16:55:31 +02:00
Milamber
d6a92b4c59 Update L10N strings from Transifex to repo (before 4.4 next RC) 2014-06-12 07:55:42 +01:00
Min Chen
6ba541afb7 Disable IAM feature from 4.4 release.
Conflicts:
	test/integration/smoke/test_vm_iam.py
2014-05-21 13:49:11 +02:00
Alena Prokharchyk
c94158f0fd CLOUDSTACK-6659: fixed the name for the updateIpAddress API command 2014-05-13 23:23:28 +02:00
Alena Prokharchyk
a3825f126f CLOUDSTACK-6596: UUID and display flag update support for LBStickinessPolicy and LBHealthCheckPolicy 2014-05-08 09:48:27 +02:00
Milamber
bed54474d1 Update L10N strings from Transifex to repo (before 4.4 RC1) 2014-05-04 00:46:29 +01:00
Milamber
735b910832 Remove bad backslash near "label.nicira.nvp.details" key. 2014-05-03 23:39:36 +01:00
Gabor Apati-Nagy
b6fabfecf2 CLOUDSTACK-6255
UI for supporting region level VPC, distributed routing enabled VPC and
stretched L2 neworks
2014-04-28 18:45:54 +02:00
Mihaela Stoica
eee8a04dab CLOUDSTACK-6233: Add new tab "GPU" in Host detailView for gpu enabled hosts
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
Signed-off-by: Sanjay Tripathi <sanjay.tripathi@citrix.com>
2014-04-16 15:36:52 +05:30
Brian Federle
3263822bf4 CLOUDSTACK-6342: UI changes for secondary IP on LB rules
This is front-end only; API call changes still need to be done.
2014-04-15 14:48:03 -07:00
Brian Federle
9427f61630 Fix missing localization strings caused by merge issue 2014-04-03 13:57:43 -07:00
Brian Federle
74c947b655 Add some missing localization strings 2014-04-02 14:15:39 -07:00
Milamber
685d664909 Add 4.4 UI resources files on Transifex 2014-04-01 19:30:24 +01:00
Brian Federle
0d160e8198 CLOUDSTACK-6272: Fix recover/restore VM actions
-Label recoverVirtualMachine as 'Recover VM'
-Label restoreVirtualMachine as 'Reinstall VM'
-Change confirmation text for restoreVirtualMachine to be more explicit
-Change restoreVirtualMachine icon to 'recycle' symbol, to avoid
 confusion with the reboot VM icon
2014-03-21 13:30:19 -07:00
punith-cloudbyte
342696f271 cloudbyte storage plugin for master commit 2014-03-19 16:37:49 -07:00
Jessica Wang
831f513188 CLOUDSTACK-6246: UI > Infrastructure > SSL Certificate > update (1) mouse-over hint of SSL Certificate button. (2) description in SSL Certificate dialog. 2014-03-17 15:55:50 -07:00
Prachi Damle
fa80c63c33 Removing the copy task that is not needed any more.
We do not need to copy commands.properties to utils anymore since the IAM permissions are no longer loaded during Upgrade
2014-03-13 14:14:12 -07:00
Min Chen
99bdc8d875 Merge branch 'master' into rbac. 2014-03-13 11:05:03 -07:00
amogh.vasekar
3ee1fc28de CLOUDSTACK-6217:
Add APIs for ability to add new guest OS types, and their hypervisor specific mappings.
The table guest_os_hypervisor is currently maintained but not used, and the APIs reuse the same

Signed off by: Nitin Mehta <nitin.mehta@citrix.com>
2014-03-12 17:03:38 -07:00
Mihaela Stoica
36558e4619 Corrected the value of label.no.grouping in the resource files. An extra backspace at the end of the string caused incorrect text to be shown in the Select view dropdown on Virtual Routers page: "(no grouping)\label.create.nfs.secondary.staging.storage=Create NFS Secondary Staging Store" instead of "(no grouping)"
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2014-03-11 11:25:18 -07:00
Min Chen
48e08fe676 Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
vetrivelc
182c31899b Externalized the hardcodedstrings from UI JAVASCRIPT files. 2014-03-05 14:11:51 -08:00
Gabor Apati-Nagy
477902379e Fix CLOUDSTACK-4563: Initial zone wizard UI label issue 2014-03-03 10:19:03 -08:00
Hugo Trippaers
3beb75cdf1 Fix typo 2014-02-27 12:59:34 +01:00
Hugo Trippaers
a0f932437c Move mysql ha strategy to a plugin. Activate this plugin using the mysqlha profile or the noredist flag 2014-02-27 09:51:02 +01:00
Min Chen
9f47466fea Fix some issues in renaming iam api, also fix marvin library. 2014-02-26 17:30:34 -08:00
Konstantina Chremmou
f05fb9fb61 Fixed some resource files issues, namely 1) invalid text and duplicate keys resulting from bad merge and 2) trailing spaces which can potentially cause UI issues.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Reviewed-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-25 22:05:06 +01:00