cloudstack/ui/scripts
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
..
ui Merge branch 'master' into vpc 2012-07-27 13:47:46 -07:00
ui-custom Merge branch 'master' into vpc 2012-07-27 13:47:46 -07:00
accounts.js CS-15392: Add error handling to edit user action 2012-07-09 14:54:15 -07:00
cloud.core.callbacks.js applying Chip Childer's patches for license headers in the ui directory 2012-06-26 10:46:53 -04:00
cloudStack.js cloudstack 3.0 UI - fix space problem from a patch 2012-06-27 14:11:25 -07:00
configuration.js cloudstack 3.0 UI - VPC - add network offering dialog - when service(s) has VPC Virtual Router as provider: (1) conserve mode is set to unchecked and grayed out. (2) redundant router capability checkbox is set to unchecked and grayed out. (3) remove Firewall service, SecurityGroup service. 2012-07-20 14:28:20 -07:00
dashboard.js applying Chip Childer's patches for license headers in the ui directory 2012-06-26 10:46:53 -04:00
domains.js CS-13535: Error handling for add domain operation 2012-06-27 16:20:30 -07:00
events.js applying Chip Childer's patches for license headers in the ui directory 2012-06-26 10:46:53 -04:00
globalSettings.js applying Chip Childer's patches for license headers in the ui directory 2012-06-26 10:46:53 -04: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 cloudstack 3.0 UI - VPC - tier - implement "Add VM to tier" action. 2012-07-20 15:44:45 -07:00
instances.js TAGS feature implementation throughout CloudStack UI 2012-07-24 15:36:43 -07:00
lbStickyPolicy.js cloudstack 3.0 UI - VPC - add LB rule - fix a JS error "args.context.networks is undefined" when configure stickiness. 2012-07-20 16:10:35 -07:00
network.js VPC UI: IP address configuration fix 2012-07-26 16:13:57 -07:00
projects.js CS-15317: Fix operations with accounts on the Project tab after making another account project owner. 2012-07-27 18:23:07 +03:00
sharedFunctions.js rbd: Small JavaScript fix 2012-07-27 08:44:17 +02:00
storage.js TAGS feature implementation throughout CloudStack UI 2012-07-24 15:36:43 -07:00
system.js Merge branch 'master' into vpc 2012-07-27 13:47:46 -07:00
templates.js CS-15292: Split long OS Type list when create Template,ISO. 2012-07-25 12:05:05 +03:00
vpc.js Cleanup formatting/whitespace 2012-07-26 15:40:24 -07:00
zoneWizard.js cloudstack 3.0 UI - VPC - add zone wizard - enable VpcVirtualRouter element, enable VpcVirtualRouter provider for advanced zone. 2012-07-20 15:49:13 -07:00