Mike Jumper
							
						 
					 | 
					
						
						
							
						
						981adc94e6
					 | 
					
						
						
							
							GUACAMOLE-699: Merge changes bringing German translations up-to-date.
						
						
						
						
						
						
					 | 
					
						2019-09-09 18:52:53 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								leetxyz
							
						 
					 | 
					
						
						
							
						
						222ac78576
					 | 
					
						
						
							
							GUACAMOLE-699: Various fixes according to comments in PR
						
						
						
						
						
						
					 | 
					
						2019-08-12 21:02:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virtually Nick
							
						 
					 | 
					
						
						
							
						
						a4495cf6ec
					 | 
					
						
						
							
							Merge 1.1.0 changes to master.
						
						
						
						
						
						
					 | 
					
						2019-08-11 19:05:11 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						403431bf92
					 | 
					
						
						
							
							GUACAMOLE-360: Add support for joining active connections to the database auth.
						
						
						
						
						
						
					 | 
					
						2019-08-11 14:30:31 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chisatohasimoto
							
						 
					 | 
					
						
						
							
						
						1cf08cff8f
					 | 
					
						
						
							
							GUACAMOLE-821:Add Japanese language support
						
						
						
						
						
						
					 | 
					
						2019-07-11 11:28:26 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chisatohasimoto
							
						 
					 | 
					
						
						
							
						
						0cad9eef69
					 | 
					
						
						
							
							GUACAMOLE-821:Add Japanese language support
						
						
						
						
						
						
					 | 
					
						2019-07-08 13:28:03 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						1623f55191
					 | 
					
						
						
							
							Merge 1.1.0 changes back to master.
						
						
						
						
						
						
					 | 
					
						2019-05-05 19:39:21 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mike Jumper
							
						 
					 | 
					
						
						
							
						
						4d1e0f18dd
					 | 
					
						
						
							
							GUACAMOLE-696: Merge changes taking database groups into account with respect to database objects when user is otherwise external to the database.
						
						
						
						
						
						
					 | 
					
						2019-05-05 19:36:37 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virtually Nick
							
						 
					 | 
					
						
						
							
						
						9158ca68e3
					 | 
					
						
						
							
							GUACAMOLE-696: Use Guava Sets to combine the user groups.
						
						
						
						
						
						
					 | 
					
						2019-05-05 21:16:44 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						ea1b10e9d1
					 | 
					
						
						
							
							Merge 1.1.0 changes back to master.
						
						
						
						
						
						
					 | 
					
						2019-04-09 11:11:50 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						52d6a6aff8
					 | 
					
						
						
							
							GUACAMOLE-715: Provide skeleton ModeledUser when none exists in DB.
						
						
						
						
						
						
					 | 
					
						2019-04-09 13:05:33 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								leetxyz
							
						 
					 | 
					
						
						
							
						
						03499c113f
					 | 
					
						
						
							
							GUACAMOLE-699: Update german translation
						
						
						
						
						
						
					 | 
					
						2019-03-01 21:55:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virtually Nick
							
						 
					 | 
					
						
						
							
						
						e1fea889ca
					 | 
					
						
						
							
							GUACAMOLE-696: In JDBC module, merge effective groups.
						
						
						
						
						
						
					 | 
					
						2019-02-21 20:37:36 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virtually Nick
							
						 
					 | 
					
						
						
							
						
						37f1da9f1f
					 | 
					
						
						
							
							GUACAMOLE-736: Replace JAXB DatatypeConverter with Guava BaseEncoding.
						
						
						
						
						
						
					 | 
					
						2019-02-21 17:09:44 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						823bbeace1
					 | 
					
						
						
							
							Merge 1.0.0 changes back to master.
						
						
						
						
						
						
					 | 
					
						2018-11-09 20:26:05 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						001ece14e2
					 | 
					
						
						
							
							GUACAMOLE-220: Merge correct translation strings for user group "disabled" attribute.
						
						
						
						
						
						
					 | 
					
						2018-11-09 20:24:24 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Muehlner
							
						 
					 | 
					
						
						
							
						
						756ec2fcc4
					 | 
					
						
						
							
							Merge 1.0.0 changes back to master.
						
						
						
						
						
						
					 | 
					
						2018-11-08 21:26:43 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						3c5594db2e
					 | 
					
						
						
							
							GUACAMOLE-220: Group attribute "disabled" controls whether the group has any effect, not whether login is allowed.
						
						
						
						
						
						
					 | 
					
						2018-11-03 17:24:06 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						d533de118f
					 | 
					
						
						
							
							GUACAMOLE-220: Add EMPTY_SET convenience constant to all core set interfaces.
						
						
						
						
						
						
					 | 
					
						2018-11-03 14:08:46 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						98bd3ead21
					 | 
					
						
						
							
							GUACAMOLE-524: Remove Attributes interface from AuthenticatedUser. Rely instead on tokens injected via decoration of connections.
						
						
						
						
						
						
					 | 
					
						2018-10-05 12:47:26 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						1210d5624c
					 | 
					
						
						
							
							GUACAMOLE-524: Deprecate and replace StandardTokens with arbitrary tokens provided to Connectable.connect().
						
						
						
						
						
						
					 | 
					
						2018-10-05 12:47:26 -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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
							
						
						78d5e3b9d7
					 | 
					
						
						
							
							GUACAMOLE-220: Manually recurse through the group membership graph if the database engine does not support recursive queries.
						
						
						
						
						
						
					 | 
					
						2018-09-19 23:56:52 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						48948fc245
					 | 
					
						
						
							
							GUACAMOLE-220: Add missing JDBC-specific USER_GROUP_ATTRIBUTES translation strings.
						
						
						
						
						
						
					 | 
					
						2018-09-19 23:56:52 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						2999c56098
					 | 
					
						
						
							
							GUACAMOLE-220: Map and allow manipulation of the user group parents of users.
						
						
						
						
						
						
					 | 
					
						2018-09-19 23:56:52 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						856ab44373
					 | 
					
						
						
							
							GUACAMOLE-220: Map and allow manipulation of the user group parents of user groups.
						
						
						
						
						
						
					 | 
					
						2018-09-19 23:56:52 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						63be247db6
					 | 
					
						
						
							
							GUACAMOLE-220: Map and allow manipulation of the user group members of user groups.
						
						
						
						
						
						
					 | 
					
						2018-09-19 23:56:52 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						ccd7920b22
					 | 
					
						
						
							
							GUACAMOLE-220: Map and allow manipulation of the user members of user groups.
						
						
						
						
						
						
					 | 
					
						2018-09-19 23:56:52 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						8f06b7a3f9
					 | 
					
						
						
							
							GUACAMOLE-220: Define base interfaces for mapping RelatedObjectSets to the database.
						
						
						
						
						
						
					 | 
					
						2018-09-19 23:56:52 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						c5c2984151
					 | 
					
						
						
							
							GUACAMOLE-220: Map and query user group tables.
						
						
						
						
						
						
					 | 
					
						2018-09-19 23:56:52 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						69f58c8ca3
					 | 
					
						
						
							
							GUACAMOLE-220: Refactor handling of JDBC permissions to abstract away users vs. user groups.
						
						
						
						
						
						
					 | 
					
						2018-09-19 23:56:51 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						14d10fb42a
					 | 
					
						
						
							
							GUACAMOLE-220: Inherit from groups even if not determined by database.
						
						
						
						
						
						
					 | 
					
						2018-09-19 23:56:51 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						6e71f330b8
					 | 
					
						
						
							
							GUACAMOLE-220: Move JDBC handling of effective groups to RemoteAuthenticatedUser level. Stub out retrieval of effective groups.
						
						
						
						
						
						
					 | 
					
						2018-09-19 23:56:51 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						199f518cdb
					 | 
					
						
						
							
							GUACAMOLE-220: Use effective permissions when deciding whether a user has permission to perform an action.
						
						
						
						
						
						
					 | 
					
						2018-09-19 23:56:51 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						0a69630cbb
					 | 
					
						
						
							
							GUACAMOLE-220: Implement base API changes within database auth allowing for permission inheritance.
						
						
						
						
						
						
					 | 
					
						2018-09-19 23:56:51 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						72bac09f43
					 | 
					
						
						
							
							GUACAMOLE-220: Add explicit mapper for entities (the basis for users and groups).
						
						
						
						
						
						
					 | 
					
						2018-09-19 23:56:51 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						d95e059612
					 | 
					
						
						
							
							GUACAMOLE-220: Refactor user-related model objects and services to leverage the base "entity" model.
						
						
						
						
						
						
					 | 
					
						2018-09-19 23:56:51 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						d53b43ce29
					 | 
					
						
						
							
							Merge 1.0.0 changes back to master.
						
						
						
						
						
						
					 | 
					
						2018-07-01 23:18:04 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						a9637494ac
					 | 
					
						
						
							
							GUACAMOLE-524: Merge allow user attributes to be used as tokens.
						
						
						
						
						
						
					 | 
					
						2018-06-21 11:14:06 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |