[pollen] branch develop updated (9d8a10c -> c8ed546)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 9d8a10c add agarandel developer in pom new baf0ff0 updates nuiton libraries version + fix pom new c8ed546 clean templates 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 c8ed546e39f96599eadb9dd55f88adb0830408cc Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 26 18:18:13 2014 +0200 clean templates commit baf0ff00062b48087c4326e99f4db4804b555e56 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 26 18:17:48 2014 +0200 updates nuiton libraries version + fix pom Summary of changes: .../src/main/resources/email/LostPasswordEmail.mustache | 2 +- .../src/main/resources/email/LostPasswordEmail_fr.mustache | 4 ++-- .../src/main/resources/email/PollCreatedEmail.mustache | 6 +++--- .../src/main/resources/email/PollCreatedEmail_fr.mustache | 8 ++++---- .../main/resources/email/UserAccountCreatedEmail.mustache | 4 ++-- .../resources/email/UserAccountCreatedEmail_fr.mustache | 4 ++-- pom.xml | 13 +++++++------ 7 files changed, 21 insertions(+), 20 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 http://git.chorem.org/pollen.git commit baf0ff00062b48087c4326e99f4db4804b555e56 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 26 18:17:48 2014 +0200 updates nuiton libraries version + fix pom --- pom.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index a624b9f..d3e2583 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,8 @@ <id>dralagen</id> <name>Adrien Garandel</name> <email>a.garandel@dralagen.fr</email> - <timezone>Europe/paris</timezone> + <organizationUrl>http://dralagen.fr</organizationUrl> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -163,12 +164,12 @@ <webmotionVersion>2.4.1-SNAPSHOT</webmotionVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> - <eugenePluginVersion>3.0-SNAPSHOT</eugenePluginVersion> - <topiaVersion>3.0-SNAPSHOT</topiaVersion> + <eugenePluginVersion>2.13</eugenePluginVersion> + <topiaVersion>3.0-beta-12</topiaVersion> - <nuitonWebVersion>1.17-SNAPSHOT</nuitonWebVersion> - <nuitonUtilsVersion>3.0-rc-5</nuitonUtilsVersion> - <nuitonConfigVersion>3.0-alpha-3</nuitonConfigVersion> + <nuitonWebVersion>1.17</nuitonWebVersion> + <nuitonUtilsVersion>3.0-rc-7</nuitonUtilsVersion> + <nuitonConfigVersion>3.0-rc-1</nuitonConfigVersion> <nuitonCsvVersion>3.0-alpha-3</nuitonCsvVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <h2Version>1.4.178</h2Version> -- 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 http://git.chorem.org/pollen.git commit c8ed546e39f96599eadb9dd55f88adb0830408cc Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 26 18:18:13 2014 +0200 clean templates --- .../src/main/resources/email/LostPasswordEmail.mustache | 2 +- .../src/main/resources/email/LostPasswordEmail_fr.mustache | 4 ++-- .../src/main/resources/email/PollCreatedEmail.mustache | 6 +++--- .../src/main/resources/email/PollCreatedEmail_fr.mustache | 8 ++++---- .../src/main/resources/email/UserAccountCreatedEmail.mustache | 4 ++-- .../src/main/resources/email/UserAccountCreatedEmail_fr.mustache | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pollen-services/src/main/resources/email/LostPasswordEmail.mustache b/pollen-services/src/main/resources/email/LostPasswordEmail.mustache index b65f341..b641316 100644 --- a/pollen-services/src/main/resources/email/LostPasswordEmail.mustache +++ b/pollen-services/src/main/resources/email/LostPasswordEmail.mustache @@ -1,4 +1,4 @@ -Hello {{user.name}} +Hello {{user.name}}, You have just asked for a new password generation for your Pollen account. diff --git a/pollen-services/src/main/resources/email/LostPasswordEmail_fr.mustache b/pollen-services/src/main/resources/email/LostPasswordEmail_fr.mustache index c7b153d..8be64c4 100644 --- a/pollen-services/src/main/resources/email/LostPasswordEmail_fr.mustache +++ b/pollen-services/src/main/resources/email/LostPasswordEmail_fr.mustache @@ -1,8 +1,8 @@ -Bonjour {{user.name}} +Bonjour {{user.name}}, Vous venez de demander la génération d'un nouveau mot de passe d'accès à votre compte Pollen. Courriel: {{user.email}} Mot de passe: {{password}} -Vous pouvez gérer vos sondage en vous connectant sur <a href="{{url}}">Pollen</a>. \ No newline at end of file +Vous pouvez gérer vos sondages en vous connectant sur <a href="{{url}}">Pollen</a>. \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/PollCreatedEmail.mustache b/pollen-services/src/main/resources/email/PollCreatedEmail.mustache index 8b081c7..8ebd3fa 100644 --- a/pollen-services/src/main/resources/email/PollCreatedEmail.mustache +++ b/pollen-services/src/main/resources/email/PollCreatedEmail.mustache @@ -1,12 +1,12 @@ -Hello {{ poll.creator.name }} +Hello {{poll.creator.name}}, -You had just created the new poll : <a href="{{url}}">{{ poll.title }}</a> +You had just created the new poll: <a href="{{url}}">{{poll.title}}</a> {{#poll.description}} ------------------------------------- -{{{ poll.description }}} +{{{poll.description}}} ------------------------------------- diff --git a/pollen-services/src/main/resources/email/PollCreatedEmail_fr.mustache b/pollen-services/src/main/resources/email/PollCreatedEmail_fr.mustache index 1c8fa85..12e9bf7 100644 --- a/pollen-services/src/main/resources/email/PollCreatedEmail_fr.mustache +++ b/pollen-services/src/main/resources/email/PollCreatedEmail_fr.mustache @@ -1,15 +1,15 @@ -Bonjour {{ poll.creator.name }} +Bonjour {{poll.creator.name}}, -Le sondage vient d'être créé : <a href="{{url}}">{{ poll.title }}</a> +Le sondage vient d'être créé : <a href="{{url}}">{{poll.title}}</a> {{#poll.description}} ------------------------------------- -{{{ poll.description }}} +{{{poll.description}}} ------------------------------------- {{/poll.description}} -Vous pouvez gérer vos sondage en vous connectant sur <a href="{{pollenUrl}}">Pollen</a>. +Vous pouvez gérer votre sondage en vous connectant sur <a href="{{pollenUrl}}">Pollen</a>. diff --git a/pollen-services/src/main/resources/email/UserAccountCreatedEmail.mustache b/pollen-services/src/main/resources/email/UserAccountCreatedEmail.mustache index bcd3e20..043c281 100644 --- a/pollen-services/src/main/resources/email/UserAccountCreatedEmail.mustache +++ b/pollen-services/src/main/resources/email/UserAccountCreatedEmail.mustache @@ -1,10 +1,10 @@ -Welcome {{user.name}} +Welcome {{user.name}}, You had just created an account on the web application Pollen. Email: {{user.email}} Password: {{password}} -You must validate your email on this url : <a href="{{validateUrl}}">{{vaidateUrl}}</a> +You must validate your email on this url: <a href="{{validateUrl}}">{{vaidateUrl}}</a> You can now manage your polls by logging on the <a href="{{pollenUrl}}">Pollen</a> website. \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/UserAccountCreatedEmail_fr.mustache b/pollen-services/src/main/resources/email/UserAccountCreatedEmail_fr.mustache index 09400e2..85285db 100644 --- a/pollen-services/src/main/resources/email/UserAccountCreatedEmail_fr.mustache +++ b/pollen-services/src/main/resources/email/UserAccountCreatedEmail_fr.mustache @@ -1,4 +1,4 @@ -Bonjour {{user.name}} +Bonjour {{user.name}}, Vous venez de créer un compte sur l'application en ligne Pollen @@ -7,4 +7,4 @@ Password: {{password}} Vous devez valider votre courriel en allant sur cette adresse : <a href="{{validateUrl}}">{{vaidateUrl}}</a> -Vous pouvez gérer vos sondage en vous connectant sur <a href="{{pollenUrl}}">Pollen</a>. \ No newline at end of file +Vous pouvez gérer vos sondages en vous connectant sur <a href="{{pollenUrl}}">Pollen</a>. \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm