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 2016/06/07 14:22:22 UTC
[1/2] syncope git commit: Minor fixes to enduser
Repository: syncope
Updated Branches:
refs/heads/master f4a9e2cf5 -> e53e6d99b
Minor fixes to enduser
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/787e5cac
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/787e5cac
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/787e5cac
Branch: refs/heads/master
Commit: 787e5cacbe792ea7f5014069c7768af7922a5c7c
Parents: f4a9e2c
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Jun 7 16:15:49 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Jun 7 16:15:49 2016 +0200
----------------------------------------------------------------------
.../resources/META-INF/resources/app/js/app.js | 14 +++----
.../resources/app/js/services/captchaService.js | 42 --------------------
2 files changed, 7 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/787e5cac/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
index 69ea8f4..780d738 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
+++ b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
@@ -424,13 +424,13 @@ app.controller('ApplicationController', ['$scope', '$rootScope', 'InfoService',
});
//wizard active element
$scope.wizard = {
- "credentials": {url: "/credentials", templateUrl: "views/user-credentials.html"},
- "groups": {url: "/groups", templateUrl: "views/user-groups.html"},
- "plainSchemas": {url: "/plainSchemas", templateUrl: "views/user-plain-schemas.html"},
- "derivedSchemas": {url: "/derivedSchemas", templateUrl: "views/user-derived-schemas.html"},
- "virtualSchemas": {url: "/virtualSchemas", templateUrl: "views/user-virtual-schemas.html"},
- "resources": {url: "/resources", templateUrl: "views/user-resources.html"},
- "finish": {url: "/finish", templateUrl: "views/user-form-finish.html"}
+ "credentials": {url: "/credentials"},
+ "groups": {url: "/groups"},
+ "plainSchemas": {url: "/plainSchemas"},
+ "derivedSchemas": {url: "/derivedSchemas"},
+ "virtualSchemas": {url: "/virtualSchemas"},
+ "resources": {url: "/resources"},
+ "finish": {url: "/finish"}
};
$scope.clearCache = function () {
$templateCache.removeAll();
http://git-wip-us.apache.org/repos/asf/syncope/blob/787e5cac/client/enduser/src/main/resources/META-INF/resources/app/js/services/captchaService.js
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/services/captchaService.js b/client/enduser/src/main/resources/META-INF/resources/app/js/services/captchaService.js
deleted file mode 100644
index c917e68..0000000
--- a/client/enduser/src/main/resources/META-INF/resources/app/js/services/captchaService.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- */
-
-'use strict';
-
-angular.module('self')
- .factory('CaptchaService', ['$resource', '$q', '$http', function ($resource, $q, $http) {
-
- var captchaService = {};
-
- captchaService.getCaptcha = function () {
- return $http
- .get('/syncope-enduser/api/captcha')
- .then(function (response) {
- return response;
- }, function (response) {
- console.error("Something went wrong during generation of chaptcha, exit with status: ",
- response.statusText);
- });
- };
-
- return captchaService;
-
- }]);
-
-
[2/2] syncope git commit: Upgrading Groovy
Posted by il...@apache.org.
Upgrading Groovy
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e53e6d99
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e53e6d99
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e53e6d99
Branch: refs/heads/master
Commit: e53e6d99bbd1cf39dacc4c817444cf4477426bec
Parents: 787e5ca
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Jun 7 16:16:01 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Jun 7 16:16:01 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e53e6d99/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 902045c..cae5632 100644
--- a/pom.xml
+++ b/pom.xml
@@ -351,7 +351,7 @@ under the License.
<cocoon.version>3.0.0-alpha-3</cocoon.version>
- <groovy.version>2.4.6</groovy.version>
+ <groovy.version>2.4.7</groovy.version>
<activiti.version>5.20.0</activiti.version>