Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							5c69742f7d 
							
						 
					 
					
						
						
							
							Update zone wizard disclaimer text for local storage  
						
						 
						
						... 
						
						
						
						Conflicts:
	client/WEB-INF/classes/resources/messages.properties 
						
						
					 
					
						2012-08-29 15:45:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							4a9f77610c 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - check in translated labels for VPC widget (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-29 10:58:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2e6759093c 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - Spanish translation file is out-of-date and never used in 3.0 UI, therefore remove it from branch.  
						
						 
						
						
						
						
					 
					
						2012-08-28 16:03:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							5b556e202e 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - add translation labels for VPC widget. (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-28 15:59:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							f218003607 
							
						 
					 
					
						
						
							
							Merge branch 'maven-final' of git://github.com/ibuildthecloud/incubator-cloudstack  
						
						 
						
						
						
						
					 
					
						2012-08-28 23:30:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							a319ac7055 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC - check in translated labels. (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-28 11:47:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							ff7c964a66 
							
						 
					 
					
						
						
							
							Add ability to do jetty:run in eclipse  
						
						 
						
						
						
						
					 
					
						2012-08-28 09:16:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6807da63bb 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC feature - localize VPC labels in messages_ja.properties for network.js (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-24 14:56:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							de85e211c3 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC feature - localize VPC labels in messages_zh_CN.properties for network.js (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-24 14:55:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							caae9f7e04 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC feature - localize VPC labels in messages.properties for network.js (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-24 14:54:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							7f8734f124 
							
						 
					 
					
						
						
							
							CS-15802: cloudstack 3.0 UI - stop/reboot virtualRouter/network - add text "All services provided by this virtualRouter/network will be interrupted" in confirm dialog.  
						
						 
						
						
						
						
					 
					
						2012-08-23 14:08:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							b302ed904a 
							
						 
					 
					
						
						
							
							CS-16144: Show warning before enabling local storage in zone wizard  
						
						 
						
						... 
						
						
						
						Conflicts:
	ui/dictionary.jsp 
						
						
					 
					
						2012-08-23 11:08:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							beb9baf950 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC feature - add new translation labels in messages.properties (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-21 16:49:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							ad2b8d7579 
							
						 
					 
					
						
						
							
							CS-16044: Zone wizard: Add 'use local storage' checkbox  
						
						 
						
						... 
						
						
						
						Add checkbox to zone wizard indicating whether zone will use local
storage. If checked, bypass add primary storage step and enable local
storage for zone on creation.
Conflicts:
	ui/index.jsp 
						
						
					 
					
						2012-08-20 11:36:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							b391a1c5b1 
							
						 
					 
					
						
						
							
							CS-16010: Add missing alt tag for 'move to bottom' reorder action  
						
						 
						
						
						
						
					 
					
						2012-08-16 13:56:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							5dcf639acc 
							
						 
					 
					
						
						
							
							Fix a bug, failed to show resource limit page in project view due to missing vpc limit type  
						
						 
						
						
						
						
					 
					
						2012-08-16 20:17:42 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							8c8c10fbbd 
							
						 
					 
					
						
						
							
							CS-15799: Show 'network domain' instead of 'network domain text'  
						
						 
						
						
						
						
					 
					
						2012-08-01 14:36:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							99b0ea7b10 
							
						 
					 
					
						
						
							
							License header update for the client folder  
						
						 
						
						
						
						
					 
					
						2012-08-01 13:49:10 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							dade14aab1 
							
						 
					 
					
						
						
							
							CS-15540: Shared Networks IPs in Advanced Zone appear as 'Direct IP' in System-Wide-Capacity Dashboard  
						
						 
						
						
						
						
					 
					
						2012-07-24 01:25:05 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							093af8a6a9 
							
						 
					 
					
						
						
							
							CS-15388: Fix labels  
						
						 
						
						... 
						
						
						
						Labels for CPU/Mem (as found in compute offering window) are missing
the required values for CPU and RAM
Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
reviewed-by: Brian Federle <brian.federle@citrix.com> 
						
						
					 
					
						2012-07-06 10:27:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							52c8feb670 
							
						 
					 
					
						
						
							
							CS-15202: Rename all references in UI of Nexus VSM/dvswitch to Nexus 1000v  
						
						 
						
						
						
						
					 
					
						2012-06-13 11:24:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							66c6d1ceba 
							
						 
					 
					
						
						
							
							CS-13739: check in Japanese translation file from Japan team  
						
						 
						
						
						
						
					 
					
						2012-05-25 10:56:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							9f2a823d6e 
							
						 
					 
					
						
						
							
							CS-13091: Enable/disable physical network UI actions  
						
						 
						
						
						
						
					 
					
						2012-05-24 12:17:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f2746b0628 
							
						 
					 
					
						
						
							
							add new labels in Chinese translation file.  
						
						 
						
						
						
						
					 
					
						2012-05-24 10:52:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							e9d5a33603 
							
						 
					 
					
						
						
							
							CS-13796: Fix typos in onscreen text  
						
						 
						
						... 
						
						
						
						reviewed-by: brian
commit c16320209eb5b4cde019c6dbe1480160fa8097df
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Tue Apr 24 02:06:43 2012 +0530
    CS-13796: Typos in Onscreen text 
						
						
					 
					
						2012-05-22 12:11:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							265f5eca0b 
							
						 
					 
					
						
						
							
							Nexus Vswitch UI development Vswitch Details tab  
						
						 
						
						
						
						
					 
					
						2012-05-21 10:04:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							23ef4bf7ae 
							
						 
					 
					
						
						
							
							Nexus vSwitch UI support  
						
						 
						
						... 
						
						
						
						Implement ability to add and modify Nexus vSwitches at the cluster
level:
-Add new fields to add cluster form, to allow addition of a vSwitch
-Add new tab to VMware clusters to list cluster's vSwitch
-Add details panel to vSwitch allowing enable, disable, and removal of
 vSwitch from cluster 
						
						
					 
					
						2012-05-16 14:59:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							3046c38f59 
							
						 
					 
					
						
						
							
							CS-14831: Incorrect message with reset password for instance  
						
						 
						
						
						
						
					 
					
						2012-05-14 11:29:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							683b88d449 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2012-05-08 10:35:53 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							248c41d349 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - localization - add new label of MD5 checksum  
						
						 
						
						
						
						
					 
					
						2012-05-07 11:29:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							36d92785ff 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - template page - localize "label.action.register.template"  
						
						 
						
						
						
						
					 
					
						2012-05-04 16:08:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							3c4a27d4c6 
							
						 
					 
					
						
						
							
							bug 13461: Usage server restart required after some configuration changes.  
						
						 
						
						
						
						
					 
					
						2012-05-04 11:04:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bfederle 
							
						 
					 
					
						
						
						
						
							
						
						
							57cc1ea378 
							
						 
					 
					
						
						
							
							WIP: Upload volume UI  
						
						 
						
						... 
						
						
						
						Adds new action, upload volume, to the storage->volumes list view
header. This will present a dialog to specify URL & name of volume,
and select a VM to attach the volume to.
Server API calls are still incomplete and rely on hardcoded values. 
						
						
					 
					
						2012-05-02 14:29:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bfederle 
							
						 
					 
					
						
						
						
						
							
						
						
							898952479e 
							
						 
					 
					
						
						
							
							CS-14461: Add more infrastructure page shortcuts  
						
						 
						
						... 
						
						
						
						-Add additional shortcuts for:
  -Primary storage
  -Secondary storgage
  -Virtual routers
  -System VMs
-Replace host stats with the new shortcuts
-Add 'zone' dropdown to create form for the newly added-shortcuts'
 sections, to support creating these items without a zone context 
						
						
					 
					
						2012-04-30 10:32:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2f001e6413 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - check in new localization labels (Simplified Chinese vesion).  
						
						 
						
						
						
						
					 
					
						2012-04-27 15:33:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							b8cb55bca1 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - infrastructure - zone detail - physical network section - add Isolation method to listView.  
						
						 
						
						
						
						
					 
					
						2012-04-26 16:53:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							b5cb205570 
							
						 
					 
					
						
						
							
							cloudstack 3.0.x UI - checked in Japanese translation file provided by Tetsunori  
						
						 
						
						
						
						
					 
					
						2012-04-24 11:30:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bfederle 
							
						 
					 
					
						
						
						
						
							
						
						
							2119ae16df 
							
						 
					 
					
						
						
							
							Add missing resource, max networks,  to project resource tab  
						
						 
						
						
						
						
					 
					
						2012-04-23 22:33:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							37e8d03f0a 
							
						 
					 
					
						
						
							
							CS-14588: cloudstack 3.0 UI - VM Wizard - correct validation message for name field.  
						
						 
						
						
						
						
					 
					
						2012-04-23 13:39:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							78dc2ecf18 
							
						 
					 
					
						
						
							
							CS-13904 : Labels for service offering CPU and memory not consistent  
						
						 
						
						
						
						
					 
					
						2012-04-19 12:53:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							9d694dd8e7 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - localize validation message for vm host name.  
						
						 
						
						
						
						
					 
					
						2012-04-18 18:20:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							4a7c7da191 
							
						 
					 
					
						
						
							
							CS-13896: cloudstack 3.0 UI - register template, register ISO - correct message and label.  
						
						 
						
						
						
						
					 
					
						2012-04-18 12:15:25 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pranav 
							
						 
					 
					
						
						
						
						
							
						
						
							ee0f3e898c 
							
						 
					 
					
						
						
							
							Bug 12833 addition of Fetch Latest Button on the Dashboard  
						
						 
						
						... 
						
						
						
						Conflicts:
	client/WEB-INF/classes/resources/messages.properties
	ui/css/cloudstack3.css
reviewed-by: brian 
						
						
					 
					
						2012-04-12 15:15:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0c33016c9f 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - security group - ingress rule - fix a bug that Account, Security group failed to be translated.  
						
						 
						
						
						
						
					 
					
						2012-04-11 17:29:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							cd9c24a978 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - infrastructure - physical network - network service providers - Netscaler/F5/SRX - devices - change breadcrumb to show Devices instead of Netscaler/F5/SRX (to distinguish between provider and devices).  
						
						 
						
						
						
						
					 
					
						2012-04-11 11:38:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							d5377b0ae3 
							
						 
					 
					
						
						
							
							more line ending fixes  
						
						 
						
						
						
						
					 
					
						2012-04-06 22:51:32 -04: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