branch develop updated (e1da9a13 -> a95ebe26)
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 e1da9a13 fix latest docker deploy adds 640c42f7 refs #248 wip modification des choix adds b040e983 refs #248 fix choices Adding/Removing process adds 7cb25f57 refs #248 remove unvolontary commit file adds 0455e738 refs #248 remove deprecated code adds 166eef4d refs #248 add voteCountingConfig to PollBean as it it send into the Json query and request failed if not present adds 4f68105e refs #248 fix to avoid js error adds a1680090 refs #248 fix call unexisting function getConfig() adds 24ac6c9b refs #248 avoid error in console JS when navigate from tab o tab adds cdd57b63 refs #248 fix call unexisting function getConfig() adds 48f877e8 refs #248 add docker feature adds 5fcc1fdb refs #248 correction conf artifact adds 679a8841 refs #248 correction sur passage des paramètres de configuration d'un vote adds 76abbf0b refs #248 update gitlab-ci configuration sur docker:feature adds 52b2f159 refs #248 update gitlab-ci configuration on docker:feature, update artifact name adds 68ebfd91 refs #248 improve readable adds 6d38b2ba refs #248 improve space adds a29ec686 refs #249 add poolType as saveVoters parameters to as current pooltype change and not previous one. List validation review to fix validation not working adds e5ca1a55 refs #249 fix issue on empty list check adds 6604a325 refs #249 update TU adds 4232b316 refs #249 make sure the alert is displayed over other infos adds d5188111 refs #249 [ISO] retrait d'un console.log adds 2abf91e5 refs #249 [ISO] formattage adds 16f03ca9 refs #249 [ISO] update libs adds a5c1f12c refs #249 revert de la version de babel car pause problème de transpilation adds cfc57d9d refs #249 pour être en mesure de voire les sources adds a112c904 refs #249 mise à jour des versions de babel et webpack adds 1acb8e0c refs #249 ajout du package-lock adds 218c4348 refs #249 retrait du voteCountingConfig qui n'est plus nécessaire adds 7a91a4ff fixes #249 retrait du voteCountingConfig qui n'est plus nécessaire adds 7a78dbc4 refs #249 correction sur balises adds 95d4a0c4 refs #249 correction pour ajout d'images adds d8dcd8d7 refs #249 correction pour sauvegarde/chargement des images adds d2b46b78 refs #249 fix choice tab displaying image adds a526e6c7 refs #249 add package-lock adds 5d5f4f15 refs #249 update CR adds 53961ca9 refs #249 fix invalid form with suffix is not visible new a95ebe26 Merge branch 'feature/bug-on-save' 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 a95ebe26519fb82777015dc69f0bb88cdaf0d7d5 Merge: e1da9a13 53961ca9 Author: dcosse <cosse@codelutin.com> Date: Wed Oct 30 11:20:44 2019 +0100 Merge branch 'feature/bug-on-save' into develop Summary of changes: .gitlab-ci.yml | 23 + package-lock.json | 3 + .../pollen/rest/api/beans/VoterListSaveBean.java | 11 + .../chorem/pollen/rest/api/v1/VoterListApi.java | 6 +- .../org/chorem/pollen/services/bean/PollBean.java | 3 +- .../pollen/services/service/ChoiceService.java | 36 +- .../pollen/services/service/QuestionService.java | 33 +- .../pollen/services/service/VoterListService.java | 96 +- .../services/service/VoterListServiceTest.java | 2 + pollen-ui-riot-js/package-lock.json | 8018 ++++++++++++++++++++ pollen-ui-riot-js/package.json | 12 +- pollen-ui-riot-js/src/main/web/js/PollForm.js | 36 +- pollen-ui-riot-js/src/main/web/js/PollService.js | 2 +- .../src/main/web/js/VoterListService.js | 4 +- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 2 +- .../src/main/web/tag/poll/CheckEmails.tag.html | 2 +- .../src/main/web/tag/poll/Choice.tag.html | 25 +- .../src/main/web/tag/poll/Choices.tag.html | 19 +- .../src/main/web/tag/poll/Comments.tag.html | 2 +- .../src/main/web/tag/poll/Description.tag.html | 2 +- .../src/main/web/tag/poll/EditPoll.tag.html | 10 +- .../src/main/web/tag/poll/EditVote.tag.html | 2 +- .../src/main/web/tag/poll/EditVoteOrder.tag.html | 2 +- .../src/main/web/tag/poll/Report.tag.html | 2 +- .../src/main/web/tag/poll/Results.tag.html | 2 +- .../src/main/web/tag/poll/Settings.tag.html | 40 +- .../src/main/web/tag/poll/Summary.tag.html | 2 +- .../src/main/web/tag/poll/Votes.tag.html | 2 +- .../src/main/web/tag/poll/VotesTable.tag.html | 2 +- pollen-ui-riot-js/webpack.config.js | 2 +- 30 files changed, 8252 insertions(+), 151 deletions(-) create mode 100644 package-lock.json create mode 100644 pollen-ui-riot-js/package-lock.json -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit a95ebe26519fb82777015dc69f0bb88cdaf0d7d5 Merge: e1da9a13 53961ca9 Author: dcosse <cosse@codelutin.com> Date: Wed Oct 30 11:20:44 2019 +0100 Merge branch 'feature/bug-on-save' into develop .gitlab-ci.yml | 23 + package-lock.json | 3 + .../pollen/rest/api/beans/VoterListSaveBean.java | 11 + .../chorem/pollen/rest/api/v1/VoterListApi.java | 6 +- .../org/chorem/pollen/services/bean/PollBean.java | 3 +- .../pollen/services/service/ChoiceService.java | 36 +- .../pollen/services/service/QuestionService.java | 33 +- .../pollen/services/service/VoterListService.java | 96 +- .../services/service/VoterListServiceTest.java | 2 + pollen-ui-riot-js/package-lock.json | 8018 ++++++++++++++++++++ pollen-ui-riot-js/package.json | 12 +- pollen-ui-riot-js/src/main/web/js/PollForm.js | 36 +- pollen-ui-riot-js/src/main/web/js/PollService.js | 2 +- .../src/main/web/js/VoterListService.js | 4 +- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 2 +- .../src/main/web/tag/poll/CheckEmails.tag.html | 2 +- .../src/main/web/tag/poll/Choice.tag.html | 25 +- .../src/main/web/tag/poll/Choices.tag.html | 19 +- .../src/main/web/tag/poll/Comments.tag.html | 2 +- .../src/main/web/tag/poll/Description.tag.html | 2 +- .../src/main/web/tag/poll/EditPoll.tag.html | 10 +- .../src/main/web/tag/poll/EditVote.tag.html | 2 +- .../src/main/web/tag/poll/EditVoteOrder.tag.html | 2 +- .../src/main/web/tag/poll/Report.tag.html | 2 +- .../src/main/web/tag/poll/Results.tag.html | 2 +- .../src/main/web/tag/poll/Settings.tag.html | 40 +- .../src/main/web/tag/poll/Summary.tag.html | 2 +- .../src/main/web/tag/poll/Votes.tag.html | 2 +- .../src/main/web/tag/poll/VotesTable.tag.html | 2 +- pollen-ui-riot-js/webpack.config.js | 2 +- 30 files changed, 8252 insertions(+), 151 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm