Commit Graph

3 Commits

Author SHA1 Message Date
James Muehlner
3c55e97abe GUAC-933 Fixed connection history formatting, connection parameter saving, and create new connection view. 2014-12-09 23:30:14 -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
James Muehlner
72c82aea8b GUAC-807: Fixed connection parameter editing and made menu show on keydown instead of keyup. 2014-11-03 14:02:32 -08:00