Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							c11dbad9c9 
							
						 
					 
					
						
						
							
							merge master  
						
						
						
						
					 
					
						2013-05-11 15:28:43 +05:30 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							e309a91a9b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1941:Cannot delete users in the default admin account within the UI  
						
						
						
						
					 
					
						2013-04-22 14:19:38 +05:30 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							2c176ab9ea 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1592:[UI] Add support to limit newly added resourcetypes  
						
						
						
						
					 
					
						2013-03-29 14:18:14 +05:30 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							9270b4335c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1065: cloudstack UI - AWS Style Regions - remove region field from Add Account dialog since createAccount API does not take in regionid parameter.  
						
						
						
						
					 
					
						2013-03-20 16:47:52 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							fdaa5b4909 
							
						 
					 
					
						
						
							
							User accounts UI: Support for regions  
						
						... 
						
						
						
						-Add region select to add account form
-Show account's region in detail view 
						
						
					 
					
						2013-02-27 08:59:55 -08:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							44ceff4224 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1064:A type error occurs when trying to add account/register template: this is because of accounts conext being undefined  
						
						
						
						
					 
					
						2013-01-25 16:42:42 +05:30 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							fd8607d41e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-819:Changing GET request to POST while creating account/user to hide the passwords in the access logs  
						
						
						
						
					 
					
						2013-01-07 22:29:28 +05:30 
						 
				 
			
				
					
						
							
							
								Isaac Chiang 
							
						 
					 
					
						
						
						
						
							
						
						
							6ce01c46fc 
							
						 
					 
					
						
						
							
							UI: add generate key button to appropriate roles  
						
						
						
						
					 
					
						2013-01-03 10:58:13 -08:00 
						 
				 
			
				
					
						
							
							
								Isaac Chiang 
							
						 
					 
					
						
						
						
						
							
						
						
							5aefd77f77 
							
						 
					 
					
						
						
							
							Fix for CloudStack-648  
						
						... 
						
						
						
						Signed-off-by: Gavin Lee <gavin.lxh@gmail.com> 
						
						
					 
					
						2012-12-26 00:00:58 +08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							703c5b44f2 
							
						 
					 
					
						
						
							
							cloudstack UI - user page - update user, change password, generate key, disable user, enable user, delete user - encode data passed to API call.  
						
						
						
						
					 
					
						2012-10-31 15:25:32 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8692f68603 
							
						 
					 
					
						
						
							
							CS-16573: cloudstack UI - create user - encode data passed to API call.  
						
						
						
						
					 
					
						2012-10-31 15:18:46 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							bfbf634c0f 
							
						 
					 
					
						
						
							
							CS-16573: cloudstack UI - user page - listView - encode data passed to API call.  
						
						
						
						
					 
					
						2012-10-31 15:14:52 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							4e8cf95140 
							
						 
					 
					
						
						
							
							CS-16573: cloudstack UI - account page - disable account, enable account, lock account, delete account, update resource count - encode data passed to API call.  
						
						
						
						
					 
					
						2012-10-26 11:44:36 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ef0be741c3 
							
						 
					 
					
						
						
							
							CS-16573: cloudstack UI - basic search in account page, update account action - encode data passed to API call.  
						
						
						
						
					 
					
						2012-10-26 10:59:32 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							cc8b97ce97 
							
						 
					 
					
						
						
							
							CS-16573: cloudstack UI - create account - encode data passed to API call.  
						
						
						
						
					 
					
						2012-10-25 11:11:44 -07: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 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							991557bfb6 
							
						 
					 
					
						
						
							
							UI: Add quick view to table list  
						
						... 
						
						
						
						For any list view that has a corresponding detail view, adds a tooltip
to display the compact overview of the detail view contents, including
all available actions. This avoids a user from having to click into a
new panel to see more details and actions for an item.
This will happen automatically for any list view with a 'detailView'
sub-option, and will append a new column to the end of each item
row. If 'noCompact: true' is specified in the detailView's options,
then the quick view will not be rendered.
** Note: This also removes the existing list actions for the instances
         and zones tables.
Example, to show a quick view:
listView: {
  detailView: {
    // Specify noCompact: true to not render a quick view
    //
    // noCompact: true
    ...
  },
  ...
}
Conflicts:
	ui/scripts/ui/widgets/detailView.js 
						
						
					 
					
						2012-10-10 11:18:02 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							a3c80ebf4e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-109: cloudstack UI - (1) detailView widget - pass context to isEditable() when calling it.  (2) account page - Edit action - allow to update network domain on system-generated default admin account.  
						
						
						
						
					 
					
						2012-09-24 16:05:32 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							309be015ce 
							
						 
					 
					
						
						
							
							CLOUDSTACK-109: cloudstack UI - (1) account page: fix a bug that system-generated default admin account wrongly had enalbe/disable/lock/remove option. (2) user page - fix a bug that system-generated default admin account user wrongly had enable/disable/remove option.  
						
						
						
						
					 
					
						2012-09-24 16:05:00 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							5ccca40067 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - account page - create account action - encrypt password even md5-hashed is off before passing it to API call.  
						
						
						
						
					 
					
						2012-08-30 14:46:22 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							c12734eab6 
							
						 
					 
					
						
						
							
							CS-15798: Support editing of VPC resource limits  
						
						
						
						
					 
					
						2012-08-02 14:22:45 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							10e70bcb9c 
							
						 
					 
					
						
						
							
							CS-15392: Add error handling to edit user action  
						
						... 
						
						
						
						Original patch by: Olga Smola <olya.smola@gmail.com>
Reviewed by: Brian Federle <brian.federle@citrix.com> 
						
						
					 
					
						2012-07-09 14:54:15 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							5fafb0e5e5 
							
						 
					 
					
						
						
							
							CS-15313: Error handling for account section  
						
						... 
						
						
						
						This fixes an issue where an error is not displayed when entering an
invalid account name.
Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
reviewed-by: Brian Federle <brian.federle@citrix.com> 
						
						
					 
					
						2012-07-02 11:01:38 -07:00 
						 
				 
			
				
					
						
							
							
								bfederle 
							
						 
					 
					
						
						
						
						
							
						
						
							cbe1f3e4c4 
							
						 
					 
					
						
						
							
							CS-15287  
						
						... 
						
						
						
						Support validation on edit detail view
Original patch by: olga.smola
reviewed-by: brian 
						
						
					 
					
						2012-06-26 13:30:36 -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 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							79410f90bc 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - account page - fix a bug that happens when account name includes ampersand or other special characters. Encode account name before it's being passed to API calls.  
						
						
						
						
					 
					
						2012-06-21 13:02:52 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							237fd426e1 
							
						 
					 
					
						
						
							
							CS-14230  
						
						... 
						
						
						
						Add password confirm to add account/user forms
Original patch by: oyla.smola@gmail.com 
Reviewed-by: brian 
						
						
					 
					
						2012-06-14 11:33:28 -07:00 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							dd3b40218b 
							
						 
					 
					
						
						
							
							CS-12111: No e-mail validation for edit user form  
						
						... 
						
						
						
						reviewed-by: brian 
						
						
					 
					
						2012-05-25 11:09:48 -07:00 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							0836496216 
							
						 
					 
					
						
						
							
							CS-14844: Api key and secret key is truncated in the user details view  
						
						
						
						
					 
					
						2012-05-15 23:24:04 +05:30 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							25957ab372 
							
						 
					 
					
						
						
							
							CS-14737: cloudstack 3.0 UI - state column in Volume/Snapshot/Instance/SecondaryStorage/Project page - should display state value as is (i.e. as returned in API call). Shouldn't localize value returned in API call.  
						
						
						
						
					 
					
						2012-05-04 16:37:26 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							66bb690b2d 
							
						 
					 
					
						
						
							
							CS-14624: cloudstack 3.0 UI - hide "Add Account" button from domain-admin.  
						
						
						
						
					 
					
						2012-04-24 14:37:04 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2f634c0913 
							
						 
					 
					
						
						
							
							Switch to Apache license  
						
						
						
						
					 
					
						2012-04-03 04:50:05 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							3e649a96ca 
							
						 
					 
					
						
						
							
							bug 14507  
						
						... 
						
						
						
						Fix typo in title field for change password dialog 
						
						
					 
					
						2012-03-28 10:50:28 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							e53aa0c147 
							
						 
					 
					
						
						
							
							bug 14191  
						
						... 
						
						
						
						Correctly filter domain drop-down on add account dialog if accessed
via a specific domain. 
						
						
					 
					
						2012-03-23 14:39:53 -07:00 
						 
				 
			
				
					
						
							
							
								bfederle 
							
						 
					 
					
						
						
						
						
							
						
						
							ae1858d1cd 
							
						 
					 
					
						
						
							
							bug 14191  
						
						... 
						
						
						
						-Only show domains under logged in user's domain
-Allow domain admins to add accounts from 'Accounts' section 
						
						
					 
					
						2012-03-09 14:12:49 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1dbd10e5e9 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - Make Account page/User page available to normal-user role.  
						
						
						
						
					 
					
						2012-03-05 11:34:02 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							be9ca30ffb 
							
						 
					 
					
						
						
							
							Delete User action - fix a bug that loading image didn't disappear after action was finished.  
						
						
						
						
					 
					
						2012-03-02 11:53:03 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							d1e2b2fcb6 
							
						 
					 
					
						
						
							
							Account page - account detail view - implement Refresh button. [reviewed-by: Brian]  
						
						
						
						
					 
					
						2012-03-02 11:29:36 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							7e9393ec2f 
							
						 
					 
					
						
						
							
							delete account, delete network offeirng, delete guest network  - use 'remove' instead of 'destroy' since their definitions have been switched.  
						
						
						
						
					 
					
						2012-03-01 16:59:40 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							2d08583682 
							
						 
					 
					
						
						
							
							bug 13972  
						
						... 
						
						
						
						Properly refresh data for users detail view 
						
						
					 
					
						2012-02-23 15:30:13 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							cc80211957 
							
						 
					 
					
						
						
							
							bug 13908: Fix localization label  
						
						
						
						
					 
					
						2012-02-21 13:47:55 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							275e0c0405 
							
						 
					 
					
						
						
							
							bug 13666: account page - add account - correct account type for admin account in Root domain.  
						
						
						
						
					 
					
						2012-02-17 15:06:31 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							5bd1fcba6f 
							
						 
					 
					
						
						
							
							Localize accounts/users  
						
						
						
						
					 
					
						2012-02-13 14:57:24 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							d2284e4439 
							
						 
					 
					
						
						
							
							UI: localization  
						
						... 
						
						
						
						-Put localization wrappers around listView, detailView widgets
-Add initial localization for instances section 
						
						
					 
					
						2012-02-09 10:39:59 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							623a144b88 
							
						 
					 
					
						
						
							
							bug 13434: cloudstack 3.0 new UI - if md5Hashed is false, use encodeURIComponent() to encode password before sending it to API call.  
						
						
						
						
					 
					
						2012-02-03 16:55:41 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8c5068a3be 
							
						 
					 
					
						
						
							
							bug 12649: cloudstack 3.0 new UI - domain fields on all dialog boxes - show full domain path instead of domain name.  
						
						
						
						
					 
					
						2012-02-03 15:38:11 -08:00 
						 
				 
			
				
					
						
							
							
								bfederle 
							
						 
					 
					
						
						
						
						
							
						
						
							83bc7d1c81 
							
						 
					 
					
						
						
							
							Remove UI test data  
						
						
						
						
					 
					
						2012-01-27 09:01:57 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							b1f2dfa52d 
							
						 
					 
					
						
						
							
							bug 12306: cloudstack 3.0 new UI - system page - pass listAll=true when calling listDomains to populate domain dropdown.  
						
						
						
						
					 
					
						2012-01-09 16:43:49 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							28704eb8a1 
							
						 
					 
					
						
						
							
							cloudstack 3.0 new UI - create user - domain admin and regular user are not allowed to create user.  
						
						
						
						
					 
					
						2012-01-09 16:16:37 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							89628cae5c 
							
						 
					 
					
						
						
							
							bug 12306: cloudstack 3.0 new UI - account page - create account - pass listAll=true when calling listDomains to populate domain dropdown.  
						
						
						
						
					 
					
						2012-01-09 16:11:55 -08:00