branch develop updated (664769ea -> 7aaf2704)
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 664769ea Merge branch 'feature/198-DuelsNotCombats' into 'develop' new c60060be fixes #194 new 7aaf2704 Merge branch 'develop' of gitlab.nuiton.org:chorem/pollen into develop 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 7aaf2704d4f84fe20ef8d2b1814fa9babbec0872 Merge: c60060be 664769ea Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Apr 6 17:16:51 2018 +0200 Merge branch 'develop' of gitlab.nuiton.org:chorem/pollen into develop commit c60060be15e6fef72c91cc33a7fc9a81de25cf8c Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Apr 6 17:16:19 2018 +0200 fixes #194 Summary of changes: pollen-ui-riot-js/src/main/web/i18n/en.json | 1 + pollen-ui-riot-js/src/main/web/i18n/fr.json | 1 + pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html | 1 + 3 files changed, 3 insertions(+) -- 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 c60060be15e6fef72c91cc33a7fc9a81de25cf8c Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Apr 6 17:16:19 2018 +0200 fixes #194 --- pollen-ui-riot-js/src/main/web/i18n/en.json | 1 + pollen-ui-riot-js/src/main/web/i18n/fr.json | 1 + pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html | 1 + 3 files changed, 3 insertions(+) diff --git a/pollen-ui-riot-js/src/main/web/i18n/en.json b/pollen-ui-riot-js/src/main/web/i18n/en.json index 5cfc34c6..b8768e68 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -224,6 +224,7 @@ "newpassword_sent": "A new password was sent", "footer_doc": "Pollen {0}", "footer_download": "Download", + "footer_documentation":"Documentation", "footer_contact": "Contact us", "footer_participate": "Get involved!", "footer_license": "License", diff --git a/pollen-ui-riot-js/src/main/web/i18n/fr.json b/pollen-ui-riot-js/src/main/web/i18n/fr.json index a4349e52..5f3effb6 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -224,6 +224,7 @@ "newpassword_sent": "Un nouveau mot de passe vient d'être envoyé", "footer_doc": "Pollen {0}", "footer_download": "Télécharger", + "footer_documentation":"Documentation", "footer_contact": "Nous contacter", "footer_participate": "Contribuer au projet", "footer_license": "Licence", diff --git a/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html b/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html index 5b9aee42..c19a22a8 100644 --- a/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html @@ -23,6 +23,7 @@ <PollenFooter> <div class="links"> <a href="https://gitlab.nuiton.org/chorem/pollen">{_l("doc", version)}</a> + <a href="http://doc.pollen.cl">{__.documentation}</a> <a href="https://gitlab.nuiton.org/chorem/pollen/tags">{__.download}</a> <a href="http://list.chorem.org/cgi-bin/mailman/listinfo/pollen-users">{__.contact}</a> <a href="https://gitlab.nuiton.org/chorem/pollen">{__.participate}</a> -- 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 7aaf2704d4f84fe20ef8d2b1814fa9babbec0872 Merge: c60060be 664769ea Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Apr 6 17:16:51 2018 +0200 Merge branch 'develop' of gitlab.nuiton.org:chorem/pollen into develop pollen-ui-riot-js/src/main/web/i18n/fr.json | 10 +++++----- .../i18n/pollen-votecounting-condorcet_en_GB.properties | 2 +- .../i18n/pollen-votecounting-condorcet_fr_FR.properties | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm