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

branch develop updated (7e7b1f5 -> 0463b00)
by chorem.org scm 03 Jan '17

03 Jan '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 7e7b1f5 let's pollen use java 8 new 0463b00 optimize dependencies 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 0463b00737ed41483adda1bdd4428fad7b8de192 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Tue Jan 3 10:24:42 2017 +0100 optimize dependencies Summary of changes: pollen-services/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (6e79686 -> 7e7b1f5)
by chorem.org scm 03 Jan '17

03 Jan '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 6e79686 downgrade a plugin version, otherwise it won't work well... new 7e7b1f5 let's pollen use java 8 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 7e7b1f5e13d039c3f8259164a2fc0ca7153b9d83 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Tue Jan 3 10:21:35 2017 +0100 let's pollen use java 8 Summary of changes: pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (8146b26 -> 6e79686)
by chorem.org scm 03 Jan '17

03 Jan '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 8146b26 update plugins version new 6e79686 downgrade a plugin version, otherwise it won't work well... 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 6e79686ab389ace851f21b5540170d2676942e42 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Tue Jan 3 09:59:07 2017 +0100 downgrade a plugin version, otherwise it won't work well... Summary of changes: pollen-ui-angular/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (c96c02f -> 8146b26)
by chorem.org scm 03 Jan '17

03 Jan '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from c96c02f fix my email adress and add myself in Copyright new 8146b26 update plugins version 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 8146b2655e0c1dcf7b791f1682714ef8febd3d91 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Tue Jan 3 09:31:46 2017 +0100 update plugins version Summary of changes: pollen-ui-angular/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (d8ea8f2 -> c96c02f)
by chorem.org scm 03 Jan '17

03 Jan '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from d8ea8f2 Happy new year commit new 1e45268 update my email adress new 4096c8a Update librairies version new c96c02f fix my email adress and add myself in Copyright 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 c96c02f3d802374d98626988671d02152bcdb092 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Tue Jan 3 09:11:46 2017 +0100 fix my email adress and add myself in Copyright commit 4096c8a719408ec9f8e389fd026056de35d049f9 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Tue Jan 3 09:01:01 2017 +0100 Update librairies version commit 1e4526845c90b7e0b20717a8bf4b77b921d490b4 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Tue Jan 3 08:21:01 2017 +0100 update my email adress Summary of changes: pollen-persistence/pom.xml | 2 +- .../persistence/PollenPersistenceContext.java | 2 +- .../persistence/PollenTopiaApplicationContext.java | 7 +-- .../persistence/PollenTopiaPersistenceContext.java | 17 ++---- .../pollen/persistence/entity/ChoiceTopiaDao.java | 2 +- .../pollen/persistence/entity/CommentTopiaDao.java | 2 +- .../persistence/entity/FavoriteListTopiaDao.java | 2 +- .../pollen/persistence/entity/PollTopiaDao.java | 4 +- .../entity/PollenPrincipalTopiaDao.java | 2 +- .../persistence/entity/PollenPrincipals.java | 2 +- .../persistence/entity/PollenResourceTopiaDao.java | 2 +- .../persistence/entity/PollenUserTopiaDao.java | 4 +- .../pollen/persistence/entity/PollenUsers.java | 2 +- .../chorem/pollen/persistence/entity/Polls.java | 4 +- .../persistence/entity/SessionTokenTopiaDao.java | 2 +- .../pollen/persistence/entity/VoteToChoices.java | 2 +- .../pollen/persistence/entity/VoteTopiaDao.java | 2 +- .../persistence/entity/VoterListTopiaDao.java | 2 +- pollen-persistence/src/main/xmi/pollen.properties | 2 +- .../src/test/resources/db.properties | 2 +- .../src/test/resources/log4j.properties | 2 +- pollen-rest-api/pom.xml | 4 +- pollen-rest-api/src/it/pom/pom.xml | 2 +- pollen-rest-api/src/jetty/jetty-context.xml | 2 +- .../org/chorem/pollen/rest/api/JsonHelper.java | 2 +- .../org/chorem/pollen/rest/api/PollenRender.java | 4 +- .../rest/api/PollenRestApiApplicationContext.java | 4 +- .../rest/api/PollenRestApiApplicationListener.java | 4 +- .../rest/api/PollenRestApiRequestContext.java | 2 +- .../rest/api/PollenRestApiRequestFilter.java | 4 +- .../chorem/pollen/rest/api/PollenRestApiUtil.java | 2 +- .../rest/api/PollenTopiaTransactionFilter.java | 2 +- .../pollen/rest/api/converter/DateConverter.java | 2 +- .../rest/api/converter/JsonArrayConverter.java | 2 +- .../pollen/rest/api/converter/JsonConverter.java | 2 +- .../rest/api/injector/PollenBeanIdInjector.java | 4 +- .../PollenRestApiRequestContextInjector.java | 2 +- .../rest/api/injector/PollenServiceInjector.java | 2 +- .../org/chorem/pollen/rest/api/v1/AuthApi.java | 4 +- .../org/chorem/pollen/rest/api/v1/ChoiceApi.java | 4 +- .../org/chorem/pollen/rest/api/v1/CommentApi.java | 4 +- .../java/org/chorem/pollen/rest/api/v1/DocApi.java | 2 +- .../org/chorem/pollen/rest/api/v1/ErrorAction.java | 4 +- .../chorem/pollen/rest/api/v1/FavoriteListApi.java | 4 +- .../org/chorem/pollen/rest/api/v1/PollApi.java | 4 +- .../pollen/rest/api/v1/PollenResourceApi.java | 2 +- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 4 +- .../org/chorem/pollen/rest/api/v1/VoteApi.java | 4 +- .../chorem/pollen/rest/api/v1/VoteCountingApi.java | 4 +- .../pollen/rest/api/v1/VoteCountingTypeApi.java | 2 +- .../chorem/pollen/rest/api/v1/VoterListApi.java | 4 +- .../src/main/resources/log4j.properties | 2 +- .../src/main/resources/pollen-rest-api.properties | 4 +- pollen-rest-api/src/main/webapp/WEB-INF/web.xml | 2 +- .../pollen/rest/api/AbstractPollenRestApiTest.java | 4 +- .../org/chorem/pollen/rest/api/AuthApiTest.java | 2 +- .../org/chorem/pollen/rest/api/PollApiTest.java | 2 +- .../chorem/pollen/rest/api/PollenUserApiTest.java | 4 +- .../rest/api/converter/JsonArrayConverterTest.java | 2 +- .../rest/api/converter/JsonConverterTest.java | 2 +- .../src/test/resources/log4j.properties | 2 +- pollen-services/pom.xml | 2 +- .../services/DefaultPollenServiceContext.java | 2 +- .../pollen/services/PollenApplicationContext.java | 2 +- .../org/chorem/pollen/services/PollenFixtures.java | 2 +- .../org/chorem/pollen/services/PollenService.java | 4 +- .../pollen/services/PollenServiceContext.java | 4 +- .../pollen/services/PollenTechnicalException.java | 2 +- .../pollen/services/TopiaEntityCopyVisitor.java | 2 +- .../chorem/pollen/services/bean/ChoiceBean.java | 2 +- .../pollen/services/bean/ChoiceScoreBean.java | 2 +- .../chorem/pollen/services/bean/CommentBean.java | 2 +- .../pollen/services/bean/FavoriteListBean.java | 2 +- .../services/bean/FavoriteListMemberBean.java | 2 +- .../services/bean/GroupVoteCountingResultBean.java | 2 +- .../services/bean/PaginationParameterBean.java | 2 +- .../pollen/services/bean/PaginationResultBean.java | 2 +- .../org/chorem/pollen/services/bean/PollBean.java | 2 +- .../chorem/pollen/services/bean/PollenBean.java | 2 +- .../chorem/pollen/services/bean/PollenBeans.java | 2 +- .../pollen/services/bean/PollenEntityId.java | 2 +- .../pollen/services/bean/PollenEntityRef.java | 2 +- .../pollen/services/bean/PollenUserBean.java | 2 +- .../pollen/services/bean/ResourceFileBean.java | 2 +- .../pollen/services/bean/ResourceMetaBean.java | 2 +- .../pollen/services/bean/ResourceStreamBean.java | 2 +- .../org/chorem/pollen/services/bean/VoteBean.java | 2 +- .../services/bean/VoteCountingGroupResultBean.java | 2 +- .../services/bean/VoteCountingResultBean.java | 2 +- .../pollen/services/bean/VoteCountingTypeBean.java | 2 +- .../pollen/services/bean/VoteToChoiceBean.java | 2 +- .../chorem/pollen/services/bean/VoterListBean.java | 2 +- .../pollen/services/bean/VoterListMemberBean.java | 2 +- .../chorem/pollen/services/bean/package-info.java | 4 +- .../services/config/PollenServiceConfig.java | 4 +- .../services/config/PollenServiceConfigOption.java | 4 +- .../pollen/services/config/package-info.java | 4 +- .../org/chorem/pollen/services/package-info.java | 4 +- .../pollen/services/service/ChoiceService.java | 4 +- .../pollen/services/service/CommentService.java | 4 +- .../chorem/pollen/services/service/ErrorMap.java | 2 +- .../services/service/FavoriteListImport.java | 2 +- .../service/FavoriteListImportException.java | 4 +- .../service/FavoriteListImportFromFile.java | 2 +- .../service/FavoriteListImportFromLdap.java | 2 +- .../services/service/FavoriteListService.java | 9 +++- .../pollen/services/service/FixturesService.java | 2 +- .../service/InvalidEntityLinkException.java | 2 +- .../services/service/InvalidFormException.java | 4 +- .../services/service/NotificationService.java | 2 +- .../pollen/services/service/PollService.java | 4 +- .../services/service/PollenResourceService.java | 2 +- .../services/service/PollenServiceSupport.java | 4 +- .../services/service/PollenUIUrlRenderService.java | 2 +- .../pollen/services/service/PollenUserService.java | 14 ++++- .../services/service/VoteCountingService.java | 4 +- .../services/service/VoteCountingTypeService.java | 2 +- .../pollen/services/service/VoteService.java | 4 +- .../pollen/services/service/VoterListService.java | 4 +- .../services/service/mail/ChoiceAddedEmail.java | 2 +- .../services/service/mail/ChoiceDeletedEmail.java | 2 +- .../services/service/mail/ChoiceEditedEmail.java | 2 +- .../services/service/mail/CommentAddedEmail.java | 2 +- .../services/service/mail/CommentDeletedEmail.java | 2 +- .../services/service/mail/CommentEditedEmail.java | 2 +- .../pollen/services/service/mail/EmailService.java | 2 +- .../services/service/mail/LostPasswordEmail.java | 2 +- .../service/mail/PollChoicePeriodEndedEmail.java | 2 +- .../service/mail/PollChoicePeriodStartedEmail.java | 2 +- .../services/service/mail/PollClosedEmail.java | 2 +- .../services/service/mail/PollCreatedEmail.java | 2 +- .../service/mail/PollVotePeriodEndedEmail.java | 2 +- .../service/mail/PollVotePeriodStartedEmail.java | 2 +- .../service/mail/PollVoteReminderEmail.java | 2 +- .../pollen/services/service/mail/PollenMail.java | 2 +- .../mail/RestrictedPollInvitationEmail.java | 2 +- .../service/mail/UserAccountCreatedEmail.java | 2 +- .../services/service/mail/VoteAddedEmail.java | 2 +- .../services/service/mail/VoteDeletedEmail.java | 2 +- .../services/service/mail/VoteEditedEmail.java | 2 +- .../pollen/services/service/package-info.java | 4 +- .../security/DefaultPollenSecurityContext.java | 4 +- .../services/service/security/PermissionVerb.java | 4 +- .../security/PollenAuthenticationException.java | 2 +- ...PollenInvalidEmailActivationTokenException.java | 4 +- .../security/PollenInvalidPasswordException.java | 4 +- .../security/PollenInvalidPermissionException.java | 2 +- .../PollenInvalidSessionTokenException.java | 4 +- .../service/security/PollenSecurityContext.java | 2 +- .../service/security/PollenSecurityRealm.java | 4 +- .../security/PollenUnauthorizedException.java | 2 +- .../services/service/security/SecurityService.java | 4 +- .../test/FakePollenApplicationContext.java | 27 ++++++++-- .../services/test/FakePollenSecurityContext.java | 2 +- .../services/test/FakePollenServiceContext.java | 2 +- .../pollen/services/AbstractPollenServiceTest.java | 2 +- .../services/service/FavoriteListServiceTest.java | 2 +- .../pollen/services/service/PollServiceTest.java | 4 +- .../service/PollenUIUrlRenderServiceTest.java | 2 +- .../services/service/PollenUserServiceTest.java | 4 +- .../services/service/VoteCountingServiceTest.java | 2 +- .../pollen/services/service/VoteServiceTest.java | 2 +- .../services/service/VoterListServiceTest.java | 2 +- .../src/test/resources/log4j.properties | 2 +- .../src/test/resources/pollen-services.properties | 4 +- pollen-ui-angular/pom.xml | 2 +- pollen-ui-angular/src/main/webapp/WEB-INF/web.xml | 2 +- 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/index.html | 2 +- pollen-ui-angular/src/main/webapp/js/app.js | 2 +- .../src/main/webapp/js/controllers/alertCtrl.js | 2 +- .../main/webapp/js/controllers/favoriteListCtrl.js | 2 +- .../src/main/webapp/js/controllers/localeCtrl.js | 2 +- .../src/main/webapp/js/controllers/mainCtrl.js | 2 +- .../src/main/webapp/js/controllers/pollCtrl.js | 2 +- .../src/main/webapp/js/controllers/userCtrl.js | 2 +- pollen-ui-angular/src/main/webapp/js/directives.js | 2 +- .../src/main/webapp/js/libs/ckeditor/config.js | 2 +- .../main/webapp/js/scripts/sticky-inline-poll.js | 2 +- pollen-ui-angular/src/main/webapp/js/services.js | 2 +- .../src/main/webapp/partials/alerts.html | 2 +- .../src/main/webapp/partials/big-poll.html | 2 +- .../src/main/webapp/partials/dateTimePicker.html | 2 +- .../main/webapp/partials/favoriteList-edit.html | 2 +- .../main/webapp/partials/favoriteList-list.html | 2 +- .../src/main/webapp/partials/home.html | 2 +- .../src/main/webapp/partials/inline-poll.html | 2 +- .../src/main/webapp/partials/pagination.html | 2 +- .../src/main/webapp/partials/poll-comment.html | 2 +- .../src/main/webapp/partials/poll-info.html | 2 +- .../src/main/webapp/partials/poll-link.html | 2 +- .../src/main/webapp/partials/poll-list.html | 2 +- .../main/webapp/partials/poll-listParticipant.html | 2 +- .../src/main/webapp/partials/poll-poll.html | 2 +- .../src/main/webapp/partials/poll-popupChoice.html | 2 +- .../src/main/webapp/partials/poll-result.html | 2 +- .../src/main/webapp/partials/poll-settings.html | 2 +- .../src/main/webapp/partials/poll.html | 2 +- .../src/main/webapp/partials/printResource.html | 2 +- .../src/main/webapp/partials/user-admin-list.html | 2 +- .../webapp/partials/user-edit-editProfile.html | 2 +- .../main/webapp/partials/user-edit-password.html | 2 +- .../webapp/partials/user-edit-viewProfile.html | 2 +- .../src/main/webapp/partials/user-edit.html | 2 +- .../src/main/webapp/partials/user-login.html | 2 +- .../main/webapp/partials/user-lostPassword.html | 2 +- .../src/main/webapp/partials/user-register.html | 2 +- pollen-ui-angular/src/test/karma.conf.ci.js | 2 +- pollen-ui-angular/src/test/karma.conf.js | 2 +- .../src/test/unit/alertControllersTest.js | 2 +- .../src/test/unit/pollControllersTest.js | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- .../pollen/votecounting/AbstractVoteCounting.java | 4 +- .../votecounting/AbstractVoteCountingStrategy.java | 4 +- .../chorem/pollen/votecounting/VoteCounting.java | 4 +- .../pollen/votecounting/VoteCountingFactory.java | 4 +- .../pollen/votecounting/VoteCountingNotFound.java | 4 +- .../pollen/votecounting/VoteCountingStrategy.java | 4 +- .../pollen/votecounting/model/ChoiceIdAble.java | 4 +- .../pollen/votecounting/model/ChoiceScore.java | 4 +- .../votecounting/model/ChoiceToVoteRenderType.java | 4 +- .../pollen/votecounting/model/GroupOfVoter.java | 4 +- .../votecounting/model/GroupOfVoterBuilder.java | 4 +- .../model/GroupVoteCountingResult.java | 4 +- .../pollen/votecounting/model/SimpleVoter.java | 4 +- .../votecounting/model/SimpleVoterBuilder.java | 4 +- .../votecounting/model/VoteCountingResult.java | 4 +- .../pollen/votecounting/model/VoteForChoice.java | 4 +- .../chorem/pollen/votecounting/model/Voter.java | 4 +- .../pollen/votecounting/model/VoterBuilder.java | 4 +- .../votecounting/VoteCountingFactoryTest.java | 4 +- .../src/test/resources/log4j.properties | 2 +- pollen-votecounting-borda/pom.xml | 2 +- .../pollen/votecounting/BordaVoteCounting.java | 4 +- .../votecounting/BordaVoteCountingStrategy.java | 4 +- .../BordaVoteCountingStrategyTest.java | 4 +- .../votecounting/VoteCountingFactoryTest.java | 4 +- .../src/test/resources/log4j.properties | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- .../pollen/votecounting/CondorcetVoteCounting.java | 4 +- .../CondorcetVoteCountingStrategy.java | 4 +- .../CondorcetVoteCountingStrategyTest.java | 4 +- .../votecounting/VoteCountingFactoryTest.java | 4 +- .../src/test/resources/log4j.properties | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- .../pollen/votecounting/CoombsVoteCounting.java | 4 +- .../votecounting/CoombsVoteCountingStrategy.java | 4 +- .../CoombsVoteCountingStrategyTest.java | 4 +- .../votecounting/VoteCountingFactoryTest.java | 4 +- .../src/test/resources/log4j.properties | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- .../votecounting/InstantRunoffVoteCounting.java | 4 +- .../InstantRunoffVoteCountingStrategy.java | 4 +- .../InstantRunoffVoteCountingStrategyTest.java | 4 +- .../votecounting/VoteCountingFactoryTest.java | 4 +- .../src/test/resources/log4j.properties | 2 +- pollen-votecounting-normal/pom.xml | 2 +- .../pollen/votecounting/NormalVoteCounting.java | 4 +- .../votecounting/NormalVoteCountingStrategy.java | 4 +- .../NormalVoteCountingStrategyTest.java | 4 +- .../votecounting/VoteCountingFactoryTest.java | 4 +- .../src/test/resources/log4j.properties | 2 +- pollen-votecounting-number/pom.xml | 2 +- .../pollen/votecounting/NumberVoteCounting.java | 4 +- .../votecounting/NumberVoteCountingStrategy.java | 4 +- .../NumberVoteCountingStrategyTest.java | 4 +- .../votecounting/VoteCountingFactoryTest.java | 4 +- .../src/test/resources/log4j.properties | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- .../votecounting/PercentageVoteCounting.java | 4 +- .../PercentageVoteCountingStrategy.java | 4 +- .../PercentageVoteCountingStrategyTest.java | 4 +- .../votecounting/VoteCountingFactoryTest.java | 4 +- .../src/test/resources/log4j.properties | 2 +- pom.xml | 60 +++++++++++----------- src/site/fr/rst/configure.rst | 2 +- src/site/fr/rst/depouillement.rst | 2 +- src/site/fr/rst/index.rst | 2 +- src/site/rst/configure.rst | 2 +- src/site/rst/index.rst | 2 +- src/site/rst/methods.rst | 2 +- src/site/rst/restApi.rst | 2 +- src/site/rst/security.rst | 2 +- src/site/rst/service.rst | 2 +- src/site/rst/tests.rst | 2 +- src/site/site_en.xml | 2 +- src/site/site_fr.xml | 2 +- 289 files changed, 458 insertions(+), 434 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

branch develop updated (e43814a -> d8ea8f2)
by chorem.org scm 03 Jan '17

03 Jan '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from e43814a Update parent pom new d8ea8f2 Happy new year commit 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 d8ea8f26662f1f55a8a01c85c7c163c1e3c6d673 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Tue Jan 3 08:19:17 2017 +0100 Happy new year commit Summary of changes: pollen-persistence/pom.xml | 21 ++++++++++++++++++++ .../persistence/PollenPersistenceContext.java | 4 ++-- .../persistence/PollenTopiaApplicationContext.java | 2 +- .../persistence/PollenTopiaPersistenceContext.java | 2 +- .../pollen/persistence/entity/ChoiceTopiaDao.java | 2 +- .../pollen/persistence/entity/CommentTopiaDao.java | 2 +- .../persistence/entity/FavoriteListTopiaDao.java | 2 +- .../pollen/persistence/entity/PollTopiaDao.java | 4 +--- .../entity/PollenPrincipalTopiaDao.java | 2 +- .../persistence/entity/PollenPrincipals.java | 4 ++-- .../persistence/entity/PollenResourceTopiaDao.java | 2 +- .../persistence/entity/PollenUserTopiaDao.java | 4 +--- .../pollen/persistence/entity/PollenUsers.java | 4 ++-- .../chorem/pollen/persistence/entity/Polls.java | 4 +--- .../persistence/entity/SessionTokenTopiaDao.java | 2 +- .../pollen/persistence/entity/VoteToChoices.java | 4 ++-- .../pollen/persistence/entity/VoteTopiaDao.java | 2 +- .../persistence/entity/VoterListTopiaDao.java | 2 +- pollen-persistence/src/main/xmi/pollen.properties | 4 +--- .../src/test/resources/db.properties | 4 +--- .../src/test/resources/log4j.properties | 4 +--- pollen-rest-api/pom.xml | 21 ++++++++++++++++++++ pollen-rest-api/src/it/pom/pom.xml | 8 ++------ pollen-rest-api/src/jetty/jetty-context.xml | 6 ++---- .../org/chorem/pollen/rest/api/JsonHelper.java | 4 ++-- .../org/chorem/pollen/rest/api/PollenRender.java | 4 +--- .../rest/api/PollenRestApiApplicationContext.java | 4 +--- .../rest/api/PollenRestApiApplicationListener.java | 4 +--- .../rest/api/PollenRestApiRequestContext.java | 4 ++-- .../rest/api/PollenRestApiRequestFilter.java | 4 +--- .../chorem/pollen/rest/api/PollenRestApiUtil.java | 4 ++-- .../rest/api/PollenTopiaTransactionFilter.java | 4 +--- .../pollen/rest/api/converter/DateConverter.java | 4 ++-- .../rest/api/converter/JsonArrayConverter.java | 4 ++-- .../pollen/rest/api/converter/JsonConverter.java | 4 ++-- .../rest/api/injector/PollenBeanIdInjector.java | 4 ++-- .../PollenRestApiRequestContextInjector.java | 4 ++-- .../rest/api/injector/PollenServiceInjector.java | 4 ++-- .../org/chorem/pollen/rest/api/v1/AuthApi.java | 4 +--- .../org/chorem/pollen/rest/api/v1/ChoiceApi.java | 6 ++---- .../org/chorem/pollen/rest/api/v1/CommentApi.java | 4 +--- .../java/org/chorem/pollen/rest/api/v1/DocApi.java | 4 ++-- .../org/chorem/pollen/rest/api/v1/ErrorAction.java | 4 +--- .../chorem/pollen/rest/api/v1/FavoriteListApi.java | 4 +--- .../org/chorem/pollen/rest/api/v1/PollApi.java | 4 +--- .../pollen/rest/api/v1/PollenResourceApi.java | 2 +- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 4 +--- .../org/chorem/pollen/rest/api/v1/VoteApi.java | 4 +--- .../chorem/pollen/rest/api/v1/VoteCountingApi.java | 4 +--- .../pollen/rest/api/v1/VoteCountingTypeApi.java | 2 +- .../chorem/pollen/rest/api/v1/VoterListApi.java | 4 +--- .../src/main/resources/log4j.properties | 4 +--- .../src/main/resources/pollen-rest-api.properties | 2 +- pollen-rest-api/src/main/webapp/WEB-INF/web.xml | 6 ++---- .../pollen/rest/api/AbstractPollenRestApiTest.java | 4 +--- .../org/chorem/pollen/rest/api/AuthApiTest.java | 4 ++-- .../org/chorem/pollen/rest/api/PollApiTest.java | 4 ++-- .../chorem/pollen/rest/api/PollenUserApiTest.java | 4 +--- .../rest/api/converter/JsonArrayConverterTest.java | 4 ++-- .../rest/api/converter/JsonConverterTest.java | 4 ++-- .../src/test/resources/log4j.properties | 4 +--- pollen-services/pom.xml | 21 ++++++++++++++++++++ .../services/DefaultPollenServiceContext.java | 4 +--- .../pollen/services/PollenApplicationContext.java | 4 ++-- .../org/chorem/pollen/services/PollenFixtures.java | 4 +--- .../org/chorem/pollen/services/PollenService.java | 4 +--- .../pollen/services/PollenServiceContext.java | 4 +--- .../pollen/services/PollenTechnicalException.java | 4 +--- .../pollen/services/TopiaEntityCopyVisitor.java | 4 ++-- .../chorem/pollen/services/bean/ChoiceBean.java | 4 ++-- .../pollen/services/bean/ChoiceScoreBean.java | 4 ++-- .../chorem/pollen/services/bean/CommentBean.java | 4 ++-- .../pollen/services/bean/FavoriteListBean.java | 4 ++-- .../services/bean/FavoriteListMemberBean.java | 4 ++-- .../services/bean/GroupVoteCountingResultBean.java | 4 ++-- .../services/bean/PaginationParameterBean.java | 4 ++-- .../pollen/services/bean/PaginationResultBean.java | 4 ++-- .../org/chorem/pollen/services/bean/PollBean.java | 4 ++-- .../chorem/pollen/services/bean/PollenBean.java | 4 ++-- .../chorem/pollen/services/bean/PollenBeans.java | 4 ++-- .../pollen/services/bean/PollenEntityId.java | 4 ++-- .../pollen/services/bean/PollenEntityRef.java | 4 ++-- .../pollen/services/bean/PollenUserBean.java | 4 ++-- .../pollen/services/bean/ResourceFileBean.java | 2 +- .../pollen/services/bean/ResourceMetaBean.java | 2 +- .../pollen/services/bean/ResourceStreamBean.java | 2 +- .../org/chorem/pollen/services/bean/VoteBean.java | 4 ++-- .../services/bean/VoteCountingGroupResultBean.java | 4 ++-- .../services/bean/VoteCountingResultBean.java | 4 ++-- .../pollen/services/bean/VoteCountingTypeBean.java | 2 +- .../pollen/services/bean/VoteToChoiceBean.java | 4 ++-- .../chorem/pollen/services/bean/VoterListBean.java | 4 ++-- .../pollen/services/bean/VoterListMemberBean.java | 4 ++-- .../chorem/pollen/services/bean/package-info.java | 4 +--- .../services/config/PollenServiceConfig.java | 4 +--- .../services/config/PollenServiceConfigOption.java | 4 +--- .../pollen/services/config/package-info.java | 4 +--- .../org/chorem/pollen/services/package-info.java | 4 +--- .../pollen/services/service/ChoiceService.java | 4 +--- .../pollen/services/service/CommentService.java | 6 ++---- .../chorem/pollen/services/service/ErrorMap.java | 4 ++-- .../services/service/FavoriteListImport.java | 4 ++-- .../service/FavoriteListImportException.java | 4 +--- .../service/FavoriteListImportFromFile.java | 4 ++-- .../service/FavoriteListImportFromLdap.java | 4 ++-- .../services/service/FavoriteListService.java | 6 ++---- .../pollen/services/service/FixturesService.java | 4 +--- .../service/InvalidEntityLinkException.java | 4 ++-- .../services/service/InvalidFormException.java | 4 +--- .../services/service/NotificationService.java | 4 ++-- .../pollen/services/service/PollService.java | 4 +--- .../services/service/PollenResourceService.java | 2 +- .../services/service/PollenServiceSupport.java | 4 +--- .../services/service/PollenUIUrlRenderService.java | 2 +- .../pollen/services/service/PollenUserService.java | 4 +--- .../services/service/VoteCountingService.java | 4 +--- .../services/service/VoteCountingTypeService.java | 2 +- .../pollen/services/service/VoteService.java | 4 +--- .../pollen/services/service/VoterListService.java | 4 +--- .../services/service/mail/ChoiceAddedEmail.java | 4 ++-- .../services/service/mail/ChoiceDeletedEmail.java | 4 ++-- .../services/service/mail/ChoiceEditedEmail.java | 4 ++-- .../services/service/mail/CommentAddedEmail.java | 4 ++-- .../services/service/mail/CommentDeletedEmail.java | 4 ++-- .../services/service/mail/CommentEditedEmail.java | 4 ++-- .../pollen/services/service/mail/EmailService.java | 6 +++--- .../services/service/mail/LostPasswordEmail.java | 4 ++-- .../service/mail/PollChoicePeriodEndedEmail.java | 4 ++-- .../service/mail/PollChoicePeriodStartedEmail.java | 4 ++-- .../services/service/mail/PollClosedEmail.java | 4 ++-- .../services/service/mail/PollCreatedEmail.java | 4 ++-- .../service/mail/PollVotePeriodEndedEmail.java | 4 ++-- .../service/mail/PollVotePeriodStartedEmail.java | 4 ++-- .../service/mail/PollVoteReminderEmail.java | 4 ++-- .../pollen/services/service/mail/PollenMail.java | 4 ++-- .../mail/RestrictedPollInvitationEmail.java | 4 ++-- .../service/mail/UserAccountCreatedEmail.java | 4 ++-- .../services/service/mail/VoteAddedEmail.java | 4 ++-- .../services/service/mail/VoteDeletedEmail.java | 4 ++-- .../services/service/mail/VoteEditedEmail.java | 4 ++-- .../pollen/services/service/package-info.java | 4 +--- .../security/DefaultPollenSecurityContext.java | 4 +--- .../services/service/security/PermissionVerb.java | 4 +--- .../security/PollenAuthenticationException.java | 4 ++-- ...PollenInvalidEmailActivationTokenException.java | 4 +--- .../security/PollenInvalidPasswordException.java | 4 +--- .../security/PollenInvalidPermissionException.java | 4 ++-- .../PollenInvalidSessionTokenException.java | 4 +--- .../service/security/PollenSecurityContext.java | 4 ++-- .../service/security/PollenSecurityRealm.java | 4 +--- .../security/PollenUnauthorizedException.java | 4 ++-- .../services/service/security/SecurityService.java | 4 +--- .../test/FakePollenApplicationContext.java | 8 +++----- .../services/test/FakePollenSecurityContext.java | 4 ++-- .../services/test/FakePollenServiceContext.java | 4 +--- .../pollen/services/AbstractPollenServiceTest.java | 4 +--- .../services/service/FavoriteListServiceTest.java | 4 ++-- .../pollen/services/service/PollServiceTest.java | 4 +--- .../service/PollenUIUrlRenderServiceTest.java | 4 ++-- .../services/service/PollenUserServiceTest.java | 4 +--- .../services/service/VoteCountingServiceTest.java | 4 ++-- .../pollen/services/service/VoteServiceTest.java | 4 ++-- .../services/service/VoterListServiceTest.java | 4 ++-- .../src/test/resources/log4j.properties | 4 +--- .../src/test/resources/pollen-services.properties | 4 ++-- pollen-ui-angular/pom.xml | 21 ++++++++++++++++++++ pollen-ui-angular/src/main/webapp/WEB-INF/web.xml | 4 ++-- 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/index.html | 4 +--- pollen-ui-angular/src/main/webapp/js/app.js | 2 +- .../src/main/webapp/js/controllers/alertCtrl.js | 2 +- .../main/webapp/js/controllers/favoriteListCtrl.js | 2 +- .../src/main/webapp/js/controllers/localeCtrl.js | 2 +- .../src/main/webapp/js/controllers/mainCtrl.js | 2 +- .../src/main/webapp/js/controllers/pollCtrl.js | 2 +- .../src/main/webapp/js/controllers/userCtrl.js | 2 +- pollen-ui-angular/src/main/webapp/js/directives.js | 2 +- .../src/main/webapp/js/libs/ckeditor/config.js | 4 ++-- .../main/webapp/js/scripts/sticky-inline-poll.js | 2 +- pollen-ui-angular/src/main/webapp/js/services.js | 4 ++-- .../src/main/webapp/partials/alerts.html | 2 +- .../src/main/webapp/partials/big-poll.html | 6 ++---- .../src/main/webapp/partials/dateTimePicker.html | 2 +- .../main/webapp/partials/favoriteList-edit.html | 6 ++---- .../main/webapp/partials/favoriteList-list.html | 6 ++---- .../src/main/webapp/partials/home.html | 2 +- .../src/main/webapp/partials/inline-poll.html | 4 +--- .../src/main/webapp/partials/pagination.html | 2 +- .../src/main/webapp/partials/poll-comment.html | 6 ++---- .../src/main/webapp/partials/poll-info.html | 4 ++-- .../src/main/webapp/partials/poll-link.html | 4 +--- .../src/main/webapp/partials/poll-list.html | 4 +--- .../main/webapp/partials/poll-listParticipant.html | 4 +--- .../src/main/webapp/partials/poll-poll.html | 4 +--- .../src/main/webapp/partials/poll-popupChoice.html | 6 ++---- .../src/main/webapp/partials/poll-result.html | 6 ++---- .../src/main/webapp/partials/poll-settings.html | 4 +--- .../src/main/webapp/partials/poll.html | 6 ++---- .../src/main/webapp/partials/printResource.html | 4 ++-- .../src/main/webapp/partials/user-admin-list.html | 4 +--- .../webapp/partials/user-edit-editProfile.html | 4 +--- .../main/webapp/partials/user-edit-password.html | 4 +--- .../webapp/partials/user-edit-viewProfile.html | 4 ++-- .../src/main/webapp/partials/user-edit.html | 4 +--- .../src/main/webapp/partials/user-login.html | 6 ++---- .../main/webapp/partials/user-lostPassword.html | 6 ++---- .../src/main/webapp/partials/user-register.html | 6 ++---- pollen-ui-angular/src/test/karma.conf.ci.js | 2 +- pollen-ui-angular/src/test/karma.conf.js | 2 +- .../src/test/unit/alertControllersTest.js | 2 +- .../src/test/unit/pollControllersTest.js | 4 ++-- pollen-votecounting-aggregator/pom.xml | 21 ++++++++++++++++++++ pollen-votecounting-api/pom.xml | 21 ++++++++++++++++++++ .../pollen/votecounting/AbstractVoteCounting.java | 4 +--- .../votecounting/AbstractVoteCountingStrategy.java | 6 ++---- .../chorem/pollen/votecounting/VoteCounting.java | 4 +--- .../pollen/votecounting/VoteCountingFactory.java | 4 +--- .../pollen/votecounting/VoteCountingNotFound.java | 6 ++---- .../pollen/votecounting/VoteCountingStrategy.java | 6 ++---- .../pollen/votecounting/model/ChoiceIdAble.java | 6 ++---- .../pollen/votecounting/model/ChoiceScore.java | 6 ++---- .../votecounting/model/ChoiceToVoteRenderType.java | 6 ++---- .../pollen/votecounting/model/GroupOfVoter.java | 6 ++---- .../votecounting/model/GroupOfVoterBuilder.java | 6 ++---- .../model/GroupVoteCountingResult.java | 6 ++---- .../pollen/votecounting/model/SimpleVoter.java | 6 ++---- .../votecounting/model/SimpleVoterBuilder.java | 6 ++---- .../votecounting/model/VoteCountingResult.java | 6 ++---- .../pollen/votecounting/model/VoteForChoice.java | 6 ++---- .../chorem/pollen/votecounting/model/Voter.java | 6 ++---- .../pollen/votecounting/model/VoterBuilder.java | 6 ++---- .../votecounting/VoteCountingFactoryTest.java | 6 ++---- .../src/test/resources/log4j.properties | 6 ++---- pollen-votecounting-borda/pom.xml | 21 ++++++++++++++++++++ .../pollen/votecounting/BordaVoteCounting.java | 4 +--- .../votecounting/BordaVoteCountingStrategy.java | 6 ++---- .../BordaVoteCountingStrategyTest.java | 6 ++---- .../votecounting/VoteCountingFactoryTest.java | 6 ++---- .../src/test/resources/log4j.properties | 6 ++---- pollen-votecounting-condorcet/pom.xml | 21 ++++++++++++++++++++ .../pollen/votecounting/CondorcetVoteCounting.java | 4 +--- .../CondorcetVoteCountingStrategy.java | 6 ++---- .../CondorcetVoteCountingStrategyTest.java | 6 ++---- .../votecounting/VoteCountingFactoryTest.java | 6 ++---- .../src/test/resources/log4j.properties | 6 ++---- pollen-votecounting-coombs/pom.xml | 21 ++++++++++++++++++++ .../pollen/votecounting/CoombsVoteCounting.java | 4 +--- .../votecounting/CoombsVoteCountingStrategy.java | 6 ++---- .../CoombsVoteCountingStrategyTest.java | 6 ++---- .../votecounting/VoteCountingFactoryTest.java | 6 ++---- .../src/test/resources/log4j.properties | 6 ++---- pollen-votecounting-instant-runoff/pom.xml | 21 ++++++++++++++++++++ .../votecounting/InstantRunoffVoteCounting.java | 4 +--- .../InstantRunoffVoteCountingStrategy.java | 6 ++---- .../InstantRunoffVoteCountingStrategyTest.java | 6 ++---- .../votecounting/VoteCountingFactoryTest.java | 6 ++---- .../src/test/resources/log4j.properties | 6 ++---- pollen-votecounting-normal/pom.xml | 21 ++++++++++++++++++++ .../pollen/votecounting/NormalVoteCounting.java | 4 +--- .../votecounting/NormalVoteCountingStrategy.java | 6 ++---- .../NormalVoteCountingStrategyTest.java | 6 ++---- .../votecounting/VoteCountingFactoryTest.java | 6 ++---- .../src/test/resources/log4j.properties | 6 ++---- pollen-votecounting-number/pom.xml | 21 ++++++++++++++++++++ .../pollen/votecounting/NumberVoteCounting.java | 4 +--- .../votecounting/NumberVoteCountingStrategy.java | 6 ++---- .../NumberVoteCountingStrategyTest.java | 6 ++---- .../votecounting/VoteCountingFactoryTest.java | 6 ++---- .../src/test/resources/log4j.properties | 6 ++---- pollen-votecounting-percentage/pom.xml | 21 ++++++++++++++++++++ .../votecounting/PercentageVoteCounting.java | 4 +--- .../PercentageVoteCountingStrategy.java | 6 ++---- .../PercentageVoteCountingStrategyTest.java | 6 ++---- .../votecounting/VoteCountingFactoryTest.java | 6 ++---- .../src/test/resources/log4j.properties | 6 ++---- pom.xml | 23 +++++++++++++++++++++- src/site/fr/rst/configure.rst | 4 +--- src/site/fr/rst/depouillement.rst | 4 +--- src/site/fr/rst/index.rst | 4 +--- src/site/rst/configure.rst | 4 +--- src/site/rst/index.rst | 4 +--- src/site/rst/methods.rst | 4 +--- src/site/rst/restApi.rst | 2 +- src/site/rst/security.rst | 4 +--- src/site/rst/service.rst | 4 +--- src/site/rst/tests.rst | 4 +--- src/site/site_en.xml | 4 +--- src/site/site_fr.xml | 4 +--- 289 files changed, 719 insertions(+), 729 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch pollen-udpate-1.6 updated (23c7976 -> a9fe826)
by chorem.org scm 13 Dec '16

13 Dec '16

This is an automated email from the git hooks/post-receive script. New change to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git from 23c7976 fixes #1301: [Comment] Add anti spam filter vote vote and comments new 0cd46aa refs #1308: Update parent pom new d69b8fb refs #1308: Update nuiton-i18n new af27a15 refs #1308: Update nuiton-i18n & nuiton-utils new 900d716 refs #1308: Update log4j new d4969ac refs #1308: Update commons-collections4 new 9372b32 refs #1308: Update commons-lang new e5b5c45 refs #1308: Update commons-io new 434338b refs #1308: Update guava new 7eaf183 refs #1308: Update nuiton-config new 60759d0 refs #1308: Update nuiton-validator new e6576be refs #1308: Update log4j new cd74edf refs #1308: Update javamail new 03c1b05 refs #1308: Replace deprecated apis new e6b82e3 refs #1308: Replace deprecated apis new e9dcf3f refs #1308: Update struts to 2.5.5 new ae812b3 refs #1308: Update c3p0 new c5b5a1b refs #1308: Update shiro new 530a8ae refs #1308: Update selenium new 85dc30b refs #1308: Update postgres new a9fe826 refs #1308: Update mockito The 20 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 a9fe8268343886f010996be17eae80cf1a3fac0e Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Tue Dec 13 23:13:06 2016 +0100 refs #1308: Update mockito commit 85dc30b9dff68a53315cb4dc64fc4b41d65caf11 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Tue Dec 13 22:49:10 2016 +0100 refs #1308: Update postgres commit 530a8aed5687566d874737a92c3af2c529fce264 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Tue Dec 13 22:48:12 2016 +0100 refs #1308: Update selenium commit c5b5a1b801989d763aaf68628de1d0e471d31c8c Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Tue Dec 13 22:36:45 2016 +0100 refs #1308: Update shiro commit ae812b3ddb4e1e85833f427fe7b8a712fabfcb8e Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Tue Dec 13 22:01:13 2016 +0100 refs #1308: Update c3p0 commit e9dcf3fe508482fc9d0afc5a2593d48aa4e4e22b Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Tue Dec 13 22:00:03 2016 +0100 refs #1308: Update struts to 2.5.5 commit e6b82e3145d94f89b6f97f7cdbceb4cd6b23c874 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 22:39:58 2016 +0100 refs #1308: Replace deprecated apis commit 03c1b05de945705883fa6e41f14076f67157f676 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 22:39:39 2016 +0100 refs #1308: Replace deprecated apis commit cd74edf033332edf53f759170303f77f02c16c29 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:54:04 2016 +0100 refs #1308: Update javamail commit e6576beef0f0be4bd3613841c77e8c169679ca3e Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:53:49 2016 +0100 refs #1308: Update log4j commit 60759d0bf3168b0c6e5bbcf214a378859163de68 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:52:49 2016 +0100 refs #1308: Update nuiton-validator commit 7eaf183f1a7a9de3fa8aef39bcbf500d1ef6d8d6 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:52:34 2016 +0100 refs #1308: Update nuiton-config commit 434338bf5fe75e35e347aeaa77547f15c368c831 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:51:58 2016 +0100 refs #1308: Update guava commit e5b5c45fa3e642dba37449ef3b0724f5fec36cb2 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:51:42 2016 +0100 refs #1308: Update commons-io commit 9372b32e1c524a4ec5d42cad63c351ba1314b6f4 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:51:29 2016 +0100 refs #1308: Update commons-lang commit d4969ac95015a6eb5546e8194570812b7b6e9edb Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:51:16 2016 +0100 refs #1308: Update commons-collections4 commit 900d71677736ed878b6ab9c45f3d2181336c25ea Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:50:34 2016 +0100 refs #1308: Update log4j commit af27a15482109b612f6b1c592f2a92717054dac1 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:50:08 2016 +0100 refs #1308: Update nuiton-i18n & nuiton-utils commit d69b8fbf4580b9b967c6613ade3db06dc668e44c Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:47:21 2016 +0100 refs #1308: Update nuiton-i18n commit 0cd46aa37e8478e14ebf8438d985b81fa6f68aac Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:43:34 2016 +0100 refs #1308: Update parent pom Summary of changes: README.txt => README.md | 0 pollen-persistence/{README.txt => README.md} | 0 .../org/chorem/pollen/PollenConfiguration.java | 30 ++++------ .../business/persistence/CommentDAOImpl.java | 6 +- .../pollen/business/persistence/PollTest.java | 4 +- pollen-services/{README.txt => README.md} | 0 pollen-services/pom.xml | 5 +- .../chorem/pollen/services/impl/PollService.java | 9 ++- .../pollen/services/impl/SecurityService.java | 6 +- .../pollen/services/impl/FavoriteServiceTest.java | 7 ++- .../README.txt => pollen-ui-struts2/README.md | 0 pollen-ui-struts2/pom.xml | 7 +-- .../src/it/createPoll/{README.txt => README.md} | 0 .../{README.txt => README.md} | 0 .../pollVoteVisibility/{README.txt => README.md} | 0 .../src/it/pollen-ui-it/{README.txt => README.md} | 0 pollen-ui-struts2/src/it/pollen-ui-it/pom.xml | 2 +- .../src/it/security/{README.txt => README.md} | 0 .../src/main/assembly/dist/pollen.properties | 2 +- .../pollen/ui/PollenStaticContentLoader.java | 3 +- .../chorem/pollen/ui/actions/poll/GetPollFeed.java | 3 +- .../pollen/ui/actions/poll/admin/ExportPoll.java | 3 +- .../ui/actions/poll/form/AbstractPollForm.java | 3 +- .../interceptors/PollenFileUploadInterceptor.java | 2 +- .../results/PollenServletActionRedirectResult.java | 2 +- .../org/chorem/pollen/ui/results/package-info.java | 4 +- pollen-ui-struts2/src/main/resources/struts.xml | 11 ++-- .../main/webapp/WEB-INF/jsp/admin/pollsList.jsp | 2 +- .../main/webapp/WEB-INF/jsp/admin/usersList.jsp | 2 +- .../webapp/WEB-INF/jsp/poll/createPoll_choices.jsp | 22 +++---- .../webapp/WEB-INF/jsp/poll/displayDateChoice.jsp | 8 +-- .../webapp/WEB-INF/jsp/poll/displayImageChoice.jsp | 12 ++-- .../WEB-INF/jsp/poll/displayPersonToList.jsp | 10 ++-- .../WEB-INF/jsp/poll/displayPollComments.jsp | 2 +- .../webapp/WEB-INF/jsp/poll/displayTextChoice.jsp | 8 +-- .../webapp/WEB-INF/jsp/poll/displayVotingList.jsp | 20 +++---- .../WEB-INF/jsp/poll/displayVotingListPersons.jsp | 12 ++-- .../WEB-INF/jsp/poll/personListToVotingList.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp | 10 ++-- .../src/main/webapp/WEB-INF/jsp/poll/result.jsp | 12 ++-- .../src/main/webapp/WEB-INF/jsp/poll/vote.jsp | 20 +++---- .../src/main/webapp/WEB-INF/jsp/pollListHelper.jsp | 30 +++++----- .../main/webapp/WEB-INF/jsp/user/createdList.jsp | 2 +- .../main/webapp/WEB-INF/jsp/user/favoriteList.jsp | 6 +- .../main/webapp/WEB-INF/jsp/user/favoriteLists.jsp | 4 +- .../main/webapp/WEB-INF/jsp/user/invitedList.jsp | 2 +- .../webapp/WEB-INF/jsp/user/participatedList.jsp | 2 +- pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml | 12 ++-- .../README.md | 0 .../README.md | 0 .../README.md | 0 .../README.md | 0 .../README.md | 0 .../README.md | 0 .../README.md | 0 .../README.md | 0 .../README.md | 0 pom.xml | 69 ++++++++-------------- 58 files changed, 176 insertions(+), 206 deletions(-) rename README.txt => README.md (100%) rename pollen-persistence/{README.txt => README.md} (100%) rename pollen-services/{README.txt => README.md} (100%) rename pollen-votecounting-percentage/README.txt => pollen-ui-struts2/README.md (100%) rename pollen-ui-struts2/src/it/createPoll/{README.txt => README.md} (100%) rename pollen-ui-struts2/src/it/pollCommentVisibility/{README.txt => README.md} (100%) rename pollen-ui-struts2/src/it/pollVoteVisibility/{README.txt => README.md} (100%) rename pollen-ui-struts2/src/it/pollen-ui-it/{README.txt => README.md} (100%) rename pollen-ui-struts2/src/it/security/{README.txt => README.md} (100%) rename pollen-votecounting-number/README.txt => pollen-votecounting-aggregator/README.md (100%) rename pollen-votecounting-normal/README.txt => pollen-votecounting-api/README.md (100%) rename pollen-votecounting-instant-runoff/README.txt => pollen-votecounting-borda/README.md (100%) rename pollen-votecounting-coombs/README.txt => pollen-votecounting-condorcet/README.md (100%) rename pollen-votecounting-condorcet/README.txt => pollen-votecounting-coombs/README.md (100%) rename pollen-votecounting-borda/README.txt => pollen-votecounting-instant-runoff/README.md (100%) rename pollen-votecounting-api/README.txt => pollen-votecounting-normal/README.md (100%) rename pollen-votecounting-aggregator/README.txt => pollen-votecounting-number/README.md (100%) rename pollen-ui-struts2/README.txt => pollen-votecounting-percentage/README.md (100%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 18

branch develop updated (d70defe -> e43814a)
by chorem.org scm 03 Mar '16

03 Mar '16

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 d70defe Migration sous gitlab + passage sous chorem 5-rc-2 new e43814a Update parent pom 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 e43814a219ae892bb6e606cc748503bb2935dc46 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Thu Mar 3 15:08:28 2016 +0100 Update parent pom Summary of changes: README.txt => README.md | 0 changelog.txt | 46 ---------------------- pollen-persistence/{README.txt => README.md} | 0 pollen-persistence/changelog.txt | 4 -- pollen-rest-api/{README.txt => README.md} | 0 pollen-rest-api/changelog.txt | 0 .../changelog.txt => pollen-services/README.md | 0 pollen-services/README.txt | 0 pollen-services/changelog.txt | 0 pollen-ui-angular/.gitignore | 1 + pollen-ui-angular/{README.txt => README.md} | 0 pollen-ui-angular/changelog.txt | 40 ------------------- .../README.md | 0 pollen-votecounting-aggregator/README.txt | 0 pollen-votecounting-aggregator/changelog.txt | 0 .../README.md | 0 pollen-votecounting-api/README.txt | 0 pollen-votecounting-api/changelog.txt | 0 .../README.md | 0 pollen-votecounting-borda/README.txt | 0 pollen-votecounting-borda/changelog.txt | 0 .../README.md | 0 pollen-votecounting-condorcet/README.txt | 0 pollen-votecounting-condorcet/changelog.txt | 0 .../README.md | 0 .../{changelog.txt => README.md} | 0 .../README.md | 0 .../README.md | 0 .../README.md | 0 pom.xml | 13 +++--- 30 files changed, 7 insertions(+), 97 deletions(-) rename README.txt => README.md (100%) delete mode 100644 changelog.txt rename pollen-persistence/{README.txt => README.md} (100%) delete mode 100644 pollen-persistence/changelog.txt rename pollen-rest-api/{README.txt => README.md} (100%) delete mode 100644 pollen-rest-api/changelog.txt rename pollen-votecounting-percentage/changelog.txt => pollen-services/README.md (100%) delete mode 100644 pollen-services/README.txt delete mode 100644 pollen-services/changelog.txt rename pollen-ui-angular/{README.txt => README.md} (100%) delete mode 100644 pollen-ui-angular/changelog.txt rename pollen-votecounting-percentage/README.txt => pollen-votecounting-aggregator/README.md (100%) delete mode 100644 pollen-votecounting-aggregator/README.txt delete mode 100644 pollen-votecounting-aggregator/changelog.txt rename pollen-votecounting-number/changelog.txt => pollen-votecounting-api/README.md (100%) delete mode 100644 pollen-votecounting-api/README.txt delete mode 100644 pollen-votecounting-api/changelog.txt rename pollen-votecounting-number/README.txt => pollen-votecounting-borda/README.md (100%) delete mode 100644 pollen-votecounting-borda/README.txt delete mode 100644 pollen-votecounting-borda/changelog.txt rename pollen-votecounting-normal/changelog.txt => pollen-votecounting-condorcet/README.md (100%) delete mode 100644 pollen-votecounting-condorcet/README.txt delete mode 100644 pollen-votecounting-condorcet/changelog.txt rename pollen-votecounting-normal/README.txt => pollen-votecounting-coombs/README.md (100%) rename pollen-votecounting-instant-runoff/{changelog.txt => README.md} (100%) rename pollen-votecounting-instant-runoff/README.txt => pollen-votecounting-normal/README.md (100%) rename pollen-votecounting-coombs/changelog.txt => pollen-votecounting-number/README.md (100%) rename pollen-votecounting-coombs/README.txt => pollen-votecounting-percentage/README.md (100%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (f0a0847 -> 6d26882)
by chorem.org scm 03 Mar '16

03 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from f0a0847 Center logo on home page. new 6d26882 Update parent pom 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 6d26882b3d3c12be2857d6f1855e407c544a1571 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Thu Mar 3 15:08:04 2016 +0100 Update parent pom Summary of changes: README.txt => README.md | 0 changelog.txt | 40 ---------------------- pollen-persistence/{README.txt => README.md} | 0 pollen-persistence/changelog.txt | 4 --- pollen-services/{README.txt => README.md} | 0 pollen-services/changelog.txt | 4 --- .../changelog.txt => pollen-ui-struts2/README.md | 0 pollen-ui-struts2/README.txt | 0 pollen-ui-struts2/changelog.txt | 0 .../README.md | 0 pollen-votecounting-aggregator/README.txt | 0 pollen-votecounting-aggregator/changelog.txt | 0 .../README.md | 0 pollen-votecounting-api/README.txt | 0 pollen-votecounting-api/changelog.txt | 0 .../README.md | 0 pollen-votecounting-borda/README.txt | 0 pollen-votecounting-borda/changelog.txt | 0 .../README.md | 0 pollen-votecounting-condorcet/README.txt | 0 pollen-votecounting-condorcet/changelog.txt | 0 .../README.md | 0 .../{changelog.txt => README.md} | 0 .../README.md | 0 .../README.md | 0 .../README.md | 0 pom.xml | 15 +++----- 27 files changed, 5 insertions(+), 58 deletions(-) rename README.txt => README.md (100%) delete mode 100644 changelog.txt rename pollen-persistence/{README.txt => README.md} (100%) delete mode 100644 pollen-persistence/changelog.txt rename pollen-services/{README.txt => README.md} (100%) delete mode 100644 pollen-services/changelog.txt rename pollen-votecounting-percentage/changelog.txt => pollen-ui-struts2/README.md (100%) delete mode 100644 pollen-ui-struts2/README.txt delete mode 100644 pollen-ui-struts2/changelog.txt rename pollen-votecounting-percentage/README.txt => pollen-votecounting-aggregator/README.md (100%) delete mode 100644 pollen-votecounting-aggregator/README.txt delete mode 100644 pollen-votecounting-aggregator/changelog.txt rename pollen-votecounting-number/changelog.txt => pollen-votecounting-api/README.md (100%) delete mode 100644 pollen-votecounting-api/README.txt delete mode 100644 pollen-votecounting-api/changelog.txt rename pollen-votecounting-number/README.txt => pollen-votecounting-borda/README.md (100%) delete mode 100644 pollen-votecounting-borda/README.txt delete mode 100644 pollen-votecounting-borda/changelog.txt rename pollen-votecounting-normal/changelog.txt => pollen-votecounting-condorcet/README.md (100%) delete mode 100644 pollen-votecounting-condorcet/README.txt delete mode 100644 pollen-votecounting-condorcet/changelog.txt rename pollen-votecounting-normal/README.txt => pollen-votecounting-coombs/README.md (100%) rename pollen-votecounting-instant-runoff/{changelog.txt => README.md} (100%) rename pollen-votecounting-instant-runoff/README.txt => pollen-votecounting-normal/README.md (100%) rename pollen-votecounting-coombs/changelog.txt => pollen-votecounting-number/README.md (100%) rename pollen-votecounting-coombs/README.txt => pollen-votecounting-percentage/README.md (100%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (77a870f -> d70defe)
by chorem.org scm 18 Dec '15

18 Dec '15

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 77a870f start making the poll creation as a real form new d70defe Migration sous gitlab + passage sous chorem 5-rc-2 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 d70defe98e8d7ac9ee69b71dfd59d4e6e0c89c93 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Dec 18 16:36:34 2015 +0100 Migration sous gitlab + passage sous chorem 5-rc-2 Summary of changes: pollen-rest-api/pom.xml | 2 ++ pollen-ui-angular/pom.xml | 3 ++ pom.xml | 23 ++++--------- src/site/site_en.xml | 83 +++++++++++++-------------------------------- src/site/site_fr.xml | 85 ++++++++++++++--------------------------------- 5 files changed, 60 insertions(+), 136 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1