[7/7] guacamole-client git commit: Merge 1.0.0 changes back to master.

2018-10-03 Thread vnick 
Merge 1.0.0 changes back to master.


Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/31c8dfe2
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/31c8dfe2
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/31c8dfe2

Branch: refs/heads/master
Commit: 31c8dfe28b1165cb0b8382e47b8b7297665369b3
Parents: 863670a c04a71e
Author: Nick Couchman 
Authored: Wed Oct 3 14:26:40 2018 -0400
Committer: Nick Couchman 
Committed: Wed Oct 3 14:26:40 2018 -0400

--
 .../src/main/webapp/modules/Keyboard.js | 116 ---
 1 file changed, 98 insertions(+), 18 deletions(-)
--

[7/7] guacamole-client git commit: Merge 1.0.0 changes back to master.

2018-09-07 Thread vnick 
Merge 1.0.0 changes back to master.


Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/0484a4e4
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/0484a4e4
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/0484a4e4

Branch: refs/heads/master
Commit: 0484a4e485904625d924b796145ff341523677cd
Parents: 81010a8 7640065
Author: Nick Couchman 
Authored: Fri Sep 7 19:06:20 2018 -0400
Committer: Nick Couchman 
Committed: Fri Sep 7 19:06:20 2018 -0400

--
 .../src/main/webapp/modules/Tunnel.js   |  82 -
 .../GuacamoleWebSocketTunnelEndpoint.java   | 121 +--
 .../jetty8/GuacamoleWebSocketTunnelServlet.java | 111 -
 .../GuacamoleWebSocketTunnelListener.java   | 121 +--
 .../tomcat/GuacamoleWebSocketTunnelServlet.java | 110 -
 .../app/client/controllers/clientController.js  |   2 +-
 .../webapp/app/client/types/ManagedClient.js|   8 +-
 .../app/client/types/ManagedClientState.js  |  40 --
 8 files changed, 543 insertions(+), 52 deletions(-)
--