Commit Graph
105 Commits
Author SHA1 Message Date
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 41324be7b9 GUAC-897 Using a spinner instead of a distracting modal. 2014-11-19 23:01:23 -08:00
Michael Jumper 6bea1eed44 GUAC-919: Rename LoginRESTService to TokenRESTService and provide logout semantics. Move Angular auth stuff to own module. Actually logout user. 2014-11-05 12:10:05 -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
James Muehlner 5c43ae4ff9 GUAC-919: Copy Angular changes from old GUAC-546 branch. 2014-11-03 13:57:01 -08:00