branch develop updated (3ec719e -> 98579c8)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git from 3ec719e [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 98579c8 fixes #8058 fix health page The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 98579c8d47847f439349695c27284dc151ea1b99 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Mar 3 11:51:55 2016 +0100 fixes #8058 fix health page Summary of changes: coselmar-rest/pom.xml | 6 ++++++ coselmar-ui/src/main/webapp/js/coselmar-health.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git commit 98579c8d47847f439349695c27284dc151ea1b99 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Mar 3 11:51:55 2016 +0100 fixes #8058 fix health page --- coselmar-rest/pom.xml | 6 ++++++ coselmar-ui/src/main/webapp/js/coselmar-health.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 8b094e3..9df1b2c 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -232,6 +232,12 @@ </dependencies> <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <testResources> <testResource> <directory>src/test/resources</directory> diff --git a/coselmar-ui/src/main/webapp/js/coselmar-health.js b/coselmar-ui/src/main/webapp/js/coselmar-health.js index 02b73c1..ca7f50a 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-health.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-health.js @@ -22,7 +22,7 @@ * #L% */ -coselmarApp.controller("HealthCtrl", ['$scope', '$http', 'coselmar-config', function ($scope, $http, coselmarConfig) { +coselmarApp.controller("HealthCtrl", ['$scope', '$http', 'coselmarConfig', function ($scope, $http, coselmarConfig) { $scope.health = {"dbUp": false, "version": "unknown", "indexationUp": false, "devMode": false}; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm