Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							c11dbad9c9 
							
						 
					 
					
						
						
							
							merge master  
						
						
						
						
					 
					
						2013-05-11 15:28:43 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							403f7b5b87 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2114:Scale Up VM icon  
						
						
						
						
					 
					
						2013-04-24 14:34:36 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							94d5d3de50 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2166:UI Support for remove Vlan for the non-contiguous vlan support  
						
						
						
						
					 
					
						2013-04-24 12:40:38 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							932946bbe2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2164:Add Vlan Button for non-contiguous VLAN Range  
						
						
						
						
					 
					
						2013-04-24 12:19:21 +05:30 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							355b910173 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-mixed-zone-management  
						
						
						
						
					 
					
						2013-04-19 10:23:15 -07:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							fc4f19f915 
							
						 
					 
					
						
						
							
							Storage Motion UI development  
						
						
						
						
					 
					
						2013-04-19 18:27:07 +05:30 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							e04430302d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-mixed-zone-management  
						
						
						
						
					 
					
						2013-04-18 15:18:43 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							977162b9f0 
							
						 
					 
					
						
						
							
							CSS: Cleanup formatting  
						
						
						
						
					 
					
						2013-04-18 15:16:49 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							d51d596baa 
							
						 
					 
					
						
						
							
							Dashboard UI: Fix unwanted line breaks on event/alert text  
						
						
						
						
					 
					
						2013-04-18 15:15:24 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							5d05e49fa6 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-mixed-zone-management  
						
						
						
						
					 
					
						2013-04-16 11:45:05 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							4cc1097aa5 
							
						 
					 
					
						
						
							
							Detail view: CSS fixes for edit mode  
						
						... 
						
						
						
						-Fix scrollbars on select box
-Fix apply/cancel buttons being hidden 
						
						
					 
					
						2013-04-15 14:06:54 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							fa8b83581b 
							
						 
					 
					
						
						
							
							Zone type switcher: Style, add functionality  
						
						... 
						
						
						
						- Add top label to zone switcher, add more styling
- Implement zone switching functionality, which on change sets
  cloudStack.context.zoneType to the relevant filter option, or null
  for 'All' zone types 
						
						
					 
					
						2013-04-10 14:43:42 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							50140735c7 
							
						 
					 
					
						
						
							
							Project switcher: Add label  
						
						
						
						
					 
					
						2013-04-10 14:42:22 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							aa5ed0a0fb 
							
						 
					 
					
						
						
							
							Layout new project selector (only dummy data for now)  
						
						
						
						
					 
					
						2013-04-10 13:34:25 -07:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							ae4befb0b9 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'remotes/origin/scale-UP'  
						
						
						
						
					 
					
						2013-04-05 15:06:36 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							bb841d6011 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1669:UI for non-contiguous VLAN ranges  
						
						
						
						
					 
					
						2013-04-04 02:56:34 +05:30 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							6ad7060b40 
							
						 
					 
					
						
						
							
							Support labels in loading overlay  
						
						... 
						
						
						
						Correctly style <span> if placed in a loading overlay, to be
positioned under loading icon 
						
						
					 
					
						2013-03-21 15:56:34 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							136e527c63 
							
						 
					 
					
						
						
							
							Cleanup CSS formatting  
						
						
						
						
					 
					
						2013-03-15 12:33:52 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							89dcc07340 
							
						 
					 
					
						
						
							
							Health check: Fix height of dialog box  
						
						
						
						
					 
					
						2013-03-15 12:33:42 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							9ca7b82baa 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Health-Check-UI  
						
						... 
						
						
						
						Conflicts:
	ui/css/cloudstack3.css 
						
						
					 
					
						2013-03-15 11:46:32 -07:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							1d47458ed7 
							
						 
					 
					
						
						
							
							adjusting the css to remove blank space in the dialog box  
						
						
						
						
					 
					
						2013-03-15 18:16:18 +05:30 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							8291c9b3ba 
							
						 
					 
					
						
						
							
							Mutli-edit overflow CSS handling  
						
						
						
						
					 
					
						2013-03-15 16:46:59 +05:30 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							effb4ed85f 
							
						 
					 
					
						
						
							
							Datepicker UI: Fix disabled cell hover appearance  
						
						
						
						
					 
					
						2013-03-14 15:24:36 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							809ab3e9e1 
							
						 
					 
					
						
						
							
							Datepicker UI: Fix visible drop shadow artifact when hidden  
						
						
						
						
					 
					
						2013-03-14 15:23:13 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							3226b95e77 
							
						 
					 
					
						
						
							
							UI Dialog: Add datepicker styling, add datepicker to events UI  
						
						... 
						
						
						
						-Style datepicker calendar widget
-Add datepicker to delete/archive events/alerts 
						
						
					 
					
						2013-03-14 14:56:01 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							53c589a624 
							
						 
					 
					
						
						
							
							Better styling of IP selection field  
						
						
						
						
					 
					
						2013-03-08 10:51:32 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							fb8f33d2c7 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-multiple-nics  
						
						
						
						
					 
					
						2013-03-05 10:37:17 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							990071b9d7 
							
						 
					 
					
						
						
							
							Regions UI: Fix gradient/text alignment  
						
						
						
						
					 
					
						2013-02-28 16:02:19 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							558b808a18 
							
						 
					 
					
						
						
							
							Regions UI: Show selected region name in header  
						
						
						
						
					 
					
						2013-02-28 15:31:52 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							e653c02515 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-multiple-nics  
						
						
						
						
					 
					
						2013-02-28 12:47:36 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							612a598dcc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1419: Add trademark to logos  
						
						
						
						
					 
					
						2013-02-27 13:44:07 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							b9a459c24d 
							
						 
					 
					
						
						
							
							Regions UI: Move to separate source file, add real data, update style  
						
						... 
						
						
						
						-Move region UI code to ui-custom/regions.js, to separate from core UI
 rendering
-Pull real data and endpoint URL on region select list, from data
 provider in scripts/regions.js
-Make region selector have same appearance as notifications box 
						
						
					 
					
						2013-02-26 15:55:02 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							affd70ddcd 
							
						 
					 
					
						
						
							
							Region selector: Add buttons, more styling, placeholder functionality  
						
						
						
						
					 
					
						2013-02-26 15:05:06 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							fb44e6d7ed 
							
						 
					 
					
						
						
							
							Add basic region drop-down  
						
						
						
						
					 
					
						2013-02-26 14:28:22 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							e3439bc8d0 
							
						 
					 
					
						
						
							
							Add select region icon to top bar  
						
						
						
						
					 
					
						2013-02-26 14:02:05 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							cc49cb5806 
							
						 
					 
					
						
						
							
							Add nav icon for regions  
						
						
						
						
					 
					
						2013-02-26 13:50:35 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							6831937145 
							
						 
					 
					
						
						
							
							Fix/cleanup zone wizard UI->public traffic multi-edit  
						
						
						
						
					 
					
						2013-02-26 12:21:15 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							aec2cfe2cc 
							
						 
					 
					
						
						
							
							Multi-edit: Allow horizontal overflow  
						
						
						
						
					 
					
						2013-02-26 11:32:01 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							243b20f0fd 
							
						 
					 
					
						
						
							
							Prevent wrapping of 'view all' button  
						
						
						
						
					 
					
						2013-02-25 11:44:59 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							4c0fd582dc 
							
						 
					 
					
						
						
							
							Style view all button  
						
						
						
						
					 
					
						2013-02-22 16:05:21 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							1ac86e96cb 
							
						 
					 
					
						
						
							
							Quick view UI: Fix to support multiple quick links  
						
						... 
						
						
						
						There was previously a limitation in the detail view/quickview where
only 1 'view all' link was visible per page. Change this to show n
number of view all links, if an array is passed to 'viewAll.' This also
lowers the # of clicks necessary to navigate to some items.
This also adds more view all buttons to instances, storage, and system
resources. 
						
						
					 
					
						2013-02-21 15:09:03 -08:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							b091ea6ead 
							
						 
					 
					
						
						
							
							scale UP CPU and memory UI  
						
						
						
						
					 
					
						2013-02-22 02:07:08 +05:30 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							dfaffcebad 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-plugins  
						
						... 
						
						
						
						Conflicts:
	ui/index.jsp 
						
						
					 
					
						2013-02-13 14:03:53 -08:00 
						 
				 
			
				
					
						
							
							
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							9a12756ae4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-684 support vm snapshot  
						
						
						
						
					 
					
						2013-02-14 01:26:30 +08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							2cb50b17fb 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-plugins  
						
						
						
						
					 
					
						2013-02-07 12:03:35 -08:00 
						 
				 
			
				
					
						
							
							
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							4f274d0b8e 
							
						 
					 
					
						
						
							
							Summary: resizeVolume needs to be available in UI  
						
						... 
						
						
						
						Detail: Adds UI element for resizing a volume
BUG-ID: CLOUDSTACK-644
Reported-by: hongtu_zang@tcloudcomputing.com 
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360091087 -0700 
						
						
					 
					
						2013-02-05 12:04:47 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							690dd66d3e 
							
						 
					 
					
						
						
							
							UI plugin: Show custom icon  
						
						... 
						
						
						
						Show custom icon '<pluginName>/icon.png' on side nav bar (if plugin
added new section), and on plugin listing. 
						
						
					 
					
						2013-01-29 16:05:48 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							bf2691c51a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-plugins  
						
						
						
						
					 
					
						2013-01-29 13:23:33 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							f8e1f5928f 
							
						 
					 
					
						
						
							
							UI list view: Fix overflow  
						
						... 
						
						
						
						Removing 'ellipses' effect for long list view values. They are
rendering in too many cases, making the data hard to read. Reverting
back to using standard word wrap for long table cells. 
						
						
					 
					
						2013-01-29 12:17:17 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							31a5669c7c 
							
						 
					 
					
						
						
							
							Hide VPC drop-down for advanced SG zones  
						
						
						
						
					 
					
						2013-01-23 11:06:37 -08:00