You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2017/06/27 19:18:13 UTC
[1/2] incubator-guacamole-client git commit: GUACAMOLE-332: Merge
correct appearance of CAS redirect notification to staging/0.9.13-incubating.
Repository: incubator-guacamole-client
Updated Branches:
refs/heads/master 0903aaef0 -> 303be24cc
GUACAMOLE-332: Merge correct appearance of CAS redirect notification to staging/0.9.13-incubating.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/b2174556
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/b2174556
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/b2174556
Branch: refs/heads/master
Commit: b21745568e67498eb328f2f83d133bf4ac2812cc
Parents: 04c70c7 5781a8d
Author: Nick Couchman <ni...@yahoo.com>
Authored: Tue Jun 27 14:56:57 2017 -0400
Committer: Nick Couchman <ni...@yahoo.com>
Committed: Tue Jun 27 14:56:57 2017 -0400
----------------------------------------------------------------------
extensions/guacamole-auth-cas/.gitignore | 2 +-
extensions/guacamole-auth-cas/pom.xml | 80 ++++++++++++++++++++
.../src/main/resources/casConfig.js | 33 --------
.../src/main/resources/casController.js | 30 --------
.../src/main/resources/config/casConfig.js | 33 ++++++++
.../main/resources/controllers/casController.js | 30 ++++++++
.../src/main/resources/guac-manifest.json | 14 +++-
.../src/main/resources/license.txt | 18 +++++
.../src/main/resources/styles/cas.css | 35 +++++++++
.../resources/templates/casTicketField.html | 5 ++
.../src/main/resources/translations/en.json | 2 +-
11 files changed, 213 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
[2/2] incubator-guacamole-client git commit: Merge 0.9.13-incubating
changes back to master.
Posted by vn...@apache.org.
Merge 0.9.13-incubating changes back to master.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/303be24c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/303be24c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/303be24c
Branch: refs/heads/master
Commit: 303be24cc1e597d5cf0b247c8d3bce76bd01ddc5
Parents: 0903aae b217455
Author: Nick Couchman <vn...@apache.org>
Authored: Tue Jun 27 15:16:43 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Tue Jun 27 15:16:43 2017 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------