This is an automated email from the git hooks/post-receive script. New change to branch master in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from fbcef267 Merge branch 'release/3.3.8' adds 6d9240b1 Fix tests if no questions in poll coming from services (should happen only during tests) adds 10c4d6ef Merge tag '3.3.8' into develop adds 54e2f20e Next development version adds e6f3edcd fixes #339 : Vote restreint - impossible de voter authentifié adds 3670b6e4 refs #339 fix tests adds 2e79d7b6 Add some rest api tests adds eea6b421 fixes #337 : La liste des participants n'a pas d'ordre déterministe : Ordre sur les noms (mais É... se retrouve après Y...)... Ordre déterministe après enregistrement. Pas avant par contre (odre de saisie) adds 271a14a7 Refonte ui : ajout de nouveaux filtres pour la récupération des sondages adds 2376d098 Ajout d'un nouvel attribut au sondage (image d'illustration) adds 347a8728 Hack to fix #332 : Really not clean, but working adds d553060d fixes #333 - Cannot create poll : Unrecognized field 'choiceAddAllowed' adds acd2b46b Lint adds 10ac4d81 release 3.3.7 success [skip ci] adds 2a3d401b fixes #334 - How this feature could have been so badly tested adds 9926ec38 fixes #335 : Wrong poll displayed - There was a useless refresh too soon messing up adds 4934720f Better debugging adds 6fc6f8b3 Next development version adds 6ae6aa23 Fix tests if no questions in poll coming from services (should happen only during tests) adds a46ce552 release 3.3.8 success [skip ci] adds bde4bdc0 Next development version adds 31025a5d fixes #339 : Vote restreint - impossible de voter authentifié adds b7d4ef37 refs #339 fix tests adds 99ba5626 Add some rest api tests adds a7936eb8 fixes #337 : La liste des participants n'a pas d'ordre déterministe : Ordre sur les noms (mais É... se retrouve après Y...)... Ordre déterministe après enregistrement. Pas avant par contre (odre de saisie) adds 5d7948ff Corrections suite à revue adds 2c5ffb09 Correction problème de merge adds 810e91e4 Merge branch 'feature/refonte-ui' into 'develop' adds fee354e7 fix poll#picture type in uml adds ba7fb6bf fix poll#picture relation adds a384bec0 Resizing image when it is uploaded adds 20819529 Cache management for resources adds 21b92b77 Add gzip compression to api response adds ba796abc Correction if the request has no media type (for instance in case of a 'delete' request) adds 57ed0600 PollList filter : correct sql request to retrieve past polls adds 7ffe24ae Properly deal with child list in creation / modification adds c90ea367 Update .gitlab-ci.yml -> use sonar variables and use rules when possible adds 0b4cdfdb Update .gitlab-ci.yml adds 0de4fa2e Update .gitlab-ci.yml adds cc3917cd Update .gitlab-ci.yml adds 2811e43d Add missing include adds cb5815b1 Update .gitlab-ci.yml adds 7f63a3bc Update .gitlab-ci.yml adds 1ea008f1 Update .gitlab-ci.yml adds 7b1474ab Update .gitlab-ci.yml adds 33219b49 Update .gitlab-ci.yml adds 5d6a8efa fixes #352 : Cases à cocher Pollen - impossible : Par défaut, aucun composant affiché (avant il y avait un input de type nombre par défaut en attendant le chargement du composant). adds 9bd2738f fixes #356 : Envoi de certains mails impossible : Utilisation de InternetAddress pour lire l'adresse venant de la base adds 64767f04 remove unused dependencies adds d347c2eb Update licences adds 1e126c40 Update .gitlab-ci.yml adds c22d04b3 Update .gitlab-ci.yml adds 0c3eb7e2 Update .gitlab-ci.yml adds dd67bc5b Force to allow release adds 3d3cf69d Update .gitlab-ci.yml adds 8e7418f6 release 3.3.9 success [skip ci] adds 07cebb12 Update release launch condition adds 31756b4e Update .gitlab-ci.yml adds 800fd9c8 Update .gitlab-ci.yml adds 8bef8673 Force to allow release adds fa249559 Update .gitlab-ci.yml adds a89313fa release 3.3.9 success [skip ci] adds 31af2810 Merge branch 'release/3.3.9' of gitlab.nuiton.org:chorem/pollen into release/3.3.9 adds ddb54837 Merge branch 'release/3.3.9' No new revisions were added by this update. Summary of changes: .gitlab-ci.yml | 54 ++++---- CHANGELOG | 8 ++ data /db/pollen-rest-api.mv.db | Bin 0 -> 688128 bytes pollen-persistence/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 23 ++-- .../pollen/persistence/entity/PollTopiaDao.java | 85 +++++++++++- .../db/migration/h2/V3_3_0_2__add_poll_picture.sql | 5 + .../postgresql/V3_3_0_2__add_poll_picture.sql | 5 + pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 31242 -> 31876 bytes pollen-rest-api/pom.xml | 2 +- pollen-rest-api/src/license/THIRD-PARTY.properties | 25 +++- .../rest/api/PollenRestApiRequestFilter.java | 7 +- .../org/chorem/pollen/rest/api/v1/ApiUtils.java | 142 +++++++++++++++---- .../org/chorem/pollen/rest/api/v1/ChoiceApi.java | 3 + .../org/chorem/pollen/rest/api/v1/CommentApi.java | 7 + .../chorem/pollen/rest/api/v1/FavoriteListApi.java | 8 ++ .../java/org/chorem/pollen/rest/api/v1/GtuApi.java | 3 + .../org/chorem/pollen/rest/api/v1/PollApi.java | 26 +++- .../pollen/rest/api/v1/PollenResourceApi.java | 57 +++++++- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 4 + .../org/chorem/pollen/rest/api/v1/ReportApi.java | 4 + .../org/chorem/pollen/rest/api/v1/VoteApi.java | 3 + .../chorem/pollen/rest/api/v1/VoteCountingApi.java | 3 + .../pollen/rest/api/v1/VoteCountingTypeApi.java | 5 +- .../chorem/pollen/rest/api/v1/VoterListApi.java | 6 + pollen-rest-api/src/main/webapp/WEB-INF/web.xml | 7 + .../pollen/rest/api/AbstractPollenRestApiTest.java | 49 ++++++- .../org/chorem/pollen/rest/api/AuthApiTest.java | 2 +- .../org/chorem/pollen/rest/api/PollApiTest.java | 5 +- .../chorem/pollen/rest/api/PollenUserApiTest.java | 52 +------ .../chorem/pollen/rest/api/RestApiFixtures.java | 5 + pollen-services/pom.xml | 14 +- pollen-services/src/license/THIRD-PARTY.properties | 34 +++-- .../org/chorem/pollen/services/bean/PollBean.java | 10 ++ .../services/service/FavoriteListService.java | 5 +- .../pollen/services/service/FixturesService.java | 87 +++++++----- .../pollen/services/service/PollService.java | 40 ++++-- .../pollen/services/service/QuestionService.java | 10 +- .../pollen/services/service/VoteService.java | 24 ++-- .../pollen/services/service/VoterListService.java | 7 +- .../pollen/services/service/mail/EmailService.java | 8 +- .../test/FakePollenApplicationContext.java | 21 +-- pollen-services/src/main/resources/fixtures.yaml | 59 -------- .../src/main/resources/restricted-fixtures.yaml | 55 ++++++++ .../src/main/resources/user-fixtures.yaml | 58 ++++++++ .../services/service/FavoriteListServiceTest.java | 4 +- .../pollen/services/service/PollServiceTest.java | 4 +- .../services/service/PollenUserServiceTest.java | 4 +- .../services/service/VoteCountingServiceTest.java | 4 +- .../pollen/services/service/VoteServiceTest.java | 153 +++++++++++++++++++-- .../services/service/VoterListServiceTest.java | 4 +- pollen-ui-riot-js/package-lock.json | 2 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- .../src/main/web/tag/poll/EditVote.tag.html | 4 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-cumulative/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-majority-judgment/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pom.xml | 2 +- 67 files changed, 931 insertions(+), 315 deletions(-) create mode 100644 data /db/pollen-rest-api.mv.db create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_3_0_2__add_poll_picture.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_3_0_2__add_poll_picture.sql create mode 100644 pollen-services/src/main/resources/restricted-fixtures.yaml create mode 100644 pollen-services/src/main/resources/user-fixtures.yaml -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.