GUACAMOLE-152: Merge changes adding support for explicitly specifying the zoom level.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/1710c31f Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/1710c31f Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/1710c31f Branch: refs/heads/master Commit: 1710c31fc2c0c8f56326e4175d13b21640d477ba Parents: fed5133 a020082 Author: Michael Jumper <mjum...@apache.org> Authored: Thu May 17 12:49:01 2018 -0700 Committer: Michael Jumper <mjum...@apache.org> Committed: Thu May 17 12:49:01 2018 -0700 ---------------------------------------------------------------------- .../app/client/controllers/clientController.js | 14 ++++-- .../app/client/directives/guacZoomCtrl.js | 48 ++++++++++++++++++++ .../src/main/webapp/app/client/styles/menu.css | 21 +++++++++ .../webapp/app/client/templates/client.html | 7 ++- 4 files changed, 85 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
