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 2018/06/04 09:28:15 UTC
[1/4] syncope git commit: Refreshing LICENSE and NOTICE files for
Chart.js
Repository: syncope
Updated Branches:
refs/heads/2_0_X 4177f4d38 -> 06e5dcd80
refs/heads/master 047467da1 -> bfcc23cbb
Refreshing LICENSE and NOTICE files for Chart.js
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f43c1af6
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f43c1af6
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f43c1af6
Branch: refs/heads/2_0_X
Commit: f43c1af63874d5707091e16b96866d9d1b5cc85a
Parents: 4177f4d
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Jun 4 10:59:56 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Jun 4 10:59:56 2018 +0200
----------------------------------------------------------------------
deb/console/LICENSE | 15 ++++++++++-----
deb/console/NOTICE | 10 ++++++++++
standalone/LICENSE | 10 +++++-----
standalone/NOTICE | 5 +++++
4 files changed, 30 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f43c1af6/deb/console/LICENSE
----------------------------------------------------------------------
diff --git a/deb/console/LICENSE b/deb/console/LICENSE
index b1e502c..99b82d1 100644
--- a/deb/console/LICENSE
+++ b/deb/console/LICENSE
@@ -262,11 +262,6 @@ This is licensed under the AL 2.0, see above.
==
-For Wicket-chartjs (https://pingunaut.com/wicket-chartjs/):
-This is licensed under the AL 2.0, see above.
-
-==
-
For JAX-B (http://jaxb.java.net/):
This is licensed under the CDDL 1.0:
@@ -663,6 +658,11 @@ This is licensed under the AL 2.0, see above.
==
+For Swagger (http://swagger.io/):
+This is licensed under the AL 2.0, see above.
+
+==
+
For Ionicons (http://ionicons.com/):
This is licensed under the MIT license, see above.
@@ -773,6 +773,11 @@ This is licensed under the BSD license, see above.
==
+For Chart.js (http://www.chartjs.org/):
+This is licensed under the AL 2.0, see above.
+
+==
+
For spin.js (http://spin.js.org/):
This is licensed under the MIT license, see above.
http://git-wip-us.apache.org/repos/asf/syncope/blob/f43c1af6/deb/console/NOTICE
----------------------------------------------------------------------
diff --git a/deb/console/NOTICE b/deb/console/NOTICE
index 97bbc96..9e6a807 100644
--- a/deb/console/NOTICE
+++ b/deb/console/NOTICE
@@ -53,6 +53,11 @@ Copyright (c) 2006 Google Inc.
==
+This product includes software developed by the Swagger project.
+Copyright 2016 SmartBear Software
+
+==
+
This product includes software developed by the Ionicons project.
Copyright (c) 2016 Drifty (http://drifty.com/)
@@ -132,6 +137,11 @@ Copyright (c) 2011-2015 Felix Gnass [fgnass at gmail dot com]
==
+This product includes software developed by the Chart.js project.
+Copyright (c) 2018 Chart.js Contributors
+
+==
+
This product includes software developed by the X-editable project.
Copyright (c) 2012 Vitaliy Potapov
http://git-wip-us.apache.org/repos/asf/syncope/blob/f43c1af6/standalone/LICENSE
----------------------------------------------------------------------
diff --git a/standalone/LICENSE b/standalone/LICENSE
index 2d4441d..65861ae 100644
--- a/standalone/LICENSE
+++ b/standalone/LICENSE
@@ -496,11 +496,6 @@ This is licensed under the AL 2.0, see above.
==
-For Wicket-chartjs (https://pingunaut.com/wicket-chartjs/):
-This is licensed under the AL 2.0, see above.
-
-==
-
For JAX-B (http://jaxb.java.net/):
This is licensed under the CDDL 1.0:
@@ -1167,6 +1162,11 @@ This is licensed under the BSD license, see above.
==
+For Chart.js (http://www.chartjs.org/):
+This is licensed under the AL 2.0, see above.
+
+==
+
For ng-password-strength (https://github.com/subarroca/ng-password-strength):
This is licensed under the MIT license, see above.
http://git-wip-us.apache.org/repos/asf/syncope/blob/f43c1af6/standalone/NOTICE
----------------------------------------------------------------------
diff --git a/standalone/NOTICE b/standalone/NOTICE
index ff5bf2d..6a807c8 100644
--- a/standalone/NOTICE
+++ b/standalone/NOTICE
@@ -283,6 +283,11 @@ Copyright (c) 2014 - 2016, Kartik Visweswaran Krajee.com All rights reserved.
==
+This product includes software developed by the Chart.js project.
+Copyright (c) 2018 Chart.js Contributors
+
+==
+
This product contains unmodified binary redistributions for H2 database engine,
which is dual licensed and available under a modified version of the MPL 1.1 (Mozilla Public License) or under the
(unmodified) EPL 1.0 (Eclipse Public License).
[2/4] syncope git commit: Refreshing LICENSE and NOTICE files for
Chart.js
Posted by il...@apache.org.
Refreshing LICENSE and NOTICE files for Chart.js
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/234529ac
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/234529ac
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/234529ac
Branch: refs/heads/master
Commit: 234529acfab50d5c458d161a0285af0da3a13e38
Parents: 047467d
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Jun 4 10:59:56 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Jun 4 11:00:10 2018 +0200
----------------------------------------------------------------------
deb/console/LICENSE | 15 ++++++++++-----
deb/console/NOTICE | 10 ++++++++++
standalone/LICENSE | 10 +++++-----
standalone/NOTICE | 5 +++++
4 files changed, 30 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/234529ac/deb/console/LICENSE
----------------------------------------------------------------------
diff --git a/deb/console/LICENSE b/deb/console/LICENSE
index b1e502c..99b82d1 100644
--- a/deb/console/LICENSE
+++ b/deb/console/LICENSE
@@ -262,11 +262,6 @@ This is licensed under the AL 2.0, see above.
==
-For Wicket-chartjs (https://pingunaut.com/wicket-chartjs/):
-This is licensed under the AL 2.0, see above.
-
-==
-
For JAX-B (http://jaxb.java.net/):
This is licensed under the CDDL 1.0:
@@ -663,6 +658,11 @@ This is licensed under the AL 2.0, see above.
==
+For Swagger (http://swagger.io/):
+This is licensed under the AL 2.0, see above.
+
+==
+
For Ionicons (http://ionicons.com/):
This is licensed under the MIT license, see above.
@@ -773,6 +773,11 @@ This is licensed under the BSD license, see above.
==
+For Chart.js (http://www.chartjs.org/):
+This is licensed under the AL 2.0, see above.
+
+==
+
For spin.js (http://spin.js.org/):
This is licensed under the MIT license, see above.
http://git-wip-us.apache.org/repos/asf/syncope/blob/234529ac/deb/console/NOTICE
----------------------------------------------------------------------
diff --git a/deb/console/NOTICE b/deb/console/NOTICE
index 97bbc96..9e6a807 100644
--- a/deb/console/NOTICE
+++ b/deb/console/NOTICE
@@ -53,6 +53,11 @@ Copyright (c) 2006 Google Inc.
==
+This product includes software developed by the Swagger project.
+Copyright 2016 SmartBear Software
+
+==
+
This product includes software developed by the Ionicons project.
Copyright (c) 2016 Drifty (http://drifty.com/)
@@ -132,6 +137,11 @@ Copyright (c) 2011-2015 Felix Gnass [fgnass at gmail dot com]
==
+This product includes software developed by the Chart.js project.
+Copyright (c) 2018 Chart.js Contributors
+
+==
+
This product includes software developed by the X-editable project.
Copyright (c) 2012 Vitaliy Potapov
http://git-wip-us.apache.org/repos/asf/syncope/blob/234529ac/standalone/LICENSE
----------------------------------------------------------------------
diff --git a/standalone/LICENSE b/standalone/LICENSE
index 3b15c32..ad734fb 100644
--- a/standalone/LICENSE
+++ b/standalone/LICENSE
@@ -496,11 +496,6 @@ This is licensed under the AL 2.0, see above.
==
-For Wicket-chartjs (https://pingunaut.com/wicket-chartjs/):
-This is licensed under the AL 2.0, see above.
-
-==
-
For JAX-B (http://jaxb.java.net/):
This is licensed under the CDDL 1.0:
@@ -1167,6 +1162,11 @@ This is licensed under the BSD license, see above.
==
+For Chart.js (http://www.chartjs.org/):
+This is licensed under the AL 2.0, see above.
+
+==
+
For ng-password-strength (https://github.com/subarroca/ng-password-strength):
This is licensed under the MIT license, see above.
http://git-wip-us.apache.org/repos/asf/syncope/blob/234529ac/standalone/NOTICE
----------------------------------------------------------------------
diff --git a/standalone/NOTICE b/standalone/NOTICE
index fccee0f..d8270f5 100644
--- a/standalone/NOTICE
+++ b/standalone/NOTICE
@@ -283,6 +283,11 @@ Copyright (c) 2014 - 2016, Kartik Visweswaran Krajee.com All rights reserved.
==
+This product includes software developed by the Chart.js project.
+Copyright (c) 2018 Chart.js Contributors
+
+==
+
This product contains unmodified binary redistributions for H2 database engine,
which is dual licensed and available under a modified version of the MPL 1.1 (Mozilla Public License) or under the
(unmodified) EPL 1.0 (Eclipse Public License).
[3/4] syncope git commit: Adjusting links to work with latest
AngularJS
Posted by il...@apache.org.
Adjusting links to work with latest AngularJS
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/06e5dcd8
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/06e5dcd8
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/06e5dcd8
Branch: refs/heads/2_0_X
Commit: 06e5dcd80ddf6e0d89cc7f2b4b8205a7ba029a56
Parents: f43c1af
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Jun 4 11:27:55 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Jun 4 11:27:55 2018 +0200
----------------------------------------------------------------------
.../src/main/resources/META-INF/resources/app/views/self.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/06e5dcd8/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/self.html b/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
index cedb21c..defab42 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
@@ -75,12 +75,12 @@ under the License.
</div>
</div>
<div class="text-center" ng-show="$root.isSelfRegAllowed()">
- <a href="javascript:void(0);" class="btn btn-link" ng-click="selfCreate()" id="register">
+ <a href="#" class="btn btn-link" ng-click="$event.preventDefault();selfCreate();" id="register">
{{ 'SELFREGISTRATION' | translate}}
</a>
</div>
<div class="text-center" ng-show="$root.isPwdResetAllowed()">
- <a href="javascript:void(0);" class="btn btn-link" ng-click="passwordReset()" id="passwordreset">
+ <a href="#" class="btn btn-link" ng-click="$event.preventDefault();passwordReset();" id="passwordreset">
{{ 'PASSWORDRESET' | translate}}
</a>
</div>
[4/4] syncope git commit: Adjusting links to work with latest
AngularJS
Posted by il...@apache.org.
Adjusting links to work with latest AngularJS
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bfcc23cb
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bfcc23cb
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bfcc23cb
Branch: refs/heads/master
Commit: bfcc23cbbb39d376848010520e6cc18f5a1b7f05
Parents: 234529a
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Jun 4 11:27:55 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Jun 4 11:28:04 2018 +0200
----------------------------------------------------------------------
.../src/main/resources/META-INF/resources/app/views/self.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/bfcc23cb/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/self.html b/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
index cedb21c..defab42 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
@@ -75,12 +75,12 @@ under the License.
</div>
</div>
<div class="text-center" ng-show="$root.isSelfRegAllowed()">
- <a href="javascript:void(0);" class="btn btn-link" ng-click="selfCreate()" id="register">
+ <a href="#" class="btn btn-link" ng-click="$event.preventDefault();selfCreate();" id="register">
{{ 'SELFREGISTRATION' | translate}}
</a>
</div>
<div class="text-center" ng-show="$root.isPwdResetAllowed()">
- <a href="javascript:void(0);" class="btn btn-link" ng-click="passwordReset()" id="passwordreset">
+ <a href="#" class="btn btn-link" ng-click="$event.preventDefault();passwordReset();" id="passwordreset">
{{ 'PASSWORDRESET' | translate}}
</a>
</div>