branch develop updated (03fb89bc -> 6a65637d)
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 03fb89bc Afficher le détail de resultat pour les systèmes de vote complex (ref #35) new e87534e6 Ajout d'une traduction pour une erreur new 6a65637d correction du positionnement du panneau de commentaire 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 6a65637dc27c52d4dcc6e620ee3a3a287f86392b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Jun 28 15:54:25 2017 +0200 correction du positionnement du panneau de commentaire commit e87534e6442d7cb3dbf434fdd7562f87281e3878 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Jun 28 15:52:29 2017 +0200 Ajout d'une traduction pour une erreur Summary of changes: pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html | 1 + pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html | 2 +- .../main/resources/i18n/pollen-votecounting-percentage_en_GB.properties | 2 +- .../main/resources/i18n/pollen-votecounting-percentage_fr_FR.properties | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) -- 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 e87534e6442d7cb3dbf434fdd7562f87281e3878 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Jun 28 15:52:29 2017 +0200 Ajout d'une traduction pour une erreur --- pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html | 2 +- .../main/resources/i18n/pollen-votecounting-percentage_en_GB.properties | 2 +- .../main/resources/i18n/pollen-votecounting-percentage_fr_FR.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html index 7ed152f5..87409d0c 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html @@ -39,7 +39,7 @@ require("../components/HumanInput.tag.html"); ref="{choice.id}_voteValue" disabled={voteId}> <input if={poll.voteCountingTypeValue && poll.voteCountingTypeValue.renderType==='text'} - class="text c-field {c-field--error: !voteId && error && error['vote.voteValue#' + choice.id]}" + class="text c-field {c-field--error: !voteId && error && (error['vote.voteValue#' + choice.id] || error['vote.totalVoteValue'])}" type="number" min="{poll.voteCountingTypeValue.minimumValue}" max="{poll.voteCountingTypeValue.maximumValue}" diff --git a/pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_en_GB.properties b/pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_en_GB.properties index b33dd37d..0f239566 100644 --- a/pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_en_GB.properties +++ b/pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_en_GB.properties @@ -1,4 +1,4 @@ -pollen.error.vote.percentage= +pollen.error.vote.percentage=choices sum must be equals to 100% pollen.voteCountingType.percentage=Percentage pollen.voteCountingType.percentage.help=Allocate choices to get a 100% total. pollen.voteCountingType.percentage.shortHelp=Allocate choices to get a 100% total. diff --git a/pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_fr_FR.properties b/pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_fr_FR.properties index cc7eaff4..a8bdf881 100644 --- a/pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_fr_FR.properties +++ b/pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_fr_FR.properties @@ -1,4 +1,4 @@ -pollen.error.vote.percentage= +pollen.error.vote.percentage=La somme de tout les choix doit être égale à 100% pollen.voteCountingType.percentage=Pourcentage pollen.voteCountingType.percentage.help=Répartir les choix de manière à obtenir 100% au total. pollen.voteCountingType.percentage.shortHelp=Répartir les choix de manière à obtenir 100% au total. -- 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 6a65637dc27c52d4dcc6e620ee3a3a287f86392b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Jun 28 15:54:25 2017 +0200 correction du positionnement du panneau de commentaire --- pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html | 1 + 1 file changed, 1 insertion(+) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html index 3f4d9e5e..85169071 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html @@ -405,6 +405,7 @@ require("./Report.tag.html"); .comments { width: 100%; + transform: translate3d(100%,0px,0px); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm