[pollen] branch develop updated (b74be20 -> f93c5c1)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from b74be20 Improve delete resource adds 3ddc1e3 check if name is already used adds 9d6c3a2 check vote value adds 510da4d Improve UI adds 6464c71 improve UI new 4f21546 Merge branch 'feature/validVoteCounting' into develop adds 0074cdd can give the admin right at an user in user-list adds b34d2c1 add method to anonymize User adds 685819f add method for ban user adds f4e8036 add good error when you want to change password adds fe6e1b0 filter list of user adds fe0076d add button 'Disable Me' in edit user profil adds d3d8c4b admin can reset an user password adds 074e217 fix message for generate password successfull and translate message for disable user adds 7a80ca6 fix create user test with generate password by the server new f93c5c1 Merge branch 'feature/adminUser' into develop The 2 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 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 commit 4f2154635f8c2184a5984aefb0a1ad291b38c948 Merge: b74be20 6464c71 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Jul 28 13:56:00 2014 +0200 Merge branch 'feature/validVoteCounting' into develop Summary of changes: .../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/VoteCountingService.java | 25 +++++ .../pollen/services/service/VoteService.java | 50 +++++++--- .../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 | 11 +-- .../src/main/webapp/js/controllers/pollCtrl.js | 100 +++++++++++++------- .../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 | 104 +++++++++++---------- .../src/main/webapp/less/variables.less | 42 ++++++++- .../src/main/webapp/partials/inline-poll.html | 15 ++- .../src/main/webapp/partials/poll.html | 36 +++++-- .../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 ------ .../src/test/unit/pollControllersTest.js | 35 ++----- .../chorem/pollen/votecounting/VoteCounting.java | 10 +- .../pollen/votecounting/BordaVoteCounting.java | 10 +- .../pollen/votecounting/CondorcetVoteCounting.java | 12 +-- .../pollen/votecounting/CoombsVoteCounting.java | 10 +- .../votecounting/InstantRunoffVoteCounting.java | 10 +- .../pollen/votecounting/NormalVoteCounting.java | 10 +- .../pollen/votecounting/NumberVoteCounting.java | 10 +- .../votecounting/PercentageVoteCounting.java | 12 +-- 29 files changed, 619 insertions(+), 245 deletions(-) create mode 100644 pollen-ui-angular/src/main/webapp/partials/user-admin-list.html delete mode 100644 pollen-ui-angular/src/main/webapp/partials/user-list.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 4f2154635f8c2184a5984aefb0a1ad291b38c948 Merge: b74be20 6464c71 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Jul 28 13:56:00 2014 +0200 Merge branch 'feature/validVoteCounting' into develop .../services/service/VoteCountingService.java | 25 +++++ .../pollen/services/service/VoteService.java | 50 +++++++--- pollen-ui-angular/src/main/webapp/js/app.js | 9 +- .../src/main/webapp/js/controllers/pollCtrl.js | 100 +++++++++++++------- pollen-ui-angular/src/main/webapp/less/style.less | 103 +++++++++++---------- .../src/main/webapp/less/variables.less | 42 ++++++++- .../src/main/webapp/partials/inline-poll.html | 15 ++- .../src/main/webapp/partials/poll.html | 36 +++++-- .../src/test/unit/pollControllersTest.js | 35 ++----- .../chorem/pollen/votecounting/VoteCounting.java | 10 +- .../pollen/votecounting/BordaVoteCounting.java | 10 +- .../pollen/votecounting/CondorcetVoteCounting.java | 12 +-- .../pollen/votecounting/CoombsVoteCounting.java | 10 +- .../votecounting/InstantRunoffVoteCounting.java | 10 +- .../pollen/votecounting/NormalVoteCounting.java | 10 +- .../pollen/votecounting/NumberVoteCounting.java | 10 +- .../votecounting/PercentageVoteCounting.java | 12 +-- 17 files changed, 314 insertions(+), 185 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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>.
participants (1)
-
chorem.org scm