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 2018/11/10 01:26:39 UTC
[1/3] guacamole-client git commit: GUACAMOLE-220: Group attribute
"disabled" controls whether the group has any effect,
not whether login is allowed.
Repository: guacamole-client
Updated Branches:
refs/heads/master d4f58f2c0 -> 823bbeace
GUACAMOLE-220: Group attribute "disabled" controls whether the group has any effect, not whether login is allowed.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/3c5594db
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/3c5594db
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/3c5594db
Branch: refs/heads/master
Commit: 3c5594db2e37a6f007c458243b6bf1735cacebea
Parents: fd1928e
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Nov 3 17:24:06 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Nov 3 17:24:06 2018 -0700
----------------------------------------------------------------------
.../src/main/resources/translations/en.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3c5594db/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
index 5520a81..b286f0c 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
@@ -104,9 +104,9 @@
"USER_GROUP_ATTRIBUTES" : {
- "FIELD_HEADER_DISABLED" : "@:USER_ATTRIBUTES.FIELD_HEADER_DISABLED",
+ "FIELD_HEADER_DISABLED" : "Disabled:",
- "SECTION_HEADER_RESTRICTIONS" : "@:USER_ATTRIBUTES.SECTION_HEADER_RESTRICTIONS"
+ "SECTION_HEADER_RESTRICTIONS" : "Group Restrictions"
}
[3/3] guacamole-client git commit: Merge 1.0.0 changes back to master.
Posted by vn...@apache.org.
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/823bbeac
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/823bbeac
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/823bbeac
Branch: refs/heads/master
Commit: 823bbeace11063b249e3f05c2a1e5c5027107b96
Parents: d4f58f2 001ece1
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Nov 9 20:26:05 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Fri Nov 9 20:26:05 2018 -0500
----------------------------------------------------------------------
.../src/main/resources/translations/en.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] guacamole-client git commit: GUACAMOLE-220: Merge correct
translation strings for user group "disabled" attribute.
Posted by vn...@apache.org.
GUACAMOLE-220: Merge correct translation strings for user group "disabled" attribute.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/001ece14
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/001ece14
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/001ece14
Branch: refs/heads/master
Commit: 001ece14e2cef413355e3b78161d80af8b7274d2
Parents: 4d85845 3c5594d
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Nov 9 20:24:24 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Fri Nov 9 20:24:24 2018 -0500
----------------------------------------------------------------------
.../src/main/resources/translations/en.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------