Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3c2be57c35 
							
						 
					 
					
						
						
							
							CLOUDSTACK-747: internalLb in VPC - internal LB detail View - implement action assign VM to internal lb.  
						
						
						
						
					 
					
						2013-05-21 15:58:39 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							7c05bb13cc 
							
						 
					 
					
						
						
							
							Fix quickview for ACL list  
						
						
						
						
					 
					
						2013-05-21 15:51:15 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							62f7ab6ffe 
							
						 
					 
					
						
						
							
							Delete ACL action: Rename to 'remove' to fix UI feedback  
						
						
						
						
					 
					
						2013-05-21 15:48:11 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							24dd6fb66f 
							
						 
					 
					
						
						
							
							Cleanup formatting  
						
						
						
						
					 
					
						2013-05-21 15:40:00 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							c6c85387fb 
							
						 
					 
					
						
						
							
							VPC: Use listView selector for assignVm action  
						
						
						
						
					 
					
						2013-05-21 15:09:30 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							41f9a12d38 
							
						 
					 
					
						
						
							
							CLOUDSTACK-747: internalLb in VPC - populate detailView of internal LB.  
						
						
						
						
					 
					
						2013-05-21 13:48:27 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c89ca6a92f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-747: internalLb in VPC - populate listView of internal LB.  
						
						
						
						
					 
					
						2013-05-21 13:15:09 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							9fff2c4a66 
							
						 
					 
					
						
						
							
							Add VM total to dashboard  
						
						
						
						
					 
					
						2013-05-21 12:54:07 -07:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							e6382b1896 
							
						 
					 
					
						
						
							
							Delete ACL list filter and css  
						
						
						
						
					 
					
						2013-05-21 22:15:15 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							e5e41b0f45 
							
						 
					 
					
						
						
							
							Remove ACL List action item  
						
						
						
						
					 
					
						2013-05-21 16:35:14 +05:30 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							6b7098c990 
							
						 
					 
					
						
						
							
							Add network ACL item: Fix add action  
						
						
						
						
					 
					
						2013-05-20 14:10:52 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							bd764cc581 
							
						 
					 
					
						
						
							
							Pass dashboard data via dataProvider  
						
						
						
						
					 
					
						2013-05-20 13:55:50 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							034c21b6fc 
							
						 
					 
					
						
						
							
							ACL multi-edit: add 'action' field to specify rule as allow/deny  
						
						
						
						
					 
					
						2013-05-20 13:32:46 -07:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							a1614a5f8f 
							
						 
					 
					
						
						
							
							ACL DENY RULES Network ACL List Detail View  
						
						
						
						
					 
					
						2013-05-21 01:25:10 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							981b5ddd1b 
							
						 
					 
					
						
						
							
							ACL DENY RULES UI-API Integration  
						
						
						
						
					 
					
						2013-05-20 23:42:55 +05:30 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							7aaff0cfed 
							
						 
					 
					
						
						
							
							Fix typo  
						
						
						
						
					 
					
						2013-05-16 13:46:37 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							ff287c10d9 
							
						 
					 
					
						
						
							
							Tier LB UI: Split list view into internal/public  
						
						
						
						
					 
					
						2013-05-16 13:46:14 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							b5acb9034f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-747: UI - Internal LB - implement Add Internal LB action.  
						
						
						
						
					 
					
						2013-05-16 11:37:16 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							34d7014c88 
							
						 
					 
					
						
						
							
							ACL multi-edit: Fix reorder drag handle  
						
						
						
						
					 
					
						2013-05-15 15:58:55 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							612ce62cae 
							
						 
					 
					
						
						
							
							Add tier VM, PF, static NAT links  
						
						
						
						
					 
					
						2013-05-15 15:33:13 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							81bce385bf 
							
						 
					 
					
						
						
							
							Fix typo  
						
						
						
						
					 
					
						2013-05-15 15:01:40 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							a4fc86ece9 
							
						 
					 
					
						
						
							
							Tier LB rules: Add load balancing multi-edit  
						
						
						
						
					 
					
						2013-05-15 14:28:54 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f985e11c28 
							
						 
					 
					
						
						
							
							CLOUDSTACK-747: internalLb in VPC - UI - create tier dialog - only one tier is allowed to have PublicLb in a VPC.  
						
						
						
						
					 
					
						2013-05-15 14:23:49 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							42ed9e13f3 
							
						 
					 
					
						
						
							
							Add placeholder tier LB list view + add action  
						
						
						
						
					 
					
						2013-05-15 12:28:03 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							7ed11ee911 
							
						 
					 
					
						
						
							
							Add site-to-site VPN to VPC chart  
						
						
						
						
					 
					
						2013-05-15 12:09:50 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							08bc6bf778 
							
						 
					 
					
						
						
							
							Fix 'protocolnumber' change event  
						
						
						
						
					 
					
						2013-05-15 11:57:14 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							59a99848b1 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-vpc-redesign  
						
						... 
						
						
						
						Conflicts:
	ui/scripts/vpc.js 
						
						
					 
					
						2013-05-15 10:18:55 -07:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							6d6887533f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2491:NTier: Creation of ACL Rule for protocol AH (51) and ESP (50) Fails  
						
						
						
						
					 
					
						2013-05-15 18:01:10 +05:30 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							cb31791adf 
							
						 
					 
					
						
						
							
							WIP ACL draggable multi-edit  
						
						
						
						
					 
					
						2013-05-14 16:25:37 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							1c2ee35345 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-vpc-redesign  
						
						
						
						
					 
					
						2013-05-14 13:55:09 -07:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							edb2f3da26 
							
						 
					 
					
						
						
							
							CLOUDSTACK-768:ACLs on Private GATEWAY :Acl id on Private Gateway ListView  
						
						
						
						
					 
					
						2013-05-15 00:22:26 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							10380cea41 
							
						 
					 
					
						
						
							
							CLOUDSTACK-768:ACLs on Private GATEWAY  
						
						
						
						
					 
					
						2013-05-14 22:47:53 +05:30 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							3c24380f9d 
							
						 
					 
					
						
						
							
							Fix typo  
						
						
						
						
					 
					
						2013-05-13 14:54:35 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							c819980338 
							
						 
					 
					
						
						
							
							Add place holder for internal LB  
						
						
						
						
					 
					
						2013-05-13 14:06:43 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							9be36609fd 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-vpc-redesign  
						
						
						
						
					 
					
						2013-05-13 11:00:16 -07:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							0ed0e9a26e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1828:NAT on private gateway UI support  
						
						
						
						
					 
					
						2013-05-12 23:59:39 +05:30 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							df0919bef5 
							
						 
					 
					
						
						
							
							Add placeholder network ACL list view  
						
						
						
						
					 
					
						2013-05-10 16:03:44 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							6ac4f79397 
							
						 
					 
					
						
						
							
							VPC chart: add link to public IP addresses list  
						
						
						
						
					 
					
						2013-05-10 15:48:32 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							2eb29a5d81 
							
						 
					 
					
						
						
							
							Tier details: disable view all link, ACL tab  
						
						
						
						
					 
					
						2013-05-10 15:42:18 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							55ac9c1b0f 
							
						 
					 
					
						
						
							
							Add private gateway section to new chart  
						
						
						
						
					 
					
						2013-05-10 15:25:46 -07:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							7ca488334f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1828:NAT on private gateway UI support  
						
						
						
						
					 
					
						2013-05-11 02:50:16 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							edd2fbb266 
							
						 
					 
					
						
						
							
							CLOUDSTACK-760:Allow ACL on all layer 4 protocols  
						
						
						
						
					 
					
						2013-05-10 16:47:09 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							58648c4b53 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2175: Add private Gateway can aonly be done by root or domain admin but not by normal user  
						
						
						
						
					 
					
						2013-05-02 02:58:27 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							690c31290b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-767:nTier Apps 2.0 : Allow more than one Private GW to a VPC  
						
						
						
						
					 
					
						2013-03-29 18:00:42 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							9446eba78c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1447:Persistent Status is not displayed for VPC Tiers  
						
						
						
						
					 
					
						2013-02-28 13:27:27 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							23247e0530 
							
						 
					 
					
						
						
							
							CS-16714:Updgrading a network that has Network offering SRX/F5 inline mode to a network offering that has all service provided by VR does not give proper error message if user selects yes when UI prompts Do you want to keep the current guest network CIDR unchange  
						
						
						
						
					 
					
						2012-11-08 12:20:58 +05:30 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							58de3c3dfe 
							
						 
					 
					
						
						
							
							CS-16735: Tier details: Disable IP address tab  
						
						... 
						
						
						
						Disables IP address tab for VPC tier detail view, as it is redundant
with the 'view all' button. 
						
						
					 
					
						2012-11-05 15:42:10 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							a7138d9665 
							
						 
					 
					
						
						
							
							CS-16732: Show virtual router actions on VPC detail view  
						
						
						
						
					 
					
						2012-11-05 15:42:10 -08: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 
							
						 
					 
					
						
						
						
						
							
						
						
							576f7f6ecb 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC feature - localize vpc.js (Reviewed-by: Brian)  
						
						
						
						
					 
					
						2012-08-21 16:52:04 -07:00