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

[pollen] branch feature/homePage created (now 17426f2)
by chorem.org scm July 31, 2014

July 31, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/homePage in repository pollen. See http://git.chorem.org/pollen.git at 17426f2 Edit homePage and add footer This branch includes the following new commits: new 17426f2 Edit homePage and add footer 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 17426f238c643aa351aa4619fdd815defb3c9580 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 18:50:02 2014 +0200 Edit homePage and add footer -- 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 (56797b3 -> 5d1b9c1)
by chorem.org scm July 31, 2014

July 31, 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 56797b3 Merge branch 'feature/editVote' into develop new 5d1b9c1 add version.txt file with application version in root path of the war 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 5d1b9c1967da3f6b867d95e47a8ed8a4216c9825 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jul 31 18:44:26 2014 +0200 add version.txt file with application version in root path of the war Summary of changes: pollen-ui-angular/.gitignore | 1 + pollen-ui-angular/pom.xml | 25 +++++++++++++++++++++++++ pollen-ui-angular/src/main/version.txt | 1 + 3 files changed, 27 insertions(+) create mode 100644 pollen-ui-angular/src/main/version.txt -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[pollen] branch feature/editVote deleted (was 9f703a7)
by chorem.org scm July 31, 2014

July 31, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/editVote in repository pollen. See http://git.chorem.org/pollen.git was 9f703a7 fix doublons when edit vote and add choice The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[pollen] branch develop updated (ee49fd5 -> 56797b3)
by chorem.org scm July 31, 2014

July 31, 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 ee49fd5 anonymizeUser set vote to anonyme adds 3962d70 generate editVote permission and deleteVote permission for connected user or by url permission adds 7cadb32 fix all-delete-orphan when editVote adds 7b8c002 fix edit Choice : if error you can edit or delete the choice adds b43ea8c improve message with url for edit vote adds 0e8eb23 improve message with url for edit comment adds 587c4a0 improve message with url for edit poll adds 0778ebc add message with url for clone poll and change order alert adds 9f703a7 fix doublons when edit vote and add choice new 56797b3 Merge branch 'feature/editVote' into develop 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 56797b336136f5d15186d866e89055b979925e13 Merge: ee49fd5 9f703a7 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 15:04:18 2014 +0200 Merge branch 'feature/editVote' into develop Summary of changes: .../pollen/services/service/VoteService.java | 57 +++++++++-------- .../services/service/security/SecurityService.java | 4 ++ pollen-ui-angular/src/main/webapp/i18n/en.js | 3 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 3 + .../src/main/webapp/js/controllers/pollCtrl.js | 72 ++++++++++++++-------- .../src/main/webapp/partials/inline-poll.html | 14 ++--- .../src/main/webapp/partials/poll-list.html | 2 +- 7 files changed, 99 insertions(+), 56 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/editVote updated (0778ebc -> 9f703a7)
by chorem.org scm July 31, 2014

July 31, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/editVote in repository pollen. See http://git.chorem.org/pollen.git from 0778ebc add message with url for clone poll and change order alert new 9f703a7 fix doublons when edit vote and add choice 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 9f703a72d36656247fdf9624f05dc796abbdae39 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 14:33:45 2014 +0200 fix doublons when edit vote and add choice Summary of changes: pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 2 ++ 1 file changed, 2 insertions(+) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/editVote updated (7b8c002 -> 0778ebc)
by chorem.org scm July 31, 2014

July 31, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/editVote in repository pollen. See http://git.chorem.org/pollen.git from 7b8c002 fix edit Choice : if error you can edit or delete the choice new b43ea8c improve message with url for edit vote new 0e8eb23 improve message with url for edit comment new 587c4a0 improve message with url for edit poll new 0778ebc add message with url for clone poll and change order alert The 4 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 0778ebc7e923cef53e2ea2e764e572635a9d40b9 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 14:21:38 2014 +0200 add message with url for clone poll and change order alert commit 587c4a0796392e3d658cb767fa61df15ceb727ce Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 14:13:25 2014 +0200 improve message with url for edit poll commit 0e8eb23ada431de88beeaeec9310a2fe1ed88d7c Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 13:57:45 2014 +0200 improve message with url for edit comment commit b43ea8ca4f29b450d67112bbebcf3b4ce89b3d3c Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 13:51:29 2014 +0200 improve message with url for edit vote Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 3 ++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 3 ++ .../src/main/webapp/js/controllers/pollCtrl.js | 63 ++++++++++++++-------- .../src/main/webapp/partials/poll-list.html | 2 +- 4 files changed, 48 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 4

[pollen] branch develop updated (bd6baae -> ee49fd5)
by chorem.org scm July 31, 2014

July 31, 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 bd6baae fix poll controller test : rename getChoiceValue to getVoteValue new ee49fd5 anonymizeUser set vote to anonyme 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 ee49fd56efa091c58d57448c6a9e4861cd06c90e Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 13:19:46 2014 +0200 anonymizeUser set vote to anonyme Summary of changes: .../main/java/org/chorem/pollen/services/service/PollenUserService.java | 1 + 1 file changed, 1 insertion(+) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/editVote created (now 7b8c002)
by chorem.org scm July 31, 2014

July 31, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/editVote in repository pollen. See http://git.chorem.org/pollen.git at 7b8c002 fix edit Choice : if error you can edit or delete the choice This branch includes the following new commits: new 3962d70 generate editVote permission and deleteVote permission for connected user or by url permission new 7cadb32 fix all-delete-orphan when editVote new 7b8c002 fix edit Choice : if error you can edit or delete the choice 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 7b8c0028892ea31ac548a56b416fa94f240d97d8 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 11:39:53 2014 +0200 fix edit Choice : if error you can edit or delete the choice commit 3962d700b22855b1a7c4f218408ec6c68fc5a693 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 30 17:40:15 2014 +0200 generate editVote permission and deleteVote permission for connected user or by url permission commit 7cadb32f89c3293f479eb3d44ae29bd46039f8da Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 11:29:54 2014 +0200 fix all-delete-orphan when editVote -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

[pollen] branch feature/editVote deleted (was eb1d745)
by chorem.org scm July 31, 2014

July 31, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/editVote in repository pollen. See http://git.chorem.org/pollen.git was eb1d745 generate editVote permission and deleteVote permission for connected user or by url permission This change permanently discards the following revisions: discards eb1d745 generate editVote permission and deleteVote permission for connected user or by url permission -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[pollen] branch develop updated (269a05b -> bd6baae)
by chorem.org scm July 30, 2014

July 30, 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 269a05b Merge branch 'feature/addChoiceInVote' into develop new bd6baae fix poll controller test : rename getChoiceValue to getVoteValue 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 bd6baaeb4f990d6c836221d5bfb5eeedd4da3f6b Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 30 18:06:26 2014 +0200 fix poll controller test : rename getChoiceValue to getVoteValue Summary of changes: .../src/test/unit/pollControllersTest.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 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/editVote created (now eb1d745)
by chorem.org scm July 30, 2014

July 30, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/editVote in repository pollen. See http://git.chorem.org/pollen.git at eb1d745 generate editVote permission and deleteVote permission for connected user or by url permission This branch includes the following new commits: new eb1d745 generate editVote permission and deleteVote permission for connected user or by url permission 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 eb1d74579d79130edbb6666226518cad6863e73d Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 30 17:40:15 2014 +0200 generate editVote permission and deleteVote permission for connected user or by url permission -- 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 (27ffc1f -> 269a05b)
by chorem.org scm July 30, 2014

July 30, 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 27ffc1f hover alert reset timeout new 28a498b add permission addChoice, check choice type DATE no fail if choiceValue == null fix pollBeanFunction new 5deacbb can edit and add choice in page of vote new e94a143 auto complet input vote and old vote when you add choice new 59e2c4b Improve permission for delete choice new 269a05b Merge branch 'feature/addChoiceInVote' into develop The 5 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 269a05bffec74bd2cf9ad3e84f9bc20e76b63d5e Merge: 27ffc1f 59e2c4b Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 30 17:23:32 2014 +0200 Merge branch 'feature/addChoiceInVote' into develop commit 59e2c4b70cf1a9e9a8d1327195ab8693aa6049f9 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 30 17:05:14 2014 +0200 Improve permission for delete choice commit e94a143742a009504f00d6cec5ca32998bcbb127 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 30 16:27:12 2014 +0200 auto complet input vote and old vote when you add choice commit 5deacbbbec104a36ae359d8cb6599b6d2f6f37bd Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 30 15:32:46 2014 +0200 can edit and add choice in page of vote commit 28a498bdfe832c1fd4136f58e4e4a0f063473288 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 30 15:30:00 2014 +0200 add permission addChoice, check choice type DATE no fail if choiceValue == null fix pollBeanFunction Summary of changes: .../chorem/pollen/services/bean/ChoiceBean.java | 10 + .../pollen/services/service/ChoiceService.java | 14 +- .../pollen/services/service/PollService.java | 16 - .../services/service/security/SecurityService.java | 27 +- .../src/main/webapp/js/controllers/pollCtrl.js | 359 ++++++++++++--------- .../src/main/webapp/partials/inline-poll.html | 16 +- .../src/main/webapp/partials/poll-popupChoice.html | 2 +- 7 files changed, 245 insertions(+), 199 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 5

[pollen] branch develop updated (cbb1e87 -> 27ffc1f)
by chorem.org scm July 30, 2014

July 30, 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 cbb1e87 fix date empty in pollService, fix init date in directive datetimepicker new 27ffc1f hover alert reset timeout 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 27ffc1f8485311abd4bedafea4c3e78f5cffad5f Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 30 15:09:58 2014 +0200 hover alert reset timeout Summary of changes: .../src/main/webapp/js/controllers/alertCtrl.js | 21 +++++++++++++++++++-- .../src/main/webapp/partials/alerts.html | 2 ++ 2 files changed, 21 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 (066c248 -> cbb1e87)
by chorem.org scm July 30, 2014

July 30, 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 066c248 Merge branch 'feature/dateTimePicker' into develop new cbb1e87 fix date empty in pollService, fix init date in directive datetimepicker 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 cbb1e87cfb842267c3bca10ab8be9960c10c079c Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 30 12:55:45 2014 +0200 fix date empty in pollService, fix init date in directive datetimepicker Summary of changes: .../org/chorem/pollen/services/service/PollService.java | 17 +++++++++++++++++ pollen-ui-angular/src/main/webapp/js/directives.js | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) -- 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 deleted (was 6464c71)
by chorem.org scm July 30, 2014

July 30, 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 was 6464c71 improve UI The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[pollen] branch feature/adminUser deleted (was 7a80ca6)
by chorem.org scm July 30, 2014

July 30, 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 was 7a80ca6 fix create user test with generate password by the server The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[pollen] branch feature/dateTimePicker deleted (was c32d90c)
by chorem.org scm July 30, 2014

July 30, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/dateTimePicker in repository pollen. See http://git.chorem.org/pollen.git was c32d90c add dateTimePicker in poll settings The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[pollen] branch develop updated (e699210 -> 066c248)
by chorem.org scm July 30, 2014

July 30, 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 e699210 after post a comment, print the url for editing post adds 54f37c7 add directive dateTimePicker adds 1bee25b Improve directive dateTimePicker adds c32d90c add dateTimePicker in poll settings new d6e133b fix label for poll-settings new 066c248 Merge branch 'feature/dateTimePicker' 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 066c248050915e0b2fba324996d17de73b95def3 Merge: e699210 d6e133b Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 30 11:57:08 2014 +0200 Merge branch 'feature/dateTimePicker' into develop commit d6e133b621fc16243fc9d01a5607b190feb0c120 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 30 11:56:00 2014 +0200 fix label for poll-settings Summary of changes: pollen-ui-angular/bower.json | 3 +- pollen-ui-angular/src/main/webapp/index.html | 6 ++ .../src/main/webapp/js/controllers/pollCtrl.js | 5 +- pollen-ui-angular/src/main/webapp/js/directives.js | 84 ++++++++++++++++++++++ .../src/main/webapp/partials/dateTimePicker.html | 6 ++ .../src/main/webapp/partials/inline-poll.html | 7 +- .../src/main/webapp/partials/poll-popupChoice.html | 7 +- .../src/main/webapp/partials/poll-settings.html | 61 +++++++--------- 8 files changed, 130 insertions(+), 49 deletions(-) create mode 100644 pollen-ui-angular/src/main/webapp/partials/dateTimePicker.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/dateTimePicker updated (54f37c7 -> c32d90c)
by chorem.org scm July 30, 2014

July 30, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/dateTimePicker in repository pollen. See http://git.chorem.org/pollen.git from 54f37c7 add directive dateTimePicker new 1bee25b Improve directive dateTimePicker new c32d90c add dateTimePicker in poll settings 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 c32d90c76027559da490ec90394ce75312fffde2 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 30 11:34:54 2014 +0200 add dateTimePicker in poll settings commit 1bee25ba052f194ba7f38ea3f5b22573f3892d72 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 30 11:34:44 2014 +0200 Improve directive dateTimePicker Summary of changes: .../src/main/webapp/js/controllers/pollCtrl.js | 1 + pollen-ui-angular/src/main/webapp/js/directives.js | 54 ++++++++++++++++---- .../src/main/webapp/partials/dateTimePicker.html | 2 +- .../src/main/webapp/partials/poll-settings.html | 59 +++++++++------------- 4 files changed, 68 insertions(+), 48 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

[pollen] branch feature/dateTimePicker created (now 54f37c7)
by chorem.org scm July 30, 2014

July 30, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/dateTimePicker in repository pollen. See http://git.chorem.org/pollen.git at 54f37c7 add directive dateTimePicker This branch includes the following new commits: new 54f37c7 add directive dateTimePicker 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 54f37c72420ec49f147bc9420345397ca5f86f91 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jul 29 17:28:41 2014 +0200 add directive dateTimePicker -- 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 (34a2833 -> e699210)
by chorem.org scm July 29, 2014

July 29, 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 34a2833 cast date to timestamp before send to server new e699210 after post a comment, print the url for editing post 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 e699210067d7bab0166d3a755231a5e9383e9d2a Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jul 29 17:32:06 2014 +0200 after post a comment, print the url for editing post Summary of changes: pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 7 +++++++ 1 file changed, 7 insertions(+) -- 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 (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