You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/08/14 00:55:58 UTC
[1/2] incubator-guacamole-client git commit: GUACAMOLE-72: Sharing
profile parameters are stored under "sharingProfileForms", not "forms".
Repository: incubator-guacamole-client
Updated Branches:
refs/heads/master 8e283ef23 -> 6165ce3de
GUACAMOLE-72: Sharing profile parameters are stored under "sharingProfileForms", not "forms".
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/38bf6474
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/38bf6474
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/38bf6474
Branch: refs/heads/master
Commit: 38bf6474b90cc522f18e2697c314c9f68ebfe4c5
Parents: 8e283ef
Author: Michael Jumper <mj...@apache.org>
Authored: Thu Aug 11 16:30:30 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Thu Aug 11 16:30:30 2016 -0700
----------------------------------------------------------------------
.../src/main/webapp/app/manage/templates/manageSharingProfile.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/38bf6474/guacamole/src/main/webapp/app/manage/templates/manageSharingProfile.html
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageSharingProfile.html b/guacamole/src/main/webapp/app/manage/templates/manageSharingProfile.html
index 121e4fe..4873b86 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manageSharingProfile.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manageSharingProfile.html
@@ -29,7 +29,7 @@
<h2 class="header">{{'MANAGE_SHARING_PROFILE.SECTION_HEADER_PARAMETERS' | translate}}</h2>
<div class="section connection-parameters" ng-class="{loading: !parameters}">
<guac-form namespace="getNamespace(primaryConnection.protocol)"
- content="protocols[primaryConnection.protocol].forms"
+ content="protocols[primaryConnection.protocol].sharingProfileForms"
model="parameters"></guac-form>
</div>
[2/2] incubator-guacamole-client git commit: GUACAMOLE-72: Merge fix
for sharing profile parameters.
Posted by jm...@apache.org.
GUACAMOLE-72: Merge fix for sharing profile parameters.
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/6165ce3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/6165ce3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/6165ce3d
Branch: refs/heads/master
Commit: 6165ce3deb20f316313e50667d31d619478fee90
Parents: 8e283ef 38bf647
Author: James Muehlner <ja...@guac-dev.org>
Authored: Sat Aug 13 17:55:21 2016 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Sat Aug 13 17:55:21 2016 -0700
----------------------------------------------------------------------
.../src/main/webapp/app/manage/templates/manageSharingProfile.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------