Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							41afde3207 
							
						 
					 
					
						
						
							
							CS-15902: Remove loading overlay from VPC actions  
						
						 
						
						... 
						
						
						
						For add VPN and add gateway actions: remove loading overlay to allow
user to perform other actions. The overlay is replaced with a set of
notification messages indicating the status of the job. 
						
						
					 
					
						2012-08-09 16:15:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3b8494131f 
							
						 
					 
					
						
						
							
							CS-15803: cloudstack 3.0 UI - VPC - fix a bug that root-admin failed to create a VM in a tier that belonged to regular-user or domain-admin.  
						
						 
						
						
						
						
					 
					
						2012-08-09 14:53:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ed28accdf0 
							
						 
					 
					
						
						
							
							CS-15801: cloudstack 3.0 UI - VPC - create new tier - fix an error "Owner of vpc with specified vpcId is different from the network owner Acct[2-admin]".  
						
						 
						
						
						
						
					 
					
						2012-08-09 14:30:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							c91463f43e 
							
						 
					 
					
						
						
							
							show zone name in secondary storage detail page  
						
						 
						
						
						
						
					 
					
						2012-08-09 17:29:11 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							695f727cfd 
							
						 
					 
					
						
						
							
							CS-15915:InterVlan - UI - Static route - instead of CIDR should say CIDR of destination network  
						
						 
						
						
						
						
					 
					
						2012-08-09 10:37:09 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							965da2ce99 
							
						 
					 
					
						
						
							
							CS-15825: cloudstack 3.0 UI - VPC - Tier - detailView - allow all actions for regular-user and domain-admin since server-side doesn't have restriction.  
						
						 
						
						
						
						
					 
					
						2012-08-08 16:08:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c33c19dd31 
							
						 
					 
					
						
						
							
							CS-15773: cloudstack 3.0 UI - VPC - create private gateway dialog - add Physical Network dropdown.  
						
						 
						
						
						
						
					 
					
						2012-08-08 15:53:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							cd5b79414b 
							
						 
					 
					
						
						
							
							CS-15773: cloudstack 3.0 UI - VPC - create private gateway dialog - add Physical Network dropdown.  
						
						 
						
						
						
						
					 
					
						2012-08-08 15:52:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							048c5e50cf 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						 
						
						... 
						
						
						
						Conflicts:
	utils/test/com/cloud/utils/component/MockComponentLocator.java 
						
						
					 
					
						2012-08-08 11:50:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							b74a6a7a9c 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC - private gateways - preCheck() should not call args.response.success().  
						
						 
						
						
						
						
					 
					
						2012-08-08 10:27:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							406ae0d724 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - site to site VPN - create VPN connection - fix a bug that wrong vpnGatewayId is passed to API command where there are multiple VPN gateways are present in one account.  
						
						 
						
						
						
						
					 
					
						2012-08-08 10:26:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0db332887e 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC - IP Address page - configuration tab - fix a bug that root-admin was unable to see LB service of IP Address owned by regular-user or domain-admin.  
						
						 
						
						
						
						
					 
					
						2012-08-08 10:22:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0c8ce06f6b 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - infrastructure - Virtual Routers - detailView - add Reboot action to VPC Virtual Router.  
						
						 
						
						
						
						
					 
					
						2012-08-08 10:13:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							a1143acf85 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - infrastructure - zone detail - network service providers - VPC Virtual Router - Instances tab - detailView - add Reboot action.  
						
						 
						
						
						
						
					 
					
						2012-08-08 10:08:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							a5f979355b 
							
						 
					 
					
						
						
							
							CS-15900:InterVlan UI - Confirmation Note on Acquisition of a Public IP Address to a VPC should mention this VPC instead of this Network  
						
						 
						
						
						
						
					 
					
						2012-08-08 20:29:27 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							8f34776dd8 
							
						 
					 
					
						
						
							
							CS-15851:Intervlan - VMware - Enable Static NAT > if no tier selected> Apply> Status should display 'Please select a tier'  
						
						 
						
						
						
						
					 
					
						2012-08-08 18:02:39 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							dd7a0da9a7 
							
						 
					 
					
						
						
							
							CS-15901:InterVlan - UI - Site-to-Site VPN Gateway - Confirmation Message should mention Site-to-Site VPN Gateway instead of just VPN Gateway  
						
						 
						
						
						
						
					 
					
						2012-08-08 15:00:48 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							1323d7f32f 
							
						 
					 
					
						
						
							
							CS-15903:Detail page of vpn connection miss ike/esp lifetime  
						
						 
						
						
						
						
					 
					
						2012-08-08 13:59:34 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							8d75c8fe7d 
							
						 
					 
					
						
						
							
							fix for empty event detail page  
						
						 
						
						
						
						
					 
					
						2012-08-08 15:49:27 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							1aea98f622 
							
						 
					 
					
						
						
							
							CS-15898:Change drop down options in vm tier for vpc  
						
						 
						
						
						
						
					 
					
						2012-08-08 11:03:08 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							b5e1c53137 
							
						 
					 
					
						
						
							
							CS-15892: Tier detail view: Show 'tier details' instead of 'details'  
						
						 
						
						... 
						
						
						
						Conflicts:
	ui/index.jsp 
						
						
					 
					
						2012-08-07 16:02:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							7de225baa9 
							
						 
					 
					
						
						
							
							CS-15890: ACL multiEdit: Change 'Source CIDR' -> 'CIDR'  
						
						 
						
						
						
						
					 
					
						2012-08-07 16:00:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							72651f62b7 
							
						 
					 
					
						
						
							
							CS-15891: Add view console action to VPC instances list view  
						
						 
						
						... 
						
						
						
						Conflicts:
	ui/css/cloudstack3.css 
						
						
					 
					
						2012-08-07 16:00:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							bcead6eec2 
							
						 
					 
					
						
						
							
							Reduce whitespace to overcome file size limit  
						
						 
						
						
						
						
					 
					
						2012-08-07 15:59:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							310b24b285 
							
						 
					 
					
						
						
							
							List view: support external link actions  
						
						 
						
						... 
						
						
						
						Support actions which point to an external link, primary to support
launching the console proxy.
Example:
listView: {
  actions: {
    viewConsole: {
      label: 'label.view.console',
      action: {
        externalLink: {
          url: function(args) {
            return clientConsoleUrl + '?cmd=access&vm=' + args.context.vpcTierInstances[0].id;
          },
          title: function(args) {
            return args.context.vpcTierInstances[0].id.substr(0,8);
          },
          width: 820,
          height: 640
        }
      }
    }
  }
} 
						
						
					 
					
						2012-08-07 15:59:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							989ae4609b 
							
						 
					 
					
						
						
							
							Reduce whitespace to overcome file size limit  
						
						 
						
						
						
						
					 
					
						2012-08-07 15:59:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							8630891c07 
							
						 
					 
					
						
						
							
							List view: support external link actions  
						
						 
						
						... 
						
						
						
						Support actions which point to an external link, primary to support
launching the console proxy.
Example:
listView: {
  actions: {
    viewConsole: {
      label: 'label.view.console',
      action: {
        externalLink: {
          url: function(args) {
            return clientConsoleUrl + '?cmd=access&vm=' + args.context.vpcTierInstances[0].id;
          },
          title: function(args) {
            return args.context.vpcTierInstances[0].id.substr(0,8);
          },
          width: 820,
          height: 640
        }
      }
    }
  }
} 
						
						
					 
					
						2012-08-07 15:58:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							c6e58b6ece 
							
						 
					 
					
						
						
							
							multiEdit: support validate on custom action  
						
						 
						
						... 
						
						
						
						If requireValidation: true is set for a custom action, then only
perform action if multiEdit's form fields are valid. This does not
apply to clicking on existing rules' action buttons.
Syntax:
multiEdit: {
  fields: {
    testField: {
      custom: {
        requireValidation: true,
        ...
      },
      ...
    },
    ...
  }
}
Conflicts:
	ui/scripts/ui/widgets/multiEdit.js 
						
						
					 
					
						2012-08-07 13:48:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							37b66d3fb2 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - infrastructure - Virtual Routers - detailView - add ChangeService action to VPC Virtual Router.  
						
						 
						
						
						
						
					 
					
						2012-08-06 16:01:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8da249e2a3 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - infrastructure - zone detail - network service providers - VPC Virtual Router - Instances tab - detailView - add ChangeService action.  
						
						 
						
						
						
						
					 
					
						2012-08-06 16:00:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1e69966f75 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - infrastructure - zone detail - network service providers - Virtual Router - Instances tab - exclude VPC Virtual Router here.  
						
						 
						
						
						
						
					 
					
						2012-08-06 15:59:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							648dcf0ccf 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - infrastructure - zone detail - network service providers - VPC Virtual Router - Instances tab - add Type to listView (System, VPC or Project).  
						
						 
						
						
						
						
					 
					
						2012-08-06 15:50:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							469e180515 
							
						 
					 
					
						
						
							
							multiEdit: better handling for tag widget  
						
						 
						
						... 
						
						
						
						Place tagging widget in a separate action and dialog class; it is
indicated by a 'tag' icon for better clarity.
-- This removes the requirement to specify a dummy 'edit' action on
multi-rules; instead, the separate tag action will appear automatically
as long as 'tags' is specified under the multiEdit's properties.
Conflicts:
	client/WEB-INF/classes/resources/messages.properties
	ui/css/cloudstack3.css
	ui/index.jsp 
						
						
					 
					
						2012-08-06 14:15:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							feb2ed1d2d 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - site to site VPN - Edit mode - (1)split IKE policy field into 3 fields. (2)split ESP plicy field into 3 fields. (3)split lifetime field into 2 fields. (4) add Dead Peer Detection field.  
						
						 
						
						
						
						
					 
					
						2012-08-06 13:26:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							532806ba13 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - site to site VPN - listView - (1)split IKE policy field into 3 fields. (2)split ESP plicy field into 3 fields. (3)split lifetime field into 2 fields. (4) add Dead Peer Detection field.  
						
						 
						
						
						
						
					 
					
						2012-08-06 13:25:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8b16e32b50 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - site to site VPN - Create action - (1)split IKE policy field into 3 fields. (2)split ESP plicy field into 3 fields. (3)split lifetime field into 2 fields. (4) add Dead Peer Detection field.  
						
						 
						
						
						
						
					 
					
						2012-08-06 13:13:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							e149459358 
							
						 
					 
					
						
						
							
							VPC ACL UI: Fix alignment of multiEdit tables  
						
						 
						
						... 
						
						
						
						Conflicts:
	ui/css/cloudstack3.css 
						
						
					 
					
						2012-08-06 11:23:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							feaea413c7 
							
						 
					 
					
						
						
							
							CS-15844:InterVlan - UI - Remove ACL Icon is not displayed properly for ACL Rules  
						
						 
						
						
						
						
					 
					
						2012-08-06 16:06:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5a72044dc7 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						 
						
						
						
						
					 
					
						2012-08-03 14:30:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6aee5f2aef 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - site to site VPN - VPN customer gateway - implement Edit mode.  
						
						 
						
						... 
						
						
						
						Conflicts:
	ui/scripts/network.js 
						
						
					 
					
						2012-08-03 13:24:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							9697860938 
							
						 
					 
					
						
						
							
							CS-15842: VPC gateway create form: Put 'VLAN' field at the top  
						
						 
						
						
						
						
					 
					
						2012-08-03 12:29:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							26a4132b11 
							
						 
					 
					
						
						
							
							CS-15841: Better add VPC gateway flow  
						
						 
						
						... 
						
						
						
						- Because only 1 gateway can exist per VPC, remove 'add' button from
  list view and immediately show create form on click if no gateway is
  present; show list view on successful creation. If there is a
  gateway, go to list view immediately.
- Rename "Gateways" -> "Private Gateway" 
						
						
					 
					
						2012-08-03 12:26:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							75242b49ce 
							
						 
					 
					
						
						
							
							VPC details: Display 'restart required' field  
						
						 
						
						
						
						
					 
					
						2012-08-03 12:03:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							5cb356024f 
							
						 
					 
					
						
						
							
							CS-15802: Add VPC filter to instance wizard network select  
						
						 
						
						... 
						
						
						
						Adds drop-down select to filter networks by VPC.
-If no VPC is selected, only show non-VPC isolated networks
-If VPC is selected, show tiers from specified VPC. Note that only one
 tier/network can be checked at a time in this mode, and 'add network'
 text field is hidden 
						
						
					 
					
						2012-08-03 11:42:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							20b0790753 
							
						 
					 
					
						
						
							
							CS-15809: Show account/domain fields on VPC detail view  
						
						 
						
						... 
						
						
						
						Conflicts:
	ui/scripts/network.js 
						
						
					 
					
						2012-08-03 11:13:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							7fb1e13957 
							
						 
					 
					
						
						
							
							CS-15793: Fix static NAT select when in a VPC network  
						
						 
						
						... 
						
						
						
						Conflicts:
	ui/scripts/network.js 
						
						
					 
					
						2012-08-03 11:07:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							7998362b18 
							
						 
					 
					
						
						
							
							License header updates for the UI folder  
						
						 
						
						
						
						
					 
					
						2012-08-03 12:45:47 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							20407ec863 
							
						 
					 
					
						
						
							
							CS-15793:Enable static NAT for the public IP address screen is not showing VMs  
						
						 
						
						
						
						
					 
					
						2012-08-03 15:54:10 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							0e0b75a041 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/ApiConstants.java 
						
						
					 
					
						2012-08-02 18:45:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							25b75c1bff 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - site to site VPN - (1) implement Add VPN connection action in VPN connection listView. (2) remove Add VPN connection action from VPN customer gateway detailView.  
						
						 
						
						
						
						
					 
					
						2012-08-02 16:01:34 -07:00