This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit f93c5c1bc71cd3f9098148afd958b3e114fd313f Merge: 4f21546 7a80ca6 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Jul 28 13:57:31 2014 +0200 Merge branch 'feature/adminUser' into develop Conflicts: pollen-ui-angular/src/main/webapp/less/style.less .../chorem/pollen/rest/api/v1/PollenUserApi.java | 16 +++- pollen-rest-api/src/main/resources/mapping | 2 + .../pollen/services/bean/PollenUserBean.java | 10 +++ .../pollen/services/service/PollenUserService.java | 86 ++++++++++++++++++++-- .../services/service/PollenUserServiceTest.java | 41 +++++++++-- pollen-ui-angular/src/main/webapp/i18n/en.js | 9 +++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 11 ++- pollen-ui-angular/src/main/webapp/js/app.js | 2 +- .../src/main/webapp/js/controllers/userCtrl.js | 53 ++++++++++++- pollen-ui-angular/src/main/webapp/js/services.js | 14 +++- pollen-ui-angular/src/main/webapp/less/style.less | 1 + .../src/main/webapp/partials/user-admin-list.html | 61 +++++++++++++++ .../src/main/webapp/partials/user-edit.html | 28 +++++-- .../src/main/webapp/partials/user-list.html | 31 -------- 14 files changed, 305 insertions(+), 60 deletions(-) diff --cc pollen-ui-angular/src/main/webapp/js/app.js index 48db8dd,f3e51ee..e286736 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@@ -59,13 -59,14 +59,13 @@@ angular.module('pollen', ['pollenDirect .config(['$routeProvider', function($routeProvider) { $routeProvider.when('/', {templateUrl: './partials/home.html', controller: "HomeCtrl"}) - .when('/poll/home/:pollId/:pollToken?', {templateUrl: './partials/poll.html', controller: "PollCtrl"}) .when('/poll/create/:tab?', {templateUrl: './partials/poll.html', controller: "PollCreateCtrl"}) - .when('/poll/edit/:pollId/:pollToken?/:tab?', {templateUrl: './partials/poll.html', controller:"PollEditCtrl"}) - .when('/poll/vote/:pollId/:voteToken?', {templateUrl: './partials/poll.html', controller :"PollVoteCtrl"}) - .when('/poll/result/:pollId/:token?', {templateUrl: './partials/poll.html', controller :"PollResultCtrl"}) - .when('/poll/comment/:pollId/:commentToken?', {templateUrl: './partials/poll.html', controller :"PollCommentCtrl"}) + .when('/poll/edit/:pollId/:pollToken?/:tab?', {templateUrl: './partials/poll.html', controller:"PollCtrl"}) + .when('/poll/vote/:pollId/:voteToken?', {templateUrl: './partials/poll.html', controller :"PollCtrl"}) + .when('/poll/result/:pollId/:token?', {templateUrl: './partials/poll.html', controller :"PollCtrl"}) + .when('/poll/comment/:pollId/:commentToken?', {templateUrl: './partials/poll.html', controller :"PollCtrl"}) .when('/poll/list/:cmd?', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) - .when('/user/list', {templateUrl: './partials/user-list.html', controller:"UserListCtrl"}) + .when('/user/list', {templateUrl: './partials/user-admin-list.html', controller:"UserListCtrl"}) .when('/user/register', {templateUrl: './partials/user-register.html', controller:"UserRegisterCtrl"}) .when('/user/edit', {templateUrl: './partials/user-edit.html', controller:"UserEditCtrl"}) .when('/user/lostpassword', {templateUrl: './partials/user-lostPassword.html', controller:"UserLostPasswordCtrl"}) diff --cc pollen-ui-angular/src/main/webapp/less/style.less index e703f98,05838e3..9321c36 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@@ -30,10 -30,6 +30,11 @@@ } #content { margin-top:60px; ++ .fade(); + + #poll-content .anim-fade { + .fade(); + } } /* global min width */ -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.