Brian Federle 9ca7b82baa Merge branch 'master' into Health-Check-UI ...

Conflicts:
	ui/css/cloudstack3.css

2013-03-15 11:46:32 -07:00

..

autoscaler.js

CS-16078:AutoScale UI development- adding sec to Duration field

2012-11-16 10:56:53 +05:30

dashboard.js

Dashboard UI: Fix line breaks

2013-03-14 15:54:37 -07:00

enableStaticNAT.js

Pass VM guest IP to enable static NAT action

2013-03-08 14:38:37 -08:00

healthCheck.js

Adjusting the CSS attr for the delete button

2013-03-15 17:23:04 +05:30

installWizard.js

CLOUDSTACK-452: cloudstack UI - IPv6 - quick installer - rename fields in quick installer to be consistent with fields in zone wizard.

2013-03-05 12:07:55 -08:00

instanceWizard.js

CLOUDSTACK-748: Support deployment of VM on Tier + network

2013-03-14 12:53:39 -07:00

ipRules.js

applying Chip Childer's patches for license headers in the ui directory

2012-06-26 10:46:53 -04:00

login.js

CS-15325: Fix selected name of user from the drop down list overlay.

2012-07-27 16:27:59 +03:00

physicalResources.js

CLOUDSTACK-618: cloudstack UI - API request throttling - for async job action uploadCustomCertificate, make frequency of calling queryAsyncJobResult API based on listCapabilities response.

2013-02-13 11:55:59 -08:00

plugins.js

rat: Fix license for file from recent ui-plugins merge

2013-02-14 17:18:22 +05:30

projects.js

CS-16295: Fix select project search box

2012-11-01 12:17:39 -07:00

recurringSnapshots.js

The overlay still exists when the Recurring Snapshots dialog is cancelled by pressing the esc key

2013-01-28 11:13:06 +05:30

regions.js

Regions UI: Show (Default) in header if no regions are available

2013-02-28 16:02:19 -08:00

securityRules.js

applying Chip Childer's patches for license headers in the ui directory

2012-06-26 10:46:53 -04:00

uploadVolume.js

applying Chip Childer's patches for license headers in the ui directory

2012-06-26 10:46:53 -04:00

vpc.js

CS-16218: Only show VPC router details for ROOT admin

2012-08-30 11:01:02 -07:00

zoneChart.js

UI: Add quick view to table list

2012-10-10 11:18:02 -07:00

zoneWizard.js

CLOUDSTACK-1251: cloudstack UI - zBaremetal - zone wizard - when hypervisor is BareMetal, click Next button in Guest Traffic step will finish the whole process.

2013-02-13 11:55:05 -08:00