Will Stevens 
							
						 
					 
					
						
						
						
						
							
						
						
							5a79c2b6f5 
							
						 
					 
					
						
						
							
							Merge pull request  #1477  from remibergsma/47_default_zone_name_s3  
						
						... 
						
						
						
						When no zone name is available display a defaultWhen a zone name is available, the previous behaviour is still there:

When there is no zone name, it used to display an empty name (where you had to click on to see details):

With this change, a default name `All` is displayed (because this happens when S3 storage is used that is region wide aka all zones):

Region wide S3:

FYI: Screenshot shows 'All', later renamed to 'All Zones', see code.
* pr/1477:
  When no zone name is available display a default
Signed-off-by: Will Stevens <williamstevens@gmail.com> 
						
						
					 
					
						2016-05-11 01:30:44 -04:00 
						 
				 
			
				
					
						
							
							
								Patrick Dube 
							
						 
					 
					
						
						
						
						
							
						
						
							cfd2ce71ed 
							
						 
					 
					
						
						
							
							CLOUDSTACK-9172 Added cross zones check to delete template and iso  
						
						
						
						
					 
					
						2016-04-20 16:16:32 -04:00 
						 
				 
			
				
					
						
							
							
								Remi Bergsma 
							
						 
					 
					
						
						
						
						
							
						
						
							aead9f4ff4 
							
						 
					 
					
						
						
							
							When no zone name is available display a default  
						
						... 
						
						
						
						Backport from Cosmic 
						
						
					 
					
						2016-04-07 21:57:17 +02:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							a15187a57a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4787: Allow users to select disk controller for VM/template  
						
						... 
						
						
						
						- Adds new controller types in the UI, for selecting root disk controller while
  registering templates
- Fixes bug to not override disk controller type if provided in the details (either
  vm details or from template details)
(cherry picked from commit c7d67628b3ff86802a1ac3b58e0bc05d54afd543)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-11-27 18:52:02 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							a6e8cfde3f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8766: Fix infinite scrolling pagination for zonal iso/template listing  
						
						... 
						
						
						
						Due to aggregation of templates and isos on the UI/client side, it could result
that for each page we could end up having lesser templates/isos listed to have
the scroll shown that triggers infinite scrolling. In theory, there
is still a chance if there are several zones with the same template being listed
resulting in only one aggregated template which could cause the scroll to not
get shown; but in practice I believe this fix should work for most users.
Page size set based on experimental data:
https://github.com/apache/cloudstack/pull/751#issuecomment-135661968 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-08-28 13:07:47 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							462bb0654d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8766: Fix infinite scrolling pagination for zonal template listing  
						
						... 
						
						
						
						Uses listViewDataProvider to implement pagination for listing templates and ISOs
in the zones tab. Dedupes isos and templates in the list views.
This closes  #740 
(cherry picked from commit 26700fbe766e06c3b953ee9ebae3f51ff1a08968)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-08-26 12:46:47 +05:30 
						 
				 
			
				
					
						
							
							
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							4be622e4ff 
							
						 
					 
					
						
						
							
							Add missing localization for some labels in Web UI  
						
						... 
						
						
						
						- on new functionnality: upload volume/template from Local
- on the zone configuration wizard for the "Next" button
- update French messages properties from transifex
- Improve some French translations ("Téléverser" for "Upload") 
						
						
					 
					
						2015-08-12 17:30:15 +01:00 
						 
				 
			
				
					
						
							
							
								Kevin Dierkx 
							
						 
					 
					
						
						
						
						
							
						
						
							3acdd916b0 
							
						 
					 
					
						
						
							
							Removed large chunks of commented code  
						
						
						
						
					 
					
						2015-08-07 14:55:59 +02:00 
						 
				 
			
				
					
						
							
							
								Kevin Dierkx 
							
						 
					 
					
						
						
						
						
							
						
						
							471a02d6a4 
							
						 
					 
					
						
						
							
							Removed leading tabs from ui/scripts/*.js  
						
						
						
						
					 
					
						2015-08-07 11:58:13 +02:00 
						 
				 
			
				
					
						
							
							
								Kevin Dierkx 
							
						 
					 
					
						
						
						
						
							
						
						
							2bdbaf453e 
							
						 
					 
					
						
						
							
							Removed trailing whitespace from ui/scripts/*.js  
						
						
						
						
					 
					
						2015-08-07 11:25:15 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Weber 
							
						 
					 
					
						
						
						
						
							
						
						
							5e96d13944 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8455: Use the correct label to display extractable checkbox  
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes  #471  
						
						
					 
					
						2015-06-17 13:14:54 +02:00 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							8571314406 
							
						 
					 
					
						
						
							
							Fixed blocker issues reported by sonarqube in js files  
						
						... 
						
						
						
						All of them are trailing comma in array or object
more details @
https://analysis.apache.org/component_issues?id=org.apache.cloudstack%3Acloudstack#resolved=false |severities=BLOCKER|languages=js 
						
						
					 
					
						2015-05-20 17:19:20 +05:30 
						 
				 
			
				
					
						
							
							
								ramamurtis 
							
						 
					 
					
						
						
						
						
							
						
						
							5646a07513 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8427: Some messages are hard-coded in javascript after Volume upload branch merge(0b835592)  
						
						... 
						
						
						
						Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
This closes  #208  
						
						
					 
					
						2015-04-29 15:00:11 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							0b8355920e 
							
						 
					 
					
						
						
							
							Merge branch 'volume-upload' into master  
						
						... 
						
						
						
						This closes  #206  
						
						
					 
					
						2015-04-29 11:12:53 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							5c152e5f3a 
							
						 
					 
					
						
						
							
							volume upload: disabled all zones during template upload  
						
						
						
						
					 
					
						2015-04-13 14:43:12 +05:30 
						 
				 
			
				
					
						
							
							
								ramamurtis 
							
						 
					 
					
						
						
						
						
							
						
						
							da1d8f9dce 
							
						 
					 
					
						
						
							
							volume upload: fixed the UI after the change to move params to header.  
						
						... 
						
						
						
						Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com> 
						
						
					 
					
						2015-02-27 17:40:06 +05:30 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							48a66ace6c 
							
						 
					 
					
						
						
							
							volume-upload: templates > (1) Shorten action label to make all items in header to fit into one line, otherwise search box will be pushed out of place. (2) Register Template dialog: move URL field to the top.  
						
						
						
						
					 
					
						2015-01-22 13:23:08 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							9acfb2eec1 
							
						 
					 
					
						
						
							
							volume-upload: UI > upload template from local > after uploading file to postURL, pop up a message indicating where to check the template's newest status.  
						
						
						
						
					 
					
						2015-01-21 14:51:53 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							573a4b1e43 
							
						 
					 
					
						
						
							
							volume-upload: tempalates > upload template from local > format dropdown > include OVA, VMDK, BareMetal, TAR, VHDX option.  
						
						
						
						
					 
					
						2015-01-21 13:44:22 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							4e569f85eb 
							
						 
					 
					
						
						
							
							volume-upload: UI > upload template from local > fix a bug that fields below OS Type field (isPublic, isFeatured, ~ ) are not created.  
						
						
						
						
					 
					
						2015-01-20 16:58:04 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							68789b76d3 
							
						 
					 
					
						
						
							
							volume-upload: tempalates > upload template from local > format dropdown > show different options upon selected hypervisor.  
						
						
						
						
					 
					
						2015-01-20 14:36:06 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							7a3c2304a0 
							
						 
					 
					
						
						
							
							volume-upload: UI > templates > upload template from local > pass ispublic, requireshvm, isfeatured, isrouting parameter to getUploadParamsForTemplate API if corresponding fields are not hidden.  
						
						
						
						
					 
					
						2015-01-20 14:00:23 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f0b60c742b 
							
						 
					 
					
						
						
							
							volume-upload: UI > templates > add new action "Upload Template from Local".  
						
						
						
						
					 
					
						2015-01-19 17:31:32 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							cef4447fd4 
							
						 
					 
					
						
						
							
							(1) Remove UploadFile button from Register Template dialog. (2) sync latest templates.js from master branch.  
						
						
						
						
					 
					
						2015-01-19 16:13:57 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f10709c756 
							
						 
					 
					
						
						
							
							Revert "Allow passing custom data in POST request"  
						
						... 
						
						
						
						This reverts commit e4d1049096152cb9fcd4b937666c8dfe8a035392. 
						
						
					 
					
						2015-01-19 15:56:13 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							e4d1049096 
							
						 
					 
					
						
						
							
							Allow passing custom data in POST request  
						
						
						
						
					 
					
						2015-01-19 11:35:42 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							f243ae135b 
							
						 
					 
					
						
						
							
							Add front-end file uploader  
						
						
						
						
					 
					
						2015-01-14 11:26:38 -08:00 
						 
				 
			
				
					
						
							
							
								René Moser 
							
						 
					 
					
						
						
						
						
							
						
						
							07d96aab84 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8154: fix UI for API change  
						
						... 
						
						
						
						Signed-off-by: René Moser <mail@renemoser.net> 
						
						
					 
					
						2015-01-13 16:34:04 +01:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							20123d8c0a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8076: UI > Templates menu > Template/ISO > "Filter by" dropdown > add a new option, "shared", which will list shared templates when being selected.  
						
						
						
						
					 
					
						2014-12-16 14:40:51 -08:00 
						 
				 
			
				
					
						
							
							
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							dd145a397a 
							
						 
					 
					
						
						
							
							Removed duplicate label id entry from dictionary files and update the template.js file.  
						
						... 
						
						
						
						Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com> 
						
						
					 
					
						2014-12-12 09:31:09 -08:00 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							4d78703522 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8056: EN: Miss SC and UK keyboard option for VMware hypervisor when register a template.  
						
						
						
						
					 
					
						2014-12-10 14:26:35 +05:30 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							7e0f1cf457 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8040: UI: register template dialog, register ISO dialog - fix a bug that hidden fields fail to be generated before cloudStack.preFilter.createTemplate() is called. Thus, cloudStack.preFilter.createTemplate() is unable to change hidden fields's css display property from none to inline-block for admin users.  
						
						
						
						
					 
					
						2014-12-05 16:49:13 -08:00 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							0d9c38e131 
							
						 
					 
					
						
						
							
							Add 'View Instances' in template/iso details view  
						
						
						
						
					 
					
						2014-12-01 12:03:47 +01:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							fff3b9eda0 
							
						 
					 
					
						
						
							
							Disable quickview for template zone listing  
						
						... 
						
						
						
						-- Quickviews are not supported when rendering in a list within a detail panel,
   due to technical limitations. 
						
						
					 
					
						2014-11-24 12:26:33 -08:00 
						 
				 
			
				
					
						
							
							
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							66e805cba9 
							
						 
					 
					
						
						
							
							Fixes: Hardcoded strings externalized from various JS files.  
						
						... 
						
						
						
						Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com> 
						
						
					 
					
						2014-11-21 08:02:49 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0e2299d933 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7498: UI > ISO > Register ISO action > a javascript error "osTypeObjs is not defined" comes and goes.  
						
						
						
						
					 
					
						2014-11-18 12:02:00 -08:00 
						 
				 
			
				
					
						
							
							
								Mihaela Stoica 
							
						 
					 
					
						
						
						
						
							
						
						
							0646588fc6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7645: [UI] Fixing incorrect labels, including instances of "???label.*???"  
						
						... 
						
						
						
						- removed duplicate entries in dictionary
- added dictionary entries that have been missed during the dictionary split
- added missing entries in messages.properties
- fixed other localization issues 
						
						
					 
					
						2014-10-02 10:51:52 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							59b0103a53 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7637: UI > fix a bug produced by 4.5 feature "template accross multiple zones" > fix it by including all properties to jsonObj.  
						
						
						
						
					 
					
						2014-09-26 12:02:48 -07:00 
						 
				 
			
				
					
						
							
							
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							6a11d099cf 
							
						 
					 
					
						
						
							
							Fix Externalization of hard-coded label strings  
						
						... 
						
						
						
						-Split 'dictionary.jsp' into two files -> 'dictionary.jsp' and
'dictionary2.jsp' -- this is due to JSP file constraints as the
localization object is getting quite long
-Per change above, 'dictionary' object is now split into an additonal
'dictionary2' object, which is merged with the main dict object on page
load
-All new dictionary mappings should be added to 'dictionary2' now.
Signed-off-by: Brian Federle <brian.federle@citrix.com> 
						
						
					 
					
						2014-09-17 13:59:13 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							78ce5ea2d3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7490: UI > Templates menu (listing) > select a template from listing > Details tab > Zones tab (listing) > select a zone from listing > Details tab > fix a bug that wrong "template+zone" combination was shown.  
						
						
						
						
					 
					
						2014-09-04 14:24:15 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							659eafffe1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7483: UI > instance page, template page > hide "Original XS Version is 6.1+" field when OS Type is not Windows since property jsonObj.details.hypervisortoolsversion only applies to Windows - case sensitive when comparing OS Type.  
						
						
						
						
					 
					
						2014-09-03 16:48:58 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							801a98617c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7483: UI > instance page, template page > hide "Original XS Version is 6.1+" field when OS Type is not Windows since property jsonObj.details.hypervisortoolsversion only applies to Windows.  
						
						
						
						
					 
					
						2014-09-03 15:13:14 -07:00 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							32e8fda965 
							
						 
					 
					
						
						
							
							Fixed CLOUDSTACK-6980: UI for RegisterTemplate API does not expose requireshvm parameter  
						
						
						
						
					 
					
						2014-07-28 11:20:04 -07:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							c79ab570b0 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6967: Initial OVM3 drop"  
						
						... 
						
						
						
						This reverts commit 8a485b9b59e4108e862022baf7477f768380b325. 
						
						
					 
					
						2014-06-24 10:24:01 +02:00 
						 
				 
			
				
					
						
							
							
								Funs 
							
						 
					 
					
						
						
						
						
							
						
						
							8a485b9b59 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6967: Initial OVM3 drop  
						
						... 
						
						
						
						Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit ed47763e2525a21fa4578d199492462d0fb1c7ef)
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
	plugins/pom.xml
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	ui/scripts/docs.js 
						
						
					 
					
						2014-06-23 12:39:10 +02:00 
						 
				 
			
				
					
						
							
							
								Tim Mackey 
							
						 
					 
					
						
						
						
						
							
						
						
							a8212d9ef4 
							
						 
					 
					
						
						
							
							Cleanup of Xen and XenServer terms. Cloned xen plugin creating a xenserver plugin, then removed xen plugin  
						
						... 
						
						
						
						Signed-off-by: Tim Mackey <tmackey@gmail.com>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com> 
						
						
					 
					
						2014-06-07 04:50:23 -04:00 
						 
				 
			
				
					
						
							
							
								Gabor Apati-Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							9fa9e3aaff 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6565: [UI] New Zones tab for Templates and ISOs  
						
						
						
						
					 
					
						2014-05-23 10:58:17 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							7ae8dc8fbd 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6565: [UI] New Zones tab for Templates and ISOs"  
						
						... 
						
						
						
						This reverts commit 348fb7bcb675f60d1a3c649a8c0af8404044642f. 
						
						
					 
					
						2014-05-12 12:26:37 -07:00 
						 
				 
			
				
					
						
							
							
								Gabor Apati-Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							348fb7bcb6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6565: [UI] New Zones tab for Templates and ISOs  
						
						
						
						
					 
					
						2014-05-12 11:40:24 -07:00 
						 
				 
			
				
					
						
							
							
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							24820d20d3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6288: Changing default ImageFormat to vhdx for hyper-v and allowing registration of vhdx format templates.  
						
						... 
						
						
						
						Signed-off-by: Devdeep Singh <devdeep@gmail.com> 
						
						
					 
					
						2014-04-01 14:00:24 +05:30