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 27d7d511 Finish fixing some aria stuff - Alt on all images and title on frames adds 4d28e3a6 refs #210 : RGPD features : - Add rgpd checkbox for unlogged users on vote edition page adds f0484fe4 refs #210 : RGPD features : fix linter errors adds 99ea3a3a refs #210 : Cron d'anonymisation ; Cassage des liens entre votes à l'anonymisation des votes d'un utilisateurs supprimant son compte. adds 471c3925 fixes #210 - Prendre en compte la RGPD adds e8360a65 fixes #210 : Cleaning code and doc adds 517ef04d fixes #227 - Liste d'émargement sans email adds ff245d01 Quick permissions fix adds ae096ef2 add header file adds e0f4eb3b release 3.2.4 success [skip ci] adds 70227c33 add header file adds 040a1a02 Mise a jour du model adds 8315dfbc refs #221 Vote associatif - Modification API adds dd2c391e Fix typo adds a4dde9b9 refs #221 - Vote associatif : EmailService should be ok adds bf4a2896 refs #221 Vote associatif - FeedService should be ok adds 50b45ff8 refs #221 - Vote associatif - ChoiceService should be ok adds 375727c6 refs #221 - Vote associatif - VoterListService should be ok adds 662dccae refs #221 - Vote associatif - VoteService should be ok adds 87d5a903 Mise a jour du model adds c5fff77a refs #221 Vote associatif - Modification API adds 26380285 Merge branch 'feature/april' of gitlab.nuiton.org:chorem/pollen into feature/april adds 7d53266f refs #221 - Vote associatif - Fix import adds c76e422d refs #221 - Vote associatif - Init QuestionService and QuestionBean adds 914ef522 refs #221 - Vote associatif - VoteCountingService should be ok adds 3571a5f5 refs #221 - Vote associatif - Security adds b2623095 refs #221 - Vote associatif - Les services compilent presque ! adds c9aa95be refs #221 - Vote associatif - Les services compilent (mais pas les tests) adds 1db61924 refs #221 - Vote associatif - Fix les notifications adds 43bc8557 refs #221 - Vote associatif - Les tests compilent adds 2e0cc3bb refs #221 - Vote associatif - Module services Ok \o/ adds c147482f Add fixmes adds 9e1cf421 refs #221 - Vote associatif - PollBean contains questions and choices adds a8c6753f refs #221 - Vote associatif - API should be ok, still needs to test adds 13a78400 refs #221 - Vote associatif - Build success \o/ adds 074be9bb Merge branch 'develop' into feature/april adds c254ac42 migration de base de données adds a2a9e941 Begin adapting UI to questions adds d266ad38 Fix typo adds abccd19c Continue adapting UI to questions adds 668ea9d9 Continue adapting UI to questions adds 57273e9c Fix js build adds c029adc4 Fix build adds 3a312eff Fix typo adds 0539cb96 Can now edit choices in UI adds d0f398ab Can add and delete choices in UI. Poll can be saved adds f6f55bf7 refs #233 : PollCard ok adds 8fd25d63 refs #233 : Fix missing questions and choices when getting saved poll adds d4f4c521 refs #233 : Summary Ok adds 07202bcd refs #233 : Vote page prints ok with no more error in js console than what is on pollen.cl adds 72f17aac refs #233 : Vote page with correct vote options adds 030a0c8d refs #233 : We can vote adds 68f43dc0 refs #233 : Fix Bean conversion when no id on entity (was making tests fail) adds 957fe443 refs #233 : Fix js build adds 3b2b9b1d refs #233 : Number of votes in votes tab adds 804b7fd1 refs #233 : WIP results handling adds 861b3dd6 refs #233 : Results page is ok \o/ adds e5ec0f5b refs #233 : Results on vote page is ok adds ef820b70 refs #233 : Votes Table is now ok adds 5ec582cf refs #233 : Poll type ok on vote page adds c93d3342 refs #233 : Edit and delete vote ok adds cd9a848f Merge branch 'develop' into feature/april new 72c9e922 Merge branch 'feature/april' 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 72c9e9221b7ac86a2514c667956f04aa99efa742 Merge: 27d7d511 cd9a848f Author: jcouteau <couteau@codelutin.com> Date: Tue Jan 29 10:51:20 2019 +0100 Merge branch 'feature/april' into develop Summary of changes: .../pollen/persistence/entity/ChoiceTopiaDao.java | 4 +- .../pollen/persistence/entity/CommentTopiaDao.java | 7 + .../pollen/persistence/entity/PollTopiaDao.java | 43 +++- .../chorem/pollen/persistence/entity/Polls.java | 22 +- .../persistence/entity/QuestionTopiaDao.java | 14 ++ .../pollen/persistence/entity/VoteTopiaDao.java | 14 +- .../migration/h2/V3_3_0_1__add_question_table.sql | 104 ++++++++ .../postgresql/V3_3_0_1__add_question_table.sql | 107 +++++++++ pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 30935 -> 31242 bytes .../pollen/rest/api/beans/PollCreateBean.java | 11 - .../org/chorem/pollen/rest/api/v1/ChoiceApi.java | 65 ++--- .../org/chorem/pollen/rest/api/v1/CommentApi.java | 97 ++++++++ .../org/chorem/pollen/rest/api/v1/PollApi.java | 36 +-- .../org/chorem/pollen/rest/api/v1/ReportApi.java | 114 +++++++++ .../org/chorem/pollen/rest/api/v1/VoteApi.java | 29 ++- .../chorem/pollen/rest/api/v1/VoteCountingApi.java | 15 +- .../org/chorem/pollen/rest/api/PollApiTest.java | 24 +- .../org/chorem/pollen/services/PollenFixtures.java | 2 + .../org/chorem/pollen/services/bean/PollBean.java | 124 ++-------- .../chorem/pollen/services/bean/QuestionBean.java | 224 +++++++++++++++++ .../pollen/services/service/ChoiceService.java | 95 ++++---- .../pollen/services/service/CommentService.java | 235 +++++++++++++++++- .../pollen/services/service/FeedService.java | 34 ++- .../pollen/services/service/FixturesService.java | 12 +- .../services/service/NotificationService.java | 153 ++++++++---- .../pollen/services/service/PollService.java | 166 +++++-------- .../services/service/PollenServiceSupport.java | 30 +-- .../pollen/services/service/QuestionService.java | 267 +++++++++++++++++++++ .../pollen/services/service/ReportService.java | 188 ++++++++++++++- .../services/service/VoteCountingService.java | 83 +++---- .../pollen/services/service/VoteService.java | 166 ++++++++----- .../pollen/services/service/VoterListService.java | 13 +- .../pollen/services/service/mail/EmailService.java | 60 ++++- .../services/service/mail/PollInvitationEmail.java | 18 +- .../mail/RestrictedPollInvitationEmail.java | 16 +- .../service/security/PollenPermissions.java | 47 +++- .../services/service/security/SecurityService.java | 118 ++++++--- pollen-services/src/main/resources/fixtures.yaml | 62 ++--- .../i18n/pollen-services_en_GB.properties | 1 + .../i18n/pollen-services_fr_FR.properties | 1 + .../pollen/services/service/PollServiceTest.java | 74 ++++-- .../services/service/VoteCountingServiceTest.java | 30 ++- .../services/service/VoterListServiceTest.java | 14 +- pollen-ui-riot-js/src/main/web/js/ChoiceService.js | 33 ++- pollen-ui-riot-js/src/main/web/js/Poll.js | 163 ++++++------- pollen-ui-riot-js/src/main/web/js/PollForm.js | 147 ++++++------ pollen-ui-riot-js/src/main/web/js/PollService.js | 38 ++- pollen-ui-riot-js/src/main/web/js/ResultService.js | 8 +- pollen-ui-riot-js/src/main/web/js/VoteService.js | 24 +- .../src/main/web/tag/components/Draggable.tag.html | 8 +- .../src/main/web/tag/components/LazyLoad.tag.html | 2 +- .../src/main/web/tag/poll/Choices.tag.html | 8 +- .../src/main/web/tag/poll/EditVote.tag.html | 117 +++++---- .../src/main/web/tag/poll/EditVoteOrder.tag.html | 12 +- .../src/main/web/tag/poll/Poll.tag.html | 24 +- .../src/main/web/tag/poll/PollCard.tag.html | 4 +- .../src/main/web/tag/poll/Results.tag.html | 49 ++-- .../src/main/web/tag/poll/Settings.tag.html | 4 +- .../src/main/web/tag/poll/Summary.tag.html | 2 +- .../src/main/web/tag/poll/Votes.tag.html | 8 +- .../src/main/web/tag/poll/VotesTable.tag.html | 4 +- .../voteCountingType/BordaDetailResult.tag.html | 16 +- .../CondorcetDetailResult.tag.html | 12 +- .../voteCountingType/CoombsDetailResult.tag.html | 8 +- .../InstantRunoffDetailResult.tag.html | 6 +- .../MajorityJudgmentDetailResult.tag.html | 14 +- 67 files changed, 2585 insertions(+), 1067 deletions(-) create mode 100644 pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/QuestionTopiaDao.java create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_3_0_1__add_question_table.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_3_0_1__add_question_table.sql create mode 100644 pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ReportApi.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/QuestionBean.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/QuestionService.java -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.