Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							aa9dd422d9 
							
						 
					 
					
						
						
							
							CS-15985: cloudstack 3.0 UI - IP Address page - should use associatednetworkid instead of networkid when trying to grep an IP Address' parent network.  
						
						
						
						
					 
					
						2012-08-14 12:35:41 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							e986d03fc9 
							
						 
					 
					
						
						
							
							CS-15916: Show network name in IP details  
						
						... 
						
						
						
						Conflicts:
	ui/scripts/network.js 
						
						
					 
					
						2012-08-14 12:35:33 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1fd771f871 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - DeleteVpnCustomerGateway API response name has been changed, here is corresponding UI change.  
						
						
						
						
					 
					
						2012-08-14 10:10:03 -07:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							9c6254046a 
							
						 
					 
					
						
						
							
							CS-15976:when vpc fails to create, UI keeps on showing that the creation is in progress  
						
						
						
						
					 
					
						2012-08-14 17:24:07 +05:30 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							cc2dec9fe1 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - network page - LB listing - VM listing - VM name - no need to choose between id, displayname, name property in VM object. Always use displayname property in VM object. This also fixes a bug that VM name did not show right after an VM was assigned to a LB rule.  
						
						
						
						
					 
					
						2012-08-13 16:09:06 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							9a8089e02c 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - network page - LB listing - comment out obsolete unused code.  
						
						
						
						
					 
					
						2012-08-13 14:46:02 -07:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							6de089810d 
							
						 
					 
					
						
						
							
							CS-15962: Inter VLAN Virtual router tab development under VPC section  
						
						
						
						
					 
					
						2012-08-14 01:16:11 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							531cfa76f4 
							
						 
					 
					
						
						
							
							CS-15960:InterVlan - UI - Network-VPC view should list the status of the VPCs  
						
						
						
						
					 
					
						2012-08-13 13:11:54 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							5111fee70c 
							
						 
					 
					
						
						
							
							CS-15959:InterVlan - UI - Name Label changes required for Add VPC box parameters  
						
						
						
						
					 
					
						2012-08-13 12:00:25 +05:30 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							75242b49ce 
							
						 
					 
					
						
						
							
							VPC details: Display 'restart required' field  
						
						
						
						
					 
					
						2012-08-03 12:03:57 -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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							47f309af6d 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - site to site VPN - VPN customer gateway - add name field.  
						
						
						
						
					 
					
						2012-08-02 15:30:15 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							a902443708 
							
						 
					 
					
						
						
							
							CS-15792: cloudstack 3.0 UI - VPC - pass domainid+account instead of listAll to all listNetworks API calls under VPC section.  
						
						
						
						
					 
					
						2012-08-01 16:10:41 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							6ad7f2f80b 
							
						 
					 
					
						
						
							
							CS-15740: Show 'please select a tier' instead of blank default option  
						
						... 
						
						
						
						For VPC enable static NAT dialog, a tier always needs to be selected
-- this is now indicated in the default option select. 
						
						
					 
					
						2012-08-01 14:36:46 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							c4e2fe7b74 
							
						 
					 
					
						
						
							
							CS-15760  
						
						... 
						
						
						
						Don't show Configuration tab for VPC static NAT 
						
						
					 
					
						2012-07-31 13:44:54 -07:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							9644a62014 
							
						 
					 
					
						
						
							
							CS-15724:S2S vpn- Customer vpn gateway page does not display all the configured parameters  
						
						
						
						
					 
					
						2012-07-31 16:27:50 +05:30 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							00af517003 
							
						 
					 
					
						
						
							
							VPC UI: IP address configuration fix  
						
						... 
						
						
						
						After acquiring a new IP, immeditaly clicking on its configuration tab
will show an enabled firewall, which is incorrect. This fix always
disables the firewall if in a VPC network. 
						
						
					 
					
						2012-07-26 16:13:57 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							e76f8dc577 
							
						 
					 
					
						
						
							
							Disable listView filters for PF/LB/Static NAT  
						
						
						
						
					 
					
						2012-07-26 15:36:33 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							21290ef8f1 
							
						 
					 
					
						
						
							
							Networks section: Only show VPC dropdown for Advanced zones  
						
						
						
						
					 
					
						2012-07-26 15:22:03 -07:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							12ee8810f6 
							
						 
					 
					
						
						
							
							TAGS feature implementation throughout CloudStack UI  
						
						
						
						
					 
					
						2012-07-24 15:36:43 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							8683fc4e05 
							
						 
					 
					
						
						
							
							Add tag UI support for VPC resource types:  
						
						... 
						
						
						
						-        Vpc,
-        NetworkACL,
-        StaticRoute 
						
						
					 
					
						2012-07-24 15:26:59 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							5126ca95e6 
							
						 
					 
					
						
						
							
							Add tags to FW rule multi-edit  
						
						
						
						
					 
					
						2012-07-24 15:26:27 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							c839cf68a6 
							
						 
					 
					
						
						
							
							Add tags to edit PF dialog  
						
						
						
						
					 
					
						2012-07-24 15:25:57 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							a59afac31f 
							
						 
					 
					
						
						
							
							Add tag edit to LB rule  
						
						
						
						
					 
					
						2012-07-24 15:25:57 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ee9074a175 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC - sync VPC UI from citrix-hosted repo to apache-hosted repo.  
						
						
						
						
					 
					
						2012-07-20 14:12:53 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							262bbbe800 
							
						 
					 
					
						
						
							
							Add block to show/hide tier select  
						
						... 
						
						
						
						-- Hidden by default, needs real conditional code 
						
						
					 
					
						2012-07-10 15:41:23 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							9f093817f3 
							
						 
					 
					
						
						
							
							Implement static NAT tier select UI  
						
						... 
						
						
						
						Adds a new drop-down to the enable static NAT dialog to allow selecting a tier to be associated with the VM. This is in the header of the list view.
It is defined as follows:
enableStaticNAT: {
  ...
    action: {
      noAdd: true,
      custom: cloudStack.uiCustom.enableStaticNAT({
        // VPC
        tierSelect: function(args) {
          args.response.success({
            data: [
              { id: '1', description: 'VPC 1' },
              { id: '2', description: 'VPC 2' }
            ]
          });
        },
    ... 
						
						
					 
					
						2012-07-10 15:41:23 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							dd52157f09 
							
						 
					 
					
						
						
							
							Add code to show/hide 'tiers' header fields  
						
						
						
						
					 
					
						2012-07-10 14:57:07 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							7de02b6d5c 
							
						 
					 
					
						
						
							
							Update dummy tier data  
						
						
						
						
					 
					
						2012-07-10 14:57:05 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							081f1e335d 
							
						 
					 
					
						
						
							
							Add header fields  
						
						
						
						
					 
					
						2012-07-10 14:57:05 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							b000b8047e 
							
						 
					 
					
						
						
							
							CS-15475: Fix missing 'add guest network' action from network list  
						
						... 
						
						
						
						Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
Reviewed by: Brian Federle <brian.federle@citrix.com> 
						
						
					 
					
						2012-07-10 11:24:07 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							c347c6bd09 
							
						 
					 
					
						
						
							
							Add base VPC UI  
						
						... 
						
						
						
						** Note: this is a work-in-progress, and only contains dummy content
Implement UI for managing VPC tiers, via a custom chart-like UI list
tiers and allowing the management of VMs associated with the VPCs. 
						
						
					 
					
						2012-06-28 10:51:56 -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 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							07fd2cab6d 
							
						 
					 
					
						
						
							
							CS-14980: Fix blank PF/LB instance name label  
						
						... 
						
						
						
						Show VM ID if .displayname and .instancename are not present, as is
the case with KVM-type virtual machines that don't have a custom name. 
						
						
					 
					
						2012-05-18 12:09:14 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							05964ea465 
							
						 
					 
					
						
						
							
							CS-14901: cloudstack 3.0 UI - IP Address page - non-SourceNAT IP - when network offering's Conserve Mode is off, hide LoadBalancer when any PortForwarding rule exists, hide PortForwarding when any LoadBalancer rule exists.  
						
						
						
						
					 
					
						2012-05-17 11:33:08 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							33ce7933cc 
							
						 
					 
					
						
						
							
							CS-14901: cloudstack 3.0 UI - IP Address page - non-SourceNAT IP - when network offering's Conserve Mode is off, hide EnableStaticNAT and EnableVPN when any PortForwarding rule or LoadBalancer rule exists.  
						
						
						
						
					 
					
						2012-05-16 17:03:17 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2e2e5ee59d 
							
						 
					 
					
						
						
							
							CS-14901: cloudstack 3.0 UI - IP Address page - non-SourceNAT IP - when network offering's Conserve Mode is off, hide PortForwarding and LoadBalacer when staticNAT or VPN is enabled.  
						
						
						
						
					 
					
						2012-05-16 16:27:03 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							30c938aaa9 
							
						 
					 
					
						
						
							
							CS-14901: cloudstack 3.0 UI - IP Address page - non-SourceNAT IP - when network offering's Conserve Mode is off, hide EnableVPN action when staticNAT is enabled, hide EnableStaticNAT action when VPN is enabled.  
						
						
						
						
					 
					
						2012-05-16 12:42:46 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3715d1aef2 
							
						 
					 
					
						
						
							
							CS-14901: cloudstack 3.0 UI - IP Address page - SourceNAT IP - when network offering's Conserve Mode is off, hide LoadBalancer, PortForwarding action in Configuration tab.  
						
						
						
						
					 
					
						2012-05-16 11:31:14 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							93d6b668a2 
							
						 
					 
					
						
						
							
							CS-14901: cloudstack 3.0 UI - IP Address page - SourceNAT IP - when network offering's Conserve Mode is off, hide Enable Static NAT, Enable VPN action.  
						
						
						
						
					 
					
						2012-05-15 16:19:41 -07:00