Virtually Nick 
							
						 
					 
					
						
						
							
						
						f06056b4e4 
					 
					
						
						
							
							GUACAMOLE-728: Use correct sslMode options for passing to JDBC driver.  
						
						
						
						
					 
					
						2020-06-16 14:50:44 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						b02727e441 
					 
					
						
						
							
							Merge 1.2.0 changes back to master.  
						
						
						
						
					 
					
						2020-06-16 11:43:02 -07:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						986d5a1225 
					 
					
						
						
							
							GUACAMOLE-728: Properly expose JDBC driver values from enums.  
						
						
						
						
					 
					
						2020-06-16 11:44:07 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						05f49b17cb 
					 
					
						
						
							
							GUACAMOLE-583: Correct SQLServer instance name property configuration.  
						
						
						
						
					 
					
						2020-06-16 09:57:49 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						8b9538937e 
					 
					
						
						
							
							Merge 1.2.0 changes back to master.  
						
						
						
						
					 
					
						2020-06-16 01:31:53 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Jumper 
							
						 
					 
					
						
						
							
						
						6134dd3c88 
					 
					
						
						
							
							GUACAMOLE-583: Merge support for SQL Server instance names.  
						
						
						
						
					 
					
						2020-06-16 01:14:09 -07:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						31288fc4d0 
					 
					
						
						
							
							GUACAMOLE-728: Refactor with EnumGuacamoleProperty and fix up comments.  
						
						
						
						
					 
					
						2020-06-13 22:34:01 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						8c2df77f2d 
					 
					
						
						
							
							GUACAMOLE-728: Set legacy SSL options for MySQL  
						
						
						
						
					 
					
						2020-06-13 21:57:53 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						d5a3f8116e 
					 
					
						
						
							
							GUACAMOLE-728: Add PostgreSQL SSL mode configuration.  
						
						
						
						
					 
					
						2020-06-13 21:57:33 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						721010cc14 
					 
					
						
						
							
							GUACAMOLE-728: Implement MySQL driver SSL configuration.  
						
						
						
						
					 
					
						2020-06-13 21:57:27 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						2bbd039d5c 
					 
					
						
						
							
							Merge staging/1.2.0 changes back to master.  
						
						
						
						
					 
					
						2020-06-13 21:49:06 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						7c44ee2a67 
					 
					
						
						
							
							GUACAMOLE-728: Migrate existing enum-based GuacamoleProperty implementations to EnumGuacamoleProperty.  
						
						
						
						
					 
					
						2020-06-10 21:41:31 -07:00 
						 
				 
			
				
					
						
							
							
								darksimpson 
							
						 
					 
					
						
						
							
						
						49c3f59ddb 
					 
					
						
						
							
							GUACAMOLE-1054: Fixed formatting (lined up translation strings in groups)  
						
						
						
						
					 
					
						2020-05-06 13:03:32 +03:00 
						 
				 
			
				
					
						
							
							
								darksimpson 
							
						 
					 
					
						
						
							
						
						c7cc62803b 
					 
					
						
						
							
							GUACAMOLE-1054: Fixed some minor translation issues like removal of empty and not-really-translated  strings.  
						
						
						
						
					 
					
						2020-05-06 13:03:31 +03:00 
						 
				 
			
				
					
						
							
							
								darksimpson 
							
						 
					 
					
						
						
							
						
						4a6327e118 
					 
					
						
						
							
							GUACAMOLE-1054: Improve Russian translation  
						
						
						
						
					 
					
						2020-04-28 14:32:22 +03:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						0d1f42f6f4 
					 
					
						
						
							
							GUACAMOLE-1007: Use Translatable versions of GuacamoleException subclasses where translation keys are in use.  
						
						
						
						
					 
					
						2020-04-13 00:46:28 -07:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						dc09d0ef2a 
					 
					
						
						
							
							GUACAMOLE-583: Add ability to configure SQL Server instance name.  
						
						
						
						
					 
					
						2020-04-03 09:37:31 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						211f8e2b25 
					 
					
						
						
							
							GUACAMOLE-966: Bump client version numbers to 1.2.0  
						
						
						
						
					 
					
						2020-02-27 14:02:45 -05:00 
						 
				 
			
				
					
						
							
							
								Mike Jumper 
							
						 
					 
					
						
						
							
						
						9fdcccf79d 
					 
					
						
						
							
							GUACAMOLE-852: Merge support for selecting either MySQL or MariaDB JDBC drivers.  
						
						
						
						
					 
					
						2020-01-25 22:06:13 -08:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						59c430870d 
					 
					
						
						
							
							Merge staging/1.1.0 changes back to master.  
						
						
						
						
					 
					
						2020-01-20 03:48:44 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						76c1b0f9bb 
					 
					
						
						
							
							GUACAMOLE-929: Update copyright date to 2020.  
						
						
						
						
					 
					
						2020-01-19 13:39:54 -08:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						b4fa40ad34 
					 
					
						
						
							
							GUACAMOLE-852: Support either MySQL or MariaDB JDBC drivers.  
						
						
						
						
					 
					
						2019-12-26 22:11:33 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						5ff81f7735 
					 
					
						
						
							
							Merge 1.1.0 changes back to master.  
						
						... 
						
						
						
						Conflicts:
 * extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
 * extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
 * extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json
 * extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json
 * extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json
 * extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json
 * guacamole/src/main/webapp/translations/de.json 
						
						
					 
					
						2019-09-09 18:57:01 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Jumper 
							
						 
					 
					
						
						
							
						
						981adc94e6 
					 
					
						
						
							
							GUACAMOLE-699: Merge changes bringing German translations up-to-date.  
						
						
						
						
					 
					
						2019-09-09 18:52:53 -07:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						e5b93feb1e 
					 
					
						
						
							
							GUACAMOLE-870: Replace POSITION with CHARINDEX for SQL Server.  
						
						
						
						
					 
					
						2019-09-05 14:44:46 -04:00 
						 
				 
			
				
					
						
							
							
								leetxyz 
							
						 
					 
					
						
						
							
						
						5ac68c3f72 
					 
					
						
						
							
							GUACAMOLE-699: Fix language ordering, add de.json to auth-jdbc-*, fix intendation  
						
						
						
						
					 
					
						2019-08-15 18:09:30 +02: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 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						fbcb04e670 
					 
					
						
						
							
							Merge 1.1.0 changes back to master.  
						
						
						
						
					 
					
						2019-04-25 16:42:57 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						61b6664eac 
					 
					
						
						
							
							GUACAMOLE-715: Include all provided effective user groups that exist within the database in results of effective groups query, regardless of whether the user is declared as a member of those groups within the database.  
						
						... 
						
						
						
						While this query is generally functioning as described above for all
supported databases, it is not functioning properly for the
non-recursive variant of the MySQL/MariaDB query. This change corrects
that behavior. 
						
						
					 
					
						2019-04-21 12:02:25 -07: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 
							
						 
					 
					
						
						
							
						
						60dab1fdbd 
					 
					
						
						
							
							GUACAMOLE-736: Remove JAXB license info; add Guava license info.  
						
						
						
						
					 
					
						2019-02-21 17:17:29 -05:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						37f1da9f1f 
					 
					
						
						
							
							GUACAMOLE-736: Replace JAXB DatatypeConverter with Guava BaseEncoding.  
						
						
						
						
					 
					
						2019-02-21 17:09:44 -05:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						055dfc93ef 
					 
					
						
						
							
							GUACAMOLE-736: Stick with alphabetic order in LICENSE files.  
						
						
						
						
					 
					
						2019-02-19 10:39:40 -05:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						8fa71d2fd2 
					 
					
						
						
							
							GUACAMOLE-736: Add license information for jaxb-api.  
						
						
						
						
					 
					
						2019-02-18 08:58:19 -05:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						404e1d2ec4 
					 
					
						
						
							
							GUACAMOLE-736: Bump jaxb-api to version 2.3.1  
						
						
						
						
					 
					
						2019-02-18 08:43:18 -05:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						d907767d52 
					 
					
						
						
							
							GUACAMOLE-736: Explicitly pull in javax.xml.bind depdendency for modules that require it.  
						
						
						
						
					 
					
						2019-02-17 18:28:37 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						c3fbf44f70 
					 
					
						
						
							
							GUACAMOLE-729: Bump version numbers to 1.1.0.  
						
						
						
						
					 
					
						2019-02-09 11:08:28 -08:00 
						 
				 
			
				
					
						
							
							
								Mike Jumper 
							
						 
					 
					
						
						
							
						
						df7404f4cb 
					 
					
						
						
							
							GUACAMOLE-693: Merge update to NOTICE copyright year (2018 -> 2019).  
						
						
						
						
					 
					
						2019-01-24 16:43:48 -08:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						ba198398e0 
					 
					
						
						
							
							GUACAMOLE-697: Add DISTINCT to selectOne permissions queries.  
						
						
						
						
					 
					
						2019-01-24 07:53:22 -05:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						af2ef32fc3 
					 
					
						
						
							
							GUACAMOLE-693: Update copyright year to 2019.  
						
						
						
						
					 
					
						2019-01-23 17:12:45 -05:00