- Pollen-commits - mailman.cloud.codelutin.com

[pollen] branch develop updated (bd04e9d -> 34a2833)
by chorem.org scm July 28, 2014

July 28, 2014

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 bd04e9d alert can print html, url of vote is now in input new 84eefe6 delete number negatif in voteCounting percentage new 34a2833 cast date to timestamp before send to server 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 34a28335bf93cd0b6679d9b9c649a676b1b9500c Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jul 28 18:03:03 2014 +0200 cast date to timestamp before send to server commit 84eefe667a281c99483bc50d261c21eda713ace4 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jul 28 17:00:35 2014 +0200 delete number negatif in voteCounting percentage Summary of changes: .../src/main/webapp/js/controllers/pollCtrl.js | 26 +++++++++++++++++----- .../votecounting/PercentageVoteCounting.java | 3 +-- 2 files changed, 22 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

[pollen] branch develop updated (dc01d2d -> bd04e9d)
by chorem.org scm July 28, 2014

July 28, 2014

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 dc01d2d Improve set tab in change page in poll part new 8b2ed91 change validate total for voteCounting-percentage new 2a8772a print alert info with link of my vote admin new bd04e9d alert can print html, url of vote is now in input The 3 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 bd04e9d6ab03237dacb6b01afb88518811bf1d41 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jul 28 16:31:53 2014 +0200 alert can print html, url of vote is now in input commit 2a8772a2bbb41eefdfe4e61d946c675f8dee2f7b Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jul 28 15:15:21 2014 +0200 print alert info with link of my vote admin commit 8b2ed91db9d5017f38a6386b290cd40896042c14 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jul 28 15:13:57 2014 +0200 change validate total for voteCounting-percentage Summary of changes: .../services/service/VoteCountingService.java | 6 +++- .../src/main/webapp/js/controllers/alertCtrl.js | 8 ++++-- .../src/main/webapp/js/controllers/pollCtrl.js | 28 ++++++++++++++----- pollen-ui-angular/src/main/webapp/less/style.less | 32 +++++++++++++++++----- .../src/main/webapp/partials/alerts.html | 4 ++- .../src/main/webapp/partials/inline-poll.html | 6 +++- .../chorem/pollen/votecounting/VoteCounting.java | 2 +- .../pollen/votecounting/BordaVoteCounting.java | 2 +- .../pollen/votecounting/CondorcetVoteCounting.java | 2 +- .../pollen/votecounting/CoombsVoteCounting.java | 2 +- .../votecounting/InstantRunoffVoteCounting.java | 2 +- .../pollen/votecounting/NormalVoteCounting.java | 2 +- .../pollen/votecounting/NumberVoteCounting.java | 2 +- .../votecounting/PercentageVoteCounting.java | 4 +-- 14 files changed, 74 insertions(+), 28 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

[pollen] branch develop updated (f93c5c1 -> dc01d2d)
by chorem.org scm July 28, 2014

July 28, 2014

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 f93c5c1 Merge branch 'feature/adminUser' into develop new dc01d2d Improve set tab in change page in poll part 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 dc01d2de1eb5e782efbb325e12ccb2eae8e36142 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jul 28 14:18:01 2014 +0200 Improve set tab in change page in poll part Summary of changes: pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch develop updated (b74be20 -> f93c5c1)
by chorem.org scm July 28, 2014

July 28, 2014

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(a)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(a)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(a)chorem.org>.

1 2

[pollen] branch feature/validVoteCounting updated (510da4d -> 6464c71)
by chorem.org scm July 28, 2014

July 28, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/validVoteCounting in repository pollen. See http://git.chorem.org/pollen.git from 510da4d Improve UI new 6464c71 improve UI 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 6464c7113bb97748f91869a58eb5e885992333b3 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jul 28 13:50:22 2014 +0200 improve UI Summary of changes: pollen-ui-angular/src/main/webapp/less/style.less | 43 ++++++++++++++-------- .../src/main/webapp/less/variables.less | 9 +++-- 2 files changed, 33 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/validVoteCounting updated (9d6c3a2 -> 510da4d)
by chorem.org scm July 28, 2014

July 28, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/validVoteCounting in repository pollen. See http://git.chorem.org/pollen.git from 9d6c3a2 check vote value new 510da4d Improve UI 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 510da4db1a53a7a2e2a0107ba143ccbb532a37dc Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jul 25 16:41:10 2014 +0200 Improve UI Summary of changes: pollen-ui-angular/src/main/webapp/js/app.js | 9 ++- .../src/main/webapp/js/controllers/pollCtrl.js | 75 +++++++++++++--------- pollen-ui-angular/src/main/webapp/less/style.less | 72 +++++++++------------ .../src/main/webapp/less/variables.less | 39 ++++++++++- .../src/main/webapp/partials/inline-poll.html | 8 +-- .../src/main/webapp/partials/poll.html | 36 ++++++++--- .../src/test/unit/pollControllersTest.js | 35 ++-------- 7 files changed, 154 insertions(+), 120 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/adminUser updated (074e217 -> 7a80ca6)
by chorem.org scm July 25, 2014

July 25, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/adminUser in repository pollen. See http://git.chorem.org/pollen.git from 074e217 fix message for generate password successfull and translate message for disable user new 7a80ca6 fix create user test with generate password by the server 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 7a80ca6ae1847f903a3e387bff65d7a5dd610439 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jul 25 10:21:33 2014 +0200 fix create user test with generate password by the server Summary of changes: .../services/service/PollenUserServiceTest.java | 41 +++++++++++++++++++--- 1 file changed, 36 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/validVoteCounting created (now 9d6c3a2)
by chorem.org scm July 25, 2014

July 25, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/validVoteCounting in repository pollen. See http://git.chorem.org/pollen.git at 9d6c3a2 check vote value This branch includes the following new commits: new 3ddc1e3 check if name is already used new 9d6c3a2 check vote value 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 9d6c3a2033967f0ab265da82ab40c6b7923fc20a Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jul 25 13:29:39 2014 +0200 check vote value commit 3ddc1e3c3304709923fda893069ca88974523bb5 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jul 25 11:37:06 2014 +0200 check if name is already used -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

[pollen] branch develop updated (73e7c45 -> b74be20)
by chorem.org scm July 24, 2014

July 24, 2014

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 73e7c45 Merge branch 'feature/waitResourceBeforeSave' into develop new 47e45a8 edit list of poll new b74be20 Improve delete resource 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 b74be2055671225d698e0c37f29a0f5b4bb5c35a Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 24 17:52:27 2014 +0200 Improve delete resource commit 47e45a86625c3048069e3baf59da74186e3f6001 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 24 15:57:48 2014 +0200 edit list of poll - select one or more poll - delete selected poll Summary of changes: .../pollen/persistence/entity/ChoiceTopiaDao.java | 19 +++--- .../persistence/entity/PollenResourceTopiaDao.java | 41 +++++++++++++ pollen-rest-api/src/main/resources/mapping | 2 +- .../pollen/services/service/PollService.java | 2 - .../services/service/PollenResourceService.java | 14 +---- pollen-ui-angular/src/main/webapp/i18n/en.js | 9 ++- pollen-ui-angular/src/main/webapp/i18n/fr.js | 5 ++ .../src/main/webapp/js/controllers/pollCtrl.js | 71 +++++++++++++++++++++- .../src/main/webapp/partials/poll-list.html | 26 ++++++-- .../src/main/webapp/partials/poll-poll.html | 4 +- 10 files changed, 158 insertions(+), 35 deletions(-) create mode 100644 pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenResourceTopiaDao.java -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

[pollen] branch feature/adminUser updated (d3d8c4b -> 074e217)
by chorem.org scm July 24, 2014

July 24, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/adminUser in repository pollen. See http://git.chorem.org/pollen.git from d3d8c4b admin can reset an user password new 074e217 fix message for generate password successfull and translate message for disable user 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 074e217139511188aee1e772205b21504a740b67 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 24 11:54:47 2014 +0200 fix message for generate password successfull and translate message for disable user Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 2 ++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 2 ++ pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js | 7 ++++--- 3 files changed, 8 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1