James Muehlner
							
						 
					 | 
					
						
						
							
						
						ee0788258b
					 | 
					
						
						
							
							Merge pull request #15 from glyptodon/notification-progress-bar
						
						
						
						
						
						
						
						GUAC-928: Notification progress bar 
						
						
					 | 
					
						2014-12-05 11:05:12 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						d4851b0ec2
					 | 
					
						
						
							
							GUAC-932: Remove round borders on progress bar.
						
						
						
						
						
						
					 | 
					
						2014-12-05 10:54:10 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						6c96affbd8
					 | 
					
						
						
							
							GUAC-928: Add progress bar to notifications.
						
						
						
						
						
						
					 | 
					
						2014-12-05 10:47:22 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mike Jumper
							
						 
					 | 
					
						
						
							
						
						4636a1994a
					 | 
					
						
						
							
							Merge pull request #14 from glyptodon/GUAC-928
						
						
						
						
						
						
						
						GUAC-928 File Transfer not working 
						
						
					 | 
					
						2014-12-05 02:12:05 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Muehlner
							
						 
					 | 
					
						
						
							
						
						8ddf6e99b7
					 | 
					
						
						
							
							GUAC-928 Restore file upload functionality, improve error appearance, and add translated units and file upload sizes.
						
						
						
						
						
						
					 | 
					
						2014-12-04 23:52:02 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Muehlner
							
						 
					 | 
					
						
						
							
						
						466aa8ba2d
					 | 
					
						
						
							
							GUAC-928 Always send error codes as numbers, not strings.
						
						
						
						
						
						
					 | 
					
						2014-12-04 23:51:16 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Muehlner
							
						 
					 | 
					
						
						
							
						
						41b72e0f76
					 | 
					
						
						
							
							Merge pull request #12 from glyptodon/swedish-keymap
						
						
						
						
						
						
						
						GUAC-930: Add Swedish keymap to known parameter values. 
						
						
					 | 
					
						2014-11-29 23:16:58 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Muehlner
							
						 
					 | 
					
						
						
							
						
						bfe0f737e3
					 | 
					
						
						
							
							Merge pull request #13 from glyptodon/reconnect-countdown
						
						
						
						
						
						
						
						GUAC-605: Add reconnect countdown 
						
						
					 | 
					
						2014-11-29 21:20:26 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						ed31e0c026
					 | 
					
						
						
							
							GUAC-605: Migrate status to guacNotification. Add countdown string to en_US translation. Use 15 second reconnect countdown if appropriate for error at hand.
						
						
						
						
						
						
					 | 
					
						2014-11-29 20:54:50 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						5b31b206a7
					 | 
					
						
						
							
							GUAC-605: Add guacNotification directive.
						
						
						
						
						
						
					 | 
					
						2014-11-29 20:23:58 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						1d86419cc1
					 | 
					
						
						
							
							GUAC-605: Use MessageFormat interpolation for angular-translate.
						
						
						
						
						
						
					 | 
					
						2014-11-28 22:25:42 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						d9fcec314a
					 | 
					
						
						
							
							GUAC-930: Add Swedish keymap to known parameter values.
						
						
						
						
						
						
					 | 
					
						2014-11-28 19:37:53 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mike Jumper
							
						 
					 | 
					
						
						
							
						
						dfcbd80b35
					 | 
					
						
						
							
							Merge pull request #11 from glyptodon/GUAC-928
						
						
						
						
						
						
						
						GUAC-928 Added file transfer support. 
						
						
					 | 
					
						2014-11-25 01:56:49 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Muehlner
							
						 
					 | 
					
						
						
							
						
						d242c2c1bc
					 | 
					
						
						
							
							GUAC-928 Added file transfer support.
						
						
						
						
						
						
					 | 
					
						2014-11-24 23:39:05 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						be3ad5151e
					 | 
					
						
						
							
							GUAC-932: Fix mobile-web-app-capable and associated icon.
						
						
						
						
						
						
					 | 
					
						2014-11-24 04:03:42 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						8e6156f750
					 | 
					
						
						
							
							GUAC-932: Style no-recent to be a bit more subdued.
						
						
						
						
						
						
					 | 
					
						2014-11-23 22:15:03 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						c12beb8b21
					 | 
					
						
						
							
							GUAC-932: Use black icons.
						
						
						
						
						
						
					 | 
					
						2014-11-23 22:02:30 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						134837b73c
					 | 
					
						
						
							
							GUAC-932: Fix button style.
						
						
						
						
						
						
					 | 
					
						2014-11-23 22:02:28 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						58e73435d3
					 | 
					
						
						
							
							GUAC-932: Replace green spinner with spinning cog.
						
						
						
						
						
						
					 | 
					
						2014-11-23 22:02:26 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						d32ca5bfca
					 | 
					
						
						
							
							GUAC-932: Restyle login page and general UI.
						
						
						
						
						
						
					 | 
					
						2014-11-23 22:02:24 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						b58a9b284f
					 | 
					
						
						
							
							GUAC-932: Restyle login page and general UI.
						
						
						
						
						
						
					 | 
					
						2014-11-23 22:02:11 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						49b91ebe56
					 | 
					
						
						
							
							GUAC-340: Expose available protocols within Environment.
						
						
						
						
						
						
					 | 
					
						2014-11-23 17:39:48 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						ff286264e4
					 | 
					
						
						
							
							GUAC-340: Add Environment and LocalEnvironment, collectively replacing GuacamoleHome and GuacamoleProperties. Mark GuacamoleHome and GuacamoleProperties as deprecated. Remove use of deprecated classes within guacamole-ext.
						
						
						
						
						
						
					 | 
					
						2014-11-23 14:01:19 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						b68f9a0a26
					 | 
					
						
						
							
							Merge branch 'master' into GUAC-546-REWRITE
						
						
						
						
						
						
						
						Conflicts:
	guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/protocol/ProtocolRetrievalService.java
	guacamole/src/main/webapp/scripts/admin-ui.js
	guacamole/src/main/webapp/scripts/service.js 
						
						
					 | 
					
						2014-11-23 13:06:12 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						534f4f45c1
					 | 
					
						
						
							
							GUAC-340: Add support for "username" parameter type.
						
						
						
						
						
						
					 | 
					
						2014-11-23 12:57:19 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						ad6d7a614e
					 | 
					
						
						
							
							GUAC-932: Divide monolithic CSS files.
						
						
						
						
						
						
					 | 
					
						2014-11-22 14:13:15 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						07282978c1
					 | 
					
						
						
							
							Merge branch 'master' into GUAC-546-REWRITE
						
						
						
						
						
						
						
						Conflicts:
	guacamole/src/main/webapp/scripts/client-ui.js 
						
						
					 | 
					
						2014-11-22 13:14:55 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						02189e3d7c
					 | 
					
						
						
							
							GUAC-865: Add RDP DPI parameter.
						
						
						
						
						
						
					 | 
					
						2014-11-21 16:46:22 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						c8e7b5f328
					 | 
					
						
						
							
							GUAC-865: Just send actual dimensions as the optimal size. Do not force 600x600.
						
						
						
						
						
						
					 | 
					
						2014-11-21 16:23:30 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Muehlner
							
						 
					 | 
					
						
						
							
						
						14c6996267
					 | 
					
						
						
							
							GUAC-897 New loading styling belongs in ui.css, not status.css.
						
						
						
						
						
						
					 | 
					
						2014-11-19 23:13:40 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Muehlner
							
						 
					 | 
					
						
						
							
						
						41324be7b9
					 | 
					
						
						
							
							GUAC-897 Using a spinner instead of a distracting modal.
						
						
						
						
						
						
					 | 
					
						2014-11-19 23:01:23 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Muehlner
							
						 
					 | 
					
						
						
							
						
						683fc4475b
					 | 
					
						
						
							
							GUAC-897 Added status message while home or manage pages are loading.
						
						
						
						
						
						
					 | 
					
						2014-11-18 22:51:25 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Muehlner
							
						 
					 | 
					
						
						
							
						
						2c47fbb55c
					 | 
					
						
						
							
							GUAC-897 Fixed cg vs g confusion for connection group type identifier in javascript and templates.
						
						
						
						
						
						
					 | 
					
						2014-11-18 22:19:26 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Muehlner
							
						 
					 | 
					
						
						
							
						
						08d075f473
					 | 
					
						
						
							
							GUAC-929 Fixed bugs around keys getting stuck down when menu is hidden, and error when clipboard isn't set to any value.
						
						
						
						
						
						
					 | 
					
						2014-11-18 19:54:43 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Muehlner
							
						 
					 | 
					
						
						
							
						
						863f30a8dc
					 | 
					
						
						
							
							GUAC-927 Removed unnecessary ../ from icon link tag.
						
						
						
						
						
						
					 | 
					
						2014-11-18 18:53:34 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						80377f6663
					 | 
					
						
						
							
							GUAC-605: Use status dialog from index, not status modal.
						
						
						
						
						
						
					 | 
					
						2014-11-16 23:10:49 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						0f159d73ad
					 | 
					
						
						
							
							GUAC-605: Use consistent event naming.
						
						
						
						
						
						
					 | 
					
						2014-11-16 16:47:55 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						452ec41fbd
					 | 
					
						
						
							
							GUAC-605: Fix clipboard handling.
						
						
						
						
						
						
					 | 
					
						2014-11-16 16:43:39 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						4e67487077
					 | 
					
						
						
							
							GUAC-605: Fix usage of scope within client and tunnel.
						
						
						
						
						
						
					 | 
					
						2014-11-16 15:41:06 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						0bd1fdc16f
					 | 
					
						
						
							
							GUAC-605: Simplify status modal API.
						
						
						
						
						
						
					 | 
					
						2014-11-16 15:06:19 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						5581fcc382
					 | 
					
						
						
							
							GUAC-605: Restore connection name handling.
						
						
						
						
						
						
					 | 
					
						2014-11-14 21:44:32 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						9fcd7af361
					 | 
					
						
						
							
							GUAC-605: Add separate stylesheet for status dialogs.
						
						
						
						
						
						
					 | 
					
						2014-11-14 21:36:14 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						49637fe17f
					 | 
					
						
						
							
							GUAC-605: Separate common mouse code into functions.
						
						
						
						
						
						
					 | 
					
						2014-11-14 15:35:34 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						534c706d1b
					 | 
					
						
						
							
							GUAC-605: Remove menu/clipboard logic from client directive. It belongs elsewhere and, in the case of the menu, already is elsewhere.
						
						
						
						
						
						
					 | 
					
						2014-11-14 15:21:10 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						1a69a12c61
					 | 
					
						
						
							
							GUAC-605: Allow non-root scope for client and tunnel factories.
						
						
						
						
						
						
					 | 
					
						2014-11-14 15:08:34 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						777761a616
					 | 
					
						
						
							
							GUAC-605: Add comments denoting logical sections. Fix keyboard default prevention logic.
						
						
						
						
						
						
					 | 
					
						2014-11-14 14:22:28 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						38153b49d3
					 | 
					
						
						
							
							GUAC-605: Move mouse and touch handling outside client attach.
						
						
						
						
						
						
					 | 
					
						2014-11-14 14:11:35 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						7956a0302d
					 | 
					
						
						
							
							GUAC-605: Implement reconnect.
						
						
						
						
						
						
					 | 
					
						2014-11-14 13:41:56 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						14446d1afa
					 | 
					
						
						
							
							GUAC-605: Move client, display, and display element to higher, shared level.
						
						
						
						
						
						
					 | 
					
						2014-11-14 13:36:35 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						5db4905510
					 | 
					
						
						
							
							GUAC-605: Clean up and rename variable use. Remove unnecessary DOM manipulation.
						
						
						
						
						
						
					 | 
					
						2014-11-14 12:33:47 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |