Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							c11dbad9c9 
							
						 
					 
					
						
						
							
							merge master  
						
						
						
						
					 
					
						2013-05-11 15:28:43 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							35d8905081 
							
						 
					 
					
						
						
							
							Reset a VM detail view display  
						
						
						
						
					 
					
						2013-02-21 16:26:31 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							8e88a4295f 
							
						 
					 
					
						
						
							
							Reset a VM on reboot compute offering  
						
						
						
						
					 
					
						2013-02-15 23:11:27 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							bd825109d8 
							
						 
					 
					
						
						
							
							Persistent Networks support - UI functionality  
						
						
						
						
					 
					
						2013-02-01 16:41:29 +05:30 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							98a289020f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-652: cloudstack UI - create network offering dialog - for both Isolated network and Shared network, show Elastic IP dropdown when StaticNAT is checked and StaticNAT provider is Netscaler.  
						
						
						
						
					 
					
						2013-01-18 16:03:33 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							d13d67bdd9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-459: cloudstack UI - create network offering dialog - update comment in code.  
						
						
						
						
					 
					
						2013-01-18 15:11:46 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							5b7b47048b 
							
						 
					 
					
						
						
							
							Add missing tooltips  
						
						... 
						
						
						
						Add missing doc tooltips for the following dialogs:
-Add VPN customer gateway
-Add ISO
-Enter project token
-Add compute offering
-Add system offering
-Add network offering 
						
						
					 
					
						2012-12-07 13:19:37 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ec40aff931 
							
						 
					 
					
						
						
							
							CLOUDSTACK-459: cloudstack UI - create network offering - When capability ElasticIp=true is passed to API, if capability associatePublicIP=true/false is not passed to API, cloudStack API will assume associatePublicIP=true. So, UI has to explicitly pass associatePublicIP=false to API if its checkbox is unchecked.  
						
						
						
						
					 
					
						2012-11-29 13:11:37 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							d15f5a7512 
							
						 
					 
					
						
						
							
							CLOUDSTACK-459: cloudstack UI - create network offering dialog - show "Associate Public IP" checkbox only when "Elastic IP" Checkbox is checked.  
						
						
						
						
					 
					
						2012-11-27 13:40:06 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8c76baa054 
							
						 
					 
					
						
						
							
							CLOUDSTACK-459: cloudstack UI - create network offering dialog - fix a bug that associatePublicIP parameter was passed to createNetworkOffering API incorrectly. Fix it to pass associatePublicIP parameter as part of servicecapabilitylist.  
						
						
						
						
					 
					
						2012-11-26 16:58:24 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e113556023 
							
						 
					 
					
						
						
							
							CLOUDSTACK-543: cloudstack UI - create network offering dialog - disable Redundant router capability checkbox, Conserve Mode checkbox (still visible, but can't be selected) when Guest Type is selected as Shared.  
						
						
						
						
					 
					
						2012-11-26 15:29:52 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c0d39ebbfe 
							
						 
					 
					
						
						
							
							CLOUDSTACK-542: cloudtack UI - create network offering dialog - hide NetworkACL service field when Guest Type is selected as Shared.  
						
						
						
						
					 
					
						2012-11-26 15:26:15 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							5122cb9553 
							
						 
					 
					
						
						
							
							CLOUDSTACK-476: cloudstack UI - create network offering - Supported Source NAT type dropdown - set "Per zone" as default option.  
						
						
						
						
					 
					
						2012-11-13 16:47:43 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0f7266767e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-475: cloudstack UI - create network offering - Hide VPC checkbox when Guest Type is Shared. Show it when Guest Type is Isolated.  
						
						
						
						
					 
					
						2012-11-13 16:44:02 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							792c6c0082 
							
						 
					 
					
						
						
							
							CS-16749: cloudstack UI - create network offering - show LB Isolation dropdown when LB is selected and provider is external device regardless of Guest Type(Isolated/Shared)  
						
						
						
						
					 
					
						2012-11-13 10:49:11 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							442fff1dfd 
							
						 
					 
					
						
						
							
							CS-16777: cloudstack UI - create network offering dialog - Associate IP checkbox should show when elastic IP (NOT elastic LB) is selected.  
						
						
						
						
					 
					
						2012-11-13 10:20:08 -08:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							4cb08a3d37 
							
						 
					 
					
						
						
							
							CLOUDSTACK-459:[Optional Public IP assignment for EIP with Basic Zone] Associate IP Checkbox in Create Network Offering Dialog is Displayed When Elastic LB is Selected  
						
						
						
						
					 
					
						2012-11-09 00:44:53 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							9547a2f86e 
							
						 
					 
					
						
						
							
							CS-16748:Add Network Resource Dialog Shows Inline Mode Configuration Option for Virtual Router as the Firewall Provider  
						
						
						
						
					 
					
						2012-11-08 17:13:39 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							dcdf35fc1e 
							
						 
					 
					
						
						
							
							Network offering details: Service providers are not displayed anywhere:Modifying the code structure for map loop to retrieve the list of service providers in the form of key-value pairs  
						
						
						
						
					 
					
						2012-11-08 16:17:34 +05:30 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e7fad41994 
							
						 
					 
					
						
						
							
							CS-16573: cloudstack UI - update network offering - encode data passed to API call.  
						
						
						
						
					 
					
						2012-10-31 15:53:04 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							489b60e3d5 
							
						 
					 
					
						
						
							
							CS-16573: cloudstack UI - system offering page, disk offering page - encode data passed to API call.  
						
						
						
						
					 
					
						2012-10-31 15:45:47 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ab4f707936 
							
						 
					 
					
						
						
							
							CS-16573: cloudstack UI - compute offering page - encode data passed to API call.  
						
						
						
						
					 
					
						2012-10-31 15:27:16 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							7d15dc1d4d 
							
						 
					 
					
						
						
							
							CS-16605: cloudstack 3.0 UI - create network offering - Mode dropdown (side by side/inline) - do not pass capabilitytype=InlineMode to API call when "side by side" is selected. Only pass it when "inline" is selected.  
						
						
						
						
					 
					
						2012-10-25 15:59:54 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2b36ad8f92 
							
						 
					 
					
						
						
							
							CS-16612: cloudstack UI - create network offering - show all services regardless of guestIpType(Shared/Isolated).  
						
						
						
						
					 
					
						2012-10-25 12:09:38 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							8bb273de8f 
							
						 
					 
					
						
						
							
							Add tooltips to form fields  
						
						... 
						
						
						
						-Adds tooltips to all dialog-based form fields, to describe what each
 field represents. The tooltip appears on focus of the field, and
 hides once the field is blurred.
-Documentation content is pulled from a new namespace
 'cloudStack.docs', under docs.js. A new attribute, 'docID' is then
 specified on each createForm field to link the field to a specific
 tooltip string.
-If no docID is specified, then no tooltip is rendered.
-This only applies to the 'generic' forms that are rendered using the
 createForm widget
-This still needs to be localized
Conflicts:
	ui/index.jsp
	ui/scripts/configuration.js
	ui/scripts/network.js
	ui/scripts/ui/dialog.js
	ui/scripts/vpc.js 
						
						
					 
					
						2012-10-22 15:18:22 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							5c71d96f55 
							
						 
					 
					
						
						
							
							CS-16555: cloudstack UI - create network offering - when LB service is checked and provider is F5, show new dropdown "Inline Mode" dropdown. Hide it otherwise.  
						
						
						
						
					 
					
						2012-10-22 11:49:16 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							65cf092f60 
							
						 
					 
					
						
						
							
							Network offering UI: Pass 'associatePublicIP' option  
						
						... 
						
						
						
						If elastic LB service is enabled for a shared network offering, add a
checkbox to associate public IP. This passes new option
'associatePublicIp=[true/false]' on creation. 
						
						
					 
					
						2012-10-19 10:13:11 -07:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							d4d82fa3f7 
							
						 
					 
					
						
						
							
							This name makes more sense  
						
						
						
						
					 
					
						2012-09-28 11:33:14 -07:00 
						 
				 
			
				
					
						
							
							
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							65eeeaf071 
							
						 
					 
					
						
						
							
							CS-14277  
						
						... 
						
						
						
						Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
    Following changes are made:
    - Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
    - Create/delete of data volume on local storage
    - Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
    - Migration of VM instance is not supported if it uses local root or data volumes.
    - Migrate is not supported for local volumes.
    - Zone level config to enable/disable local storage usage for service and disk offerings.
    - Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
    - Deploy VM command validates service and disk offerings based on local storage config.
    - Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010) 
						
						
					 
					
						2012-09-11 17:22:43 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							f20f388bf7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-38:Lable name is getting displayed in place of Network Rate while adding Network offering  
						
						
						
						
					 
					
						2012-09-07 14:46:37 +05:30 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							21904cf33b 
							
						 
					 
					
						
						
							
							UI, add network offering: Disable VPC virtual router by default  
						
						... 
						
						
						
						reviewed-by: jessica 
						
						
					 
					
						2012-08-27 15:32:24 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							7e591a442d 
							
						 
					 
					
						
						
							
							CS-15811: Network offering: filter by VPC supported services  
						
						... 
						
						
						
						Introduce a new checkbox which indicates that this service offering is
for VPC networks. If enabled, then only show the VpcVirtualRouter
option for all supported services. If disabled, then disable the
VpcVirtualRouter options
reviewed-by: jessica 
						
						
					 
					
						2012-08-27 15:21:08 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							20db2e515b 
							
						 
					 
					
						
						
							
							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 
						 
				 
			
				
					
						
							
							
								bfederle 
							
						 
					 
					
						
						
						
						
							
						
						
							cbe1f3e4c4 
							
						 
					 
					
						
						
							
							CS-15287  
						
						... 
						
						
						
						Support validation on edit detail view
Original patch by: olga.smola
reviewed-by: brian 
						
						
					 
					
						2012-06-26 13:30:36 -07:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							9687520712 
							
						 
					 
					
						
						
							
							applying Chip Childer's patches for license headers in the ui directory  
						
						
						
						
					 
					
						2012-06-26 10:46:53 -04:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1fa25b1964 
							
						 
					 
					
						
						
							
							CS-14206: cloudstack 3.0 UI - create network offering - show LB Isolation dropdown when LB service is checked and LB service provider is Netscaler or F5, regardless of Guest Type.  
						
						
						
						
					 
					
						2012-05-23 10:40:11 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							89c22f647f 
							
						 
					 
					
						
						
							
							CS-15042: cloudstack 3.0 UI - Create Network Offering dialog - when Guest Type is "Isolated", exclude "Security Groups" from services list.  
						
						
						
						
					 
					
						2012-05-22 15:36:24 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8f6d836a81 
							
						 
					 
					
						
						
							
							CS-14206: cloudstack 3.0 UI - Create Network Offering dialog - When Guest Type is "Shared", include LB and StaticNAT in services regardless of zone type.  
						
						
						
						
					 
					
						2012-05-22 14:50:12 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ae9a0f5b5d 
							
						 
					 
					
						
						
							
							CS-14870: cloudstack 3.0 UI - network offering page - detail view - add tags field.  
						
						
						
						
					 
					
						2012-05-14 10:12:39 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							46c76b7948 
							
						 
					 
					
						
						
							
							CS-14017: create network offering - when Guest Type is Shared, check and disable Specify VLAN checkbox. When Guest Type is Isolated, enable Specify VLAN checkbox.  
						
						
						
						
					 
					
						2012-05-10 16:18:12 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							d269947641 
							
						 
					 
					
						
						
							
							CS-14815: cloudstack 3.0 UI - add network offering - show LB Isolation dropdown only when (1)LB Service is checked (2)Service Provider is Netscaler OR F5 (3)Guest IP Type is Isolated  
						
						
						
						
					 
					
						2012-05-08 17:10:11 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1181c8b46f 
							
						 
					 
					
						
						
							
							CS-14206: cloudstack 3.0 UI - create network offering - show Elastic LB checkbox, LB Isolation dropdown only when (1)LB Service is checked (2)Service Provider is Netscaler (3)Guest IP Type is Shared;  
						
						... 
						
						
						
						show Elastic IP checkbox only when (1)StaticNat Service is checked (2)Service Provider is Netscaler (3)Guest IP Type is Shared. 
						
						
					 
					
						2012-04-30 15:58:02 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							799ff32c30 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - add network offering - fix a bug that wrongly calculated advanced zones.  
						
						
						
						
					 
					
						2012-04-27 16:18:17 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f6c6518ada 
							
						 
					 
					
						
						
							
							CS-14186: cloudstack 3.0 UI - create network offering - when GuestIpType is Shared, hide SourceNat/StaticNat/PortForwarding/LoadBalancer/Firewall/VPN if zoneType is Advanced, hide SourceNat/PortForwarding/Firewall/VPN if zoneType is BAsic.  
						
						
						
						
					 
					
						2012-04-23 10:43:35 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8f6e3e5ea9 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - add Network offering dialog - correct label of service offering from Compute offering to System offering.  
						
						
						
						
					 
					
						2012-04-13 14:41:10 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2152e9fd25 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - service offerings - implement Refresh button.  
						
						
						
						
					 
					
						2012-04-11 15:17:23 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							b646c82724 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - Add Network Offering dialog - compute offering (service offering) dropdown - populate only service offerings for domain router.  
						
						
						
						
					 
					
						2012-04-06 10:23:01 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							984c4bbdb7 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - system service offering page - (1) add System VM Type dropdown in Add Service Offering dialog.  (2) add System VM Type in detailView.  
						
						
						
						
					 
					
						2012-04-04 16:36:30 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2f634c0913 
							
						 
					 
					
						
						
							
							Switch to Apache license  
						
						
						
						
					 
					
						2012-04-03 04:50:05 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							464967294b 
							
						 
					 
					
						
						
							
							Revert "bug 14376: cloudstack 3.0 UI - Add Network Offering - compute offering(service offering) dropdown - only populate service offerings whose systemvmtype is domainrouter."  
						
						... 
						
						
						
						This reverts commit 076617fbffb8160ad3f1d73885a6c809220b9aa8. 
						
						
					 
					
						2012-03-20 13:41:01 -07:00