You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/03/13 09:06:23 UTC
[1/3] syncope git commit: Fix typo
Repository: syncope
Updated Branches:
refs/heads/1_2_X 7b2bb2df7 -> 247d883da
refs/heads/master 7705b6984 -> 5378fb4e1
Fix typo
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/247d883d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/247d883d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/247d883d
Branch: refs/heads/1_2_X
Commit: 247d883dac7bd38e91205d380163aff76b0c27e9
Parents: 7b2bb2d
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Mar 13 09:05:48 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Mar 13 09:05:48 2015 +0100
----------------------------------------------------------------------
.../console/pages/panels/AccountInformationPanel.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/247d883d/console/src/main/resources/org/apache/syncope/console/pages/panels/AccountInformationPanel.properties
----------------------------------------------------------------------
diff --git a/console/src/main/resources/org/apache/syncope/console/pages/panels/AccountInformationPanel.properties b/console/src/main/resources/org/apache/syncope/console/pages/panels/AccountInformationPanel.properties
index 799c968..e3ba3f5 100644
--- a/console/src/main/resources/org/apache/syncope/console/pages/panels/AccountInformationPanel.properties
+++ b/console/src/main/resources/org/apache/syncope/console/pages/panels/AccountInformationPanel.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
changePwdDate=Last Change Password Date
-lastLoginDate=Last Login Data
+lastLoginDate=Last Login Date
failedLogins=Subsequent Failed Logins
token=Token
tokenExpireTime=Token Expire Time
[3/3] syncope git commit: Merge branch '1_2_X'
Posted by il...@apache.org.
Merge branch '1_2_X'
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5378fb4e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5378fb4e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5378fb4e
Branch: refs/heads/master
Commit: 5378fb4e169c32bd48d938012835851910fae3b5
Parents: 7705b69 247d883
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Mar 13 09:06:00 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Mar 13 09:06:00 2015 +0100
----------------------------------------------------------------------
.../client/console/panels/AccountInformationPanel.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/5378fb4e/client/console/src/main/resources/org/apache/syncope/client/console/panels/AccountInformationPanel.properties
----------------------------------------------------------------------
diff --cc client/console/src/main/resources/org/apache/syncope/client/console/panels/AccountInformationPanel.properties
index 799c968,0000000..e3ba3f5
mode 100644,000000..100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/AccountInformationPanel.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/AccountInformationPanel.properties
@@@ -1,22 -1,0 +1,22 @@@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+changePwdDate=Last Change Password Date
- lastLoginDate=Last Login Data
++lastLoginDate=Last Login Date
+failedLogins=Subsequent Failed Logins
+token=Token
+tokenExpireTime=Token Expire Time
+confirmPassword=Password (confirm)
[2/3] syncope git commit: Fix typo
Posted by il...@apache.org.
Fix typo
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/247d883d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/247d883d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/247d883d
Branch: refs/heads/master
Commit: 247d883dac7bd38e91205d380163aff76b0c27e9
Parents: 7b2bb2d
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Mar 13 09:05:48 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Mar 13 09:05:48 2015 +0100
----------------------------------------------------------------------
.../console/pages/panels/AccountInformationPanel.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/247d883d/console/src/main/resources/org/apache/syncope/console/pages/panels/AccountInformationPanel.properties
----------------------------------------------------------------------
diff --git a/console/src/main/resources/org/apache/syncope/console/pages/panels/AccountInformationPanel.properties b/console/src/main/resources/org/apache/syncope/console/pages/panels/AccountInformationPanel.properties
index 799c968..e3ba3f5 100644
--- a/console/src/main/resources/org/apache/syncope/console/pages/panels/AccountInformationPanel.properties
+++ b/console/src/main/resources/org/apache/syncope/console/pages/panels/AccountInformationPanel.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
changePwdDate=Last Change Password Date
-lastLoginDate=Last Login Data
+lastLoginDate=Last Login Date
failedLogins=Subsequent Failed Logins
token=Token
tokenExpireTime=Token Expire Time