cloudstack/ui/scripts/ui-custom
Alena Prokharchyk a39fd61249 Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java
2012-07-27 13:47:46 -07:00
..
dashboard.js applying Chip Childer's patches for license headers in the ui directory 2012-06-26 10:46:53 -04:00
enableStaticNAT.js Add block to show/hide tier select 2012-07-10 15:41:23 -07:00
installWizard.js applying Chip Childer's patches for license headers in the ui directory 2012-06-26 10:46:53 -04:00
instanceWizard.js Merge branch 'master' into vpc 2012-07-27 13:47:46 -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 applying Chip Childer's patches for license headers in the ui directory 2012-06-26 10:46:53 -04:00
projects.js CS-15353: Larger click boxes in UI. 2012-07-25 11:54:45 +03:00
recurringSnapshots.js applying Chip Childer's patches for license headers in the ui directory 2012-06-26 10:46:53 -04: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 Cleanup formatting/whitespace 2012-07-26 15:40:24 -07:00
zoneChart.js applying Chip Childer's patches for license headers in the ui directory 2012-06-26 10:46:53 -04:00
zoneWizard.js CS-15353: Larger click boxes in UI. 2012-07-25 11:54:45 +03:00