Nick Couchman 
							
						 
					 
					
						
						
							
						
						01709fb26b 
					 
					
						
						
							
							Merge 1.0.0 changes back to master.  
						
						
						
						
					 
					
						2018-10-05 15:13:36 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						adb9aaa5e2 
					 
					
						
						
							
							GUACAMOLE-220: Ignore missing user or group when retrieving permissions/memberships.  
						
						
						
						
					 
					
						2018-10-05 11:56:42 -07:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						25071673db 
					 
					
						
						
							
							GUACAMOLE-96: Merge add protected convenience method for retrieving delegate object.  
						
						
						
						
					 
					
						2018-10-05 14:40:22 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						11c1d8c97e 
					 
					
						
						
							
							GUACAMOLE-96: Add protected convenience method for retrieving delegate object.  
						
						
						
						
					 
					
						2018-10-05 10:36:47 -07:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						9d485ffcf7 
					 
					
						
						
							
							Merge 1.0.0 changes back to master.  
						
						
						
						
					 
					
						2018-10-04 04:05:34 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						7fcb506711 
					 
					
						
						
							
							GUACAMOLE-232: Merge mark key as implicitly pressed only when pressed due to another, identifiable key event.  
						
						
						
						
					 
					
						2018-10-04 04:03:48 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						e3c1b6ac98 
					 
					
						
						
							
							GUACAMOLE-232: Mark key as implicitly pressed only when pressed due to another, identifiable key event.  
						
						
						
						
					 
					
						2018-10-03 21:30:26 -07:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						e32f3abd76 
					 
					
						
						
							
							Merge 1.0.0 changes back to master.  
						
						
						
						
					 
					
						2018-10-03 14:53:46 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						f46f52dbac 
					 
					
						
						
							
							GUACAMOLE-232: Merge correct inverted explicit/implicit logic.  
						
						
						
						
					 
					
						2018-10-03 14:52:27 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						9d8027c5cd 
					 
					
						
						
							
							GUACAMOLE-232: Correct inverted explicit/implicit logic.  
						
						
						
						
					 
					
						2018-10-03 11:47:07 -07:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						31c8dfe28b 
					 
					
						
						
							
							Merge 1.0.0 changes back to master.  
						
						
						
						
					 
					
						2018-10-03 14:26:40 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						c04a71edad 
					 
					
						
						
							
							GUACAMOLE-232: Merge address regressions in handling of keyboard modifiers.  
						
						
						
						
					 
					
						2018-10-03 14:24:18 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						eead01944e 
					 
					
						
						
							
							GUACAMOLE-232: Rely on recentKeysym for keyup only when the guessed key doesn't seem to actually be pressed.  
						
						
						
						
					 
					
						2018-10-03 10:29:39 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						2ec7e48ca9 
					 
					
						
						
							
							GUACAMOLE-232: Track whether keys were pressed implicitly. Automatically release all keys if only implicitly pressed keys remain.  
						
						
						
						
					 
					
						2018-10-03 10:29:39 -07:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						863670a580 
					 
					
						
						
							
							GUACAMOLE-524: Merge correct AuthenticatedUser implementations of Attributes interface.  
						
						
						
						
					 
					
						2018-10-03 09:44:52 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						6f0787f0c1 
					 
					
						
						
							
							GUACAMOLE-232: Reset tracking of recent keysym after key is released.  
						
						
						
						
					 
					
						2018-10-02 22:19:40 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						8c096778bc 
					 
					
						
						
							
							GUACAMOLE-232: Fall back to using recent keysym only after failing to determine released key by keycode.  
						
						
						
						
					 
					
						2018-10-02 22:19:15 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						035813ff0b 
					 
					
						
						
							
							GUACAMOLE-232: Take best guess of key being pressed/released into account before assuming modifier states need to be resynced.  
						
						
						
						
					 
					
						2018-10-02 22:18:17 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						aae17f3a9f 
					 
					
						
						
							
							GUACAMOLE-524: Accept only supported attributes via setAttributes(). Do not replace existing attributes.  
						
						
						
						
					 
					
						2018-10-02 20:32:24 -07:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						220d9b2994 
					 
					
						
						
							
							GUACAMOLE-360: Merge update active connection permission check to support user groups.  
						
						
						
						
					 
					
						2018-10-01 21:15:51 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						ea142d15ce 
					 
					
						
						
							
							GUACAMOLE-360: Add convenience function for testing user identity.  
						
						
						
						
					 
					
						2018-10-01 11:46:34 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						ad937defa6 
					 
					
						
						
							
							GUACAMOLE-360: Update active connection permission check to support user groups.  
						
						
						
						
					 
					
						2018-10-01 11:35:32 -07:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						658ce78846 
					 
					
						
						
							
							Merge 1.0.0 changes back to master.  
						
						... 
						
						
						
						Conflicts:
	extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/RemoteAuthenticatedUser.java 
						
						
					 
					
						2018-10-01 13:51:56 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						828313541b 
					 
					
						
						
							
							GUACAMOLE-220: Merge add database support for user groups.  
						
						
						
						
					 
					
						2018-10-01 13:38:55 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						4d5196207b 
					 
					
						
						
							
							GUACAMOLE-220: Correct typo - "that status of" should be "the status of".  
						
						
						
						
					 
					
						2018-09-30 23:12:49 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						f4ccf8ef62 
					 
					
						
						
							
							GUACAMOLE-220: Remove effectively-redundant admin permission check.  
						
						
						
						
					 
					
						2018-09-30 23:11:20 -07:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						3ff58129cb 
					 
					
						
						
							
							Merge 1.0.0 changes back to master.  
						
						
						
						
					 
					
						2018-09-30 08:41:28 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						aa7cd9d261 
					 
					
						
						
							
							GUACAMOLE-437: Merge remove erroneous non-breaking spaces from source.  
						
						
						
						
					 
					
						2018-09-30 08:40:24 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						dee4e89ede 
					 
					
						
						
							
							GUACAMOLE-437: Remove erroneously-committed, non-breaking spaces (U+00A0) from source.  
						
						
						
						
					 
					
						2018-09-29 15:04:28 -07:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						d1a6c297b8 
					 
					
						
						
							
							Merge 1.0.0 changes back to master.  
						
						
						
						
					 
					
						2018-09-29 16:50:32 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						e861027f53 
					 
					
						
						
							
							GUACAMOLE-635: Merge require Java 1.8 for all Java components except guacamoole-common  
						
						
						
						
					 
					
						2018-09-29 16:48:17 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						182f204c95 
					 
					
						
						
							
							GUACAMOLE-635: Heap pollution is not possible within SimpleDirectory(ObjectType... objects).  
						
						... 
						
						
						
						From https://docs.oracle.com/javase/tutorial/java/generics/nonReifiableVarargsType.html#vulnerabilities :
"Heap pollution occurs when a variable of a parameterized type refers
to an object that is not of that parameterized type."
In this case, the parameterized type (ObjectType) and the array of that
type within this constructor are always used as their formal types. 
						
						
					 
					
						2018-09-29 13:19:21 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						1fef6a05e1 
					 
					
						
						
							
							GUACAMOLE-635: Require Java 1.8 for all Java components except guacamole-common.  
						
						
						
						
					 
					
						2018-09-29 12:56:17 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						bb6e8bc1c7 
					 
					
						
						
							
							GUACAMOLE-220: Correct documentation of update script.  
						
						... 
						
						
						
						The UNIQUE constraint is being added once the column is expected to be
unique, not necessarily because it should safely point to entries of a
particular table. 
						
						
					 
					
						2018-09-27 20:15:23 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						7521cdc0ae 
					 
					
						
						
							
							GUACAMOLE-220: Rows are deleted to modify the one-to-many relationship, not to establish it.  
						
						
						
						
					 
					
						2018-09-27 20:10:32 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						5fdd0bb148 
					 
					
						
						
							
							GUACAMOLE-220: Remove unnecessary use of multi-result select (use selectOne() instead).  
						
						
						
						
					 
					
						2018-09-27 20:07:24 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						a552d88c54 
					 
					
						
						
							
							GUACAMOLE-220: Clarify group rename validation logic.  
						
						
						
						
					 
					
						2018-09-27 20:06:18 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						fedccebb93 
					 
					
						
						
							
							GUACAMOLE-220: Remove unnecessary ModeledUserGroup constructor (equivalent to default constructor).  
						
						
						
						
					 
					
						2018-09-27 20:03:35 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						4a5f271702 
					 
					
						
						
							
							GUACAMOLE-220: Correct user vs. entity wording in documentation.  
						
						
						
						
					 
					
						2018-09-27 19:45:30 -07:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						ef568fb9f1 
					 
					
						
						
							
							GUACAMOLE-629: Merge support for argv instruction.  
						
						
						
						
					 
					
						2018-09-26 08:40:48 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						75805e4cab 
					 
					
						
						
							
							GUACAMOLE-629: Add support for creating argument value streams using the "argv" instruction.  
						
						
						
						
					 
					
						2018-09-25 13:01:15 -07:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						8a5645e90b 
					 
					
						
						
							
							GUACAMOLE-622: Merge add parameter definitions for telnet login success, failure, and username regex.  
						
						
						
						
					 
					
						2018-09-21 20:56:15 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						af8f5b3a80 
					 
					
						
						
							
							GUACAMOLE-622: Add parameter definitions for telnet login success/failure regex.  
						
						
						
						
					 
					
						2018-09-21 17:33:44 -07:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						355f76b15e 
					 
					
						
						
							
							GUACAMOLE-624: Merge include user full name and organization in display and filter.  
						
						
						
						
					 
					
						2018-09-21 20:29:03 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						d4a9208c2b 
					 
					
						
						
							
							GUACAMOLE-624: Include user full name and organization in filtered attributes.  
						
						
						
						
					 
					
						2018-09-21 14:14:57 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						660fe82fff 
					 
					
						
						
							
							GUACAMOLE-624: Add columns displaying user full name and organization.  
						
						
						
						
					 
					
						2018-09-21 14:14:39 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						8399b252cd 
					 
					
						
						
							
							GUACAMOLE-220: Detect cycles within recursive query. SQL Server cannot deal with cycles on its own.  
						
						
						
						
					 
					
						2018-09-19 23:56:53 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						ee35620194 
					 
					
						
						
							
							GUACAMOLE-220: Update SQL Server mapping with respect to user group support.  
						
						
						
						
					 
					
						2018-09-19 23:56:53 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						dec7b3c340 
					 
					
						
						
							
							GUACAMOLE-220: Dynamically detect whether the MariaDB / MySQL server supports recursive CTEs.  
						
						
						
						
					 
					
						2018-09-19 23:56:53 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						204b6a4b24 
					 
					
						
						
							
							GUACAMOLE-220: Update MySQL mapping with respect to user group support.  
						
						
						
						
					 
					
						2018-09-19 23:56:52 -07:00