| 
							
							
								 Michael Jumper | d53b43ce29 | Merge 1.0.0 changes back to master. | 2018-07-01 23:18:04 -07:00 |  | 
			
				
					| 
							
							
								 Michael Jumper | 34faa5d928 | GUACAMOLE-540: Merge changes ensuring remote addresses are handled/logged consistently across the various parts of the webapp. | 2018-07-01 23:09:08 -07:00 |  | 
			
				
					| 
							
							
								 Michael Jumper | 7481c181ed | GUACAMOLE-585: Merge fix for "EMPTY" field option value / dead code. | 2018-07-01 00:19:27 -07:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 86856fa895 | GUACAMOLE-585: getFieldOption should return EMPTY when value is not present. | 2018-06-30 16:57:51 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 2ff416bb1c | GUACAMOLE-540: Remove unused imports. | 2018-06-30 14:31:24 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 3d593a4ca1 | GUACAMOLE-540: Remove processing of X-Forwarded-For header. | 2018-06-30 14:28:53 -04:00 |  | 
			
				
					| 
							
							
								 Michael Jumper | d1e928bea7 | Merge 1.0.0 changes back to master. | 2018-06-27 21:04:33 -07:00 |  | 
			
				
					| 
							
							
								 Michael Jumper | b0da0d16bf | GUACAMOLE-527: Merge parameter definitions for SSH/SFTP host key. | 2018-06-27 21:03:15 -07:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 0b4245cc65 | GUACAMOLE-527: Make translation text consistent across SSH and SFTP | 2018-06-26 15:43:25 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 39f5cb4a2c | GUACAMOLE-527: Change multiline to single line text field. | 2018-06-26 15:41:45 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | db8bb9f85a | GUACAMOLE-527: Correct order of options in RDP and VNC. | 2018-06-26 15:39:25 -04:00 |  | 
			
				
					| 
							
							
								 Michael Jumper | d67efbaf04 | GUACAMOLE-580: Merge changes ensuring null return values from JLDAP are properly handled when reading attributes. | 2018-06-25 10:32:15 -07:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 50e3e4ab94 | GUACAMOLE-527: Add fields for known host key for servers. | 2018-06-25 08:42:33 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 2da0405798 | GUACAMOLE-580: Return an empty map instead of null when nothing is specified or found. | 2018-06-22 20:21:43 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 50baf1c947 | GUACAMOLE-580: Avert potential NullPointerException when looking for user attributes. | 2018-06-22 06:43:56 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | a9637494ac | GUACAMOLE-524: Merge allow user attributes to be used as tokens. | 2018-06-21 11:14:06 -04:00 |  | 
			
				
					| 
							
							
								 Jared Frees | 927c04b9d4 | GUACAMOLE-524: Removed unused imports, fixed comments, and condensed code | 2018-06-21 11:02:18 -04:00 |  | 
			
				
					| 
							
							
								 Michael Jumper | 33679a08d4 | GUACAMOLE-360: Merge support for managing own sessions. | 2018-06-20 11:01:16 -07:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 9aa369d040 | GUACAMOLE-360: Another tweak to the translation for the session management help. | 2018-06-19 20:07:16 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 17ada68fae | GUACAMOLE-360: Update help text for session management. | 2018-06-19 14:56:54 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | c9975f2693 | GUACAMOLE-360: Order pages correctly; remove unused variable. | 2018-06-19 06:11:09 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | ef7e28d168 | GUACAMOLE-360: Make session management page always available. | 2018-06-18 21:12:20 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 6a1b55a327 | GUACAMOLE-360: deleteObject method should follow documented behavior. | 2018-06-18 19:15:20 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | d2b40e4904 | GUACAMOLE-360: Fix comment typo. | 2018-06-16 20:22:30 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 0b77782391 | GUACAMOLE-540: Fix spaces that get added by IDE | 2018-06-16 08:07:33 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | fb1efec056 | GUACAMOLE-540: Restore removed setter methods in Credentials. | 2018-06-16 08:06:13 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | a0d0e07658 | GUACAMOLE-540: Clean up style and comments in Credentials class | 2018-06-16 08:06:07 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 52a3f454e6 | GUACAMOLE-540: Clean up Credentials with new constructor. | 2018-06-16 08:06:07 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | c725da00a0 | GUACAMOLE-540: Update comments; remove unnecessary setter methods. | 2018-06-16 07:13:17 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | cbd77b52ae | GUACAMOLE-540: Move remote address processing to Credentials class for consistency. | 2018-06-16 07:13:17 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 77da5f5ac5 | GUACAMOLE-360: Clean up style issues. | 2018-06-15 21:06:07 -04:00 |  | 
			
				
					| 
							
							
								 Jared Frees | cb4f284760 | GUACAMOLE-524: Changed this to super and removed debugging stuff | 2018-06-15 12:20:02 -04:00 |  | 
			
				
					| 
							
							
								 Jared Frees | f24a6a8b9d | GUACAMOLE-524: Added attributes in ModeledAuthenticatedUser | 2018-06-15 10:53:48 -04:00 |  | 
			
				
					| 
							
							
								 Jared Frees | 0964c46f4f | GUACAMOLE-524: Fixed RegEx for attribute tokens by removing ':' | 2018-06-15 10:53:18 -04:00 |  | 
			
				
					| 
							
							
								 Jared Frees | 653b4e0134 | Updated JavaDoc for addStandardTokens | 2018-06-14 11:15:57 -04:00 |  | 
			
				
					| 
							
							
								 Jared Frees | 49c3f11854 | GUACAMOLE-524: Changed addStandardTokens so user.getAttributes is called | 2018-06-14 11:08:50 -04:00 |  | 
			
				
					| 
							
							
								 Jared Frees | 3d4f465c10 | GUACAMOLE-524: Fixed Order of imports | 2018-06-13 14:12:50 -04:00 |  | 
			
				
					| 
							
							
								 Jared Frees | 590f7311db | GUACAMOLE-524: Updated comments and imports | 2018-06-13 11:31:03 -04:00 |  | 
			
				
					| 
							
							
								 Jared Frees | 58c8f3e111 | GUACAMOLE-524: Fixed Javadoc and removed unnecessary methods | 2018-06-13 10:34:41 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | bd2d051a19 | GUACAMOLE-360: Make webapp use permission sets for active connection management. | 2018-06-13 06:17:52 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 5e16518569 | GUACAMOLE-360: Change ActiveConnection elements to use the ObjectPermissionSet mechanism. | 2018-06-13 06:17:52 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 85c7b511e1 | GUACAMOLE-360: Allow user to kill their own active sessions. | 2018-06-13 06:17:52 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 3eda313519 | GUACAMOLE-360: Allow all users access to the session management page. | 2018-06-13 06:17:52 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | 984ab48ce8 | Merge 1.0.0 changes back to master. | 2018-06-13 06:15:10 -04:00 |  | 
			
				
					| 
							
							
								 Nick Couchman | bc1dc41a7c | GUACAMOLE-470: Merge provide predefined values for "color-scheme" parameter. | 2018-06-13 06:13:28 -04:00 |  | 
			
				
					| 
							
							
								 Michael Jumper | e5a8442a2a | GUACAMOLE-470: Use NPM webjar for datalist-polyfill, as Webjars' "bowergithub" version is broken (missing version number in path causes sanity checks in WebjarsServlet to refuse to serve the file). | 2018-06-12 16:30:11 -07:00 |  | 
			
				
					| 
							
							
								 Michael Jumper | 74230f005f | GUACAMOLE-470: Define "color-scheme" parameter as TEXT field with some pre-defined options. | 2018-06-12 14:07:51 -07:00 |  | 
			
				
					| 
							
							
								 Michael Jumper | 73c3107e91 | GUACAMOLE-470: Restore translations for "color-scheme" enum values. This reverts commit 06f98afcf5. | 2018-06-12 14:07:51 -07:00 |  | 
			
				
					| 
							
							
								 Michael Jumper | 2bc71866a8 | GUACAMOLE-470: Restore ENUM "color-scheme" parameter for SSH and Telnet. This reverts commit 4e610f2d1b. | 2018-06-12 14:07:51 -07:00 |  | 
			
				
					| 
							
							
								 Michael Jumper | 3ae152fa35 | GUACAMOLE-470: Add polyfill for <datalist> element (not supported by Safari). | 2018-06-12 14:07:47 -07:00 |  |