branch develop updated (28e92bd7 -> 98d61191)
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 28e92bd7 fix #203 : lien vers liberapay new a9ca3e35 correction de l'erreur à la connexion si le mail n'est pas connu new 26b1d0ec refs #170 : correction des emails pour le feedback new 98d61191 modification de la version de Pollen The 3 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 98d611915ffb68ac61841b11d24379727a2404a2 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Apr 18 17:52:30 2018 +0200 modification de la version de Pollen commit 26b1d0ecb90012339fe20b8fd7a972039689fcdf Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Apr 18 17:49:48 2018 +0200 refs #170 : correction des emails pour le feedback commit a9ca3e35c6c54d153134f7160958bc8890cf35e1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Apr 18 17:21:48 2018 +0200 correction de l'erreur à la connexion si le mail n'est pas connu Summary of changes: pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- .../src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java | 2 -- pollen-services/pom.xml | 2 +- .../chorem/pollen/services/service/security/SecurityService.java | 2 +- pollen-services/src/main/resources/email/FeedbackEmail.mustache | 2 +- pollen-services/src/main/resources/email/FeedbackEmail_fr.mustache | 2 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- pollen-ui-riot-js/src/main/web/tag/popup/FeedbackModal.tag.html | 6 +++--- 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 +- 21 files changed, 22 insertions(+), 24 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 a9ca3e35c6c54d153134f7160958bc8890cf35e1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Apr 18 17:21:48 2018 +0200 correction de l'erreur à la connexion si le mail n'est pas connu --- .../src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java | 2 -- .../org/chorem/pollen/services/service/security/SecurityService.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java index ce585a16..3436d3dd 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java @@ -84,8 +84,6 @@ public class AuthApi { @Context PollenSecurityContext securityContext) throws PollenAuthenticationException, MissingAuthenticationException, - PollenInvalidSessionTokenException, - PollenCypherTechnicalException, PollenEmailNotValidatedException, PollenUserBannedException { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java index fe147011..ceafb2a7 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java @@ -121,7 +121,7 @@ public class SecurityService extends PollenServiceSupport { PollenUser user = getPollenUserDao().findUserWithEmailAddressOrNull(login); if (user == null) { - throw new PollenUnauthorizedException(login); + throw new PollenAuthenticationException(); } try { -- 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 26b1d0ecb90012339fe20b8fd7a972039689fcdf Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Apr 18 17:49:48 2018 +0200 refs #170 : correction des emails pour le feedback --- pollen-services/src/main/resources/email/FeedbackEmail.mustache | 2 +- pollen-services/src/main/resources/email/FeedbackEmail_fr.mustache | 2 +- pollen-ui-riot-js/src/main/web/tag/popup/FeedbackModal.tag.html | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pollen-services/src/main/resources/email/FeedbackEmail.mustache b/pollen-services/src/main/resources/email/FeedbackEmail.mustache index f0908285..178310c9 100644 --- a/pollen-services/src/main/resources/email/FeedbackEmail.mustache +++ b/pollen-services/src/main/resources/email/FeedbackEmail.mustache @@ -18,7 +18,7 @@ Platform : {{feedback.platform}} Screen resolution : {{feedback.screenResolution.width}} x {{feedback.screenResolution.height}} (L x H) window resolution : {{feedback.windowDimension.width}} x {{feedback.windowDimension.height}} (L x H) Session : {{sessionId}} -User : {{#user}}{{user.name}} ({{user.email}}){{/user}}{{^user}}Anonymous{{/user}} +User : {{#user}}{{user.name}} ({{user.defaultEmailAddress.emailAddress}}){{/user}}{{^user}}Anonymous{{/user}} Email : {{feedback.userEmail}} Locale : {{feedback.locale}} Services version : {{applicationVersion}} diff --git a/pollen-services/src/main/resources/email/FeedbackEmail_fr.mustache b/pollen-services/src/main/resources/email/FeedbackEmail_fr.mustache index 0fc2a2b5..8dfcdb80 100644 --- a/pollen-services/src/main/resources/email/FeedbackEmail_fr.mustache +++ b/pollen-services/src/main/resources/email/FeedbackEmail_fr.mustache @@ -19,7 +19,7 @@ Résolution : {{feedback.screenResolution.width}} x {{feedback.scree Taille d'affichage : {{feedback.windowDimension.width}} x {{feedback.windowDimension.height}} (L x H) Langue : {{feedback.locale}} Session : {{sessionId}} -Utilisateur : {{#user}}{{user.name}} ({{user.email}}){{/user}}{{^user}}Anonyme{{/user}} +Utilisateur : {{#user}}{{user.name}} ({{user.defaultEmailAddress.emailAddress}}){{/user}}{{^user}}Anonyme{{/user}} Email : {{feedback.userEmail}} Version services : {{applicationVersion}} {{#screenShotUrl}} diff --git a/pollen-ui-riot-js/src/main/web/tag/popup/FeedbackModal.tag.html b/pollen-ui-riot-js/src/main/web/tag/popup/FeedbackModal.tag.html index f82ba16a..22a54df4 100644 --- a/pollen-ui-riot-js/src/main/web/tag/popup/FeedbackModal.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/popup/FeedbackModal.tag.html @@ -8,12 +8,12 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -109,7 +109,7 @@ require("./Modal.tag.html"); this.refs.modal.refs.category.forEach(input => {input.checked = false;}); this.refs.modal.refs.description.value = ""; this.refs.modal.refs.uploadScreenShot.checked = true; - this.refs.modal.refs.email.value = this.session.getUser().defaultEmailAddress.emailAddress; + this.refs.modal.refs.email.value = this.session.getUser() && this.session.getUser().defaultEmailAddress.emailAddress; this.refs.modal.userEmailAddresses = this.session.getUser() ? this.session.getUser().emailAddresses.map(email => email.emailAddress) : []; return this.refs.modal.open(); }; -- 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 98d611915ffb68ac61841b11d24379727a2404a2 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Apr 18 17:52:30 2018 +0200 modification de la version de Pollen --- pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- 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 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index 5c22e924..f645df22 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.1.2</version> + <version>3.1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-rest-api/pom.xml b/pollen-rest-api/pom.xml index af6eddab..0b2daf42 100644 --- a/pollen-rest-api/pom.xml +++ b/pollen-rest-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.1.2</version> + <version>3.1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index 645ea9ad..88d8bea3 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.1.2</version> + <version>3.1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-ui-riot-js/package.json b/pollen-ui-riot-js/package.json index 9bb4ed27..5241cc4f 100644 --- a/pollen-ui-riot-js/package.json +++ b/pollen-ui-riot-js/package.json @@ -1,6 +1,6 @@ { "name": "Pollen", - "version": "3.1.2", + "version": "3.1.4-SNAPSHOT", "description": "Pollen UI", "main": "index.html", "repository": { diff --git a/pollen-ui-riot-js/pom.xml b/pollen-ui-riot-js/pom.xml index 4fb745a3..d9a80634 100644 --- a/pollen-ui-riot-js/pom.xml +++ b/pollen-ui-riot-js/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.1.2</version> + <version>3.1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-aggregator/pom.xml b/pollen-votecounting-aggregator/pom.xml index 7ca015d0..e3cb9d8e 100644 --- a/pollen-votecounting-aggregator/pom.xml +++ b/pollen-votecounting-aggregator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.1.2</version> + <version>3.1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml index d2f5f7cf..2124214d 100644 --- a/pollen-votecounting-api/pom.xml +++ b/pollen-votecounting-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.1.2</version> + <version>3.1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml index 7c5ee529..cd3efa4c 100644 --- a/pollen-votecounting-borda/pom.xml +++ b/pollen-votecounting-borda/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.1.2</version> + <version>3.1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml index a959a7e0..dea5a389 100644 --- a/pollen-votecounting-condorcet/pom.xml +++ b/pollen-votecounting-condorcet/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.1.2</version> + <version>3.1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index f0133a08..5c19f75a 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.1.2</version> + <version>3.1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-cumulative/pom.xml b/pollen-votecounting-cumulative/pom.xml index 37a44362..0876f9ad 100644 --- a/pollen-votecounting-cumulative/pom.xml +++ b/pollen-votecounting-cumulative/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.1.2</version> + <version>3.1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml index 896a6ef2..a6865930 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.1.2</version> + <version>3.1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-majority-judgment/pom.xml b/pollen-votecounting-majority-judgment/pom.xml index 07c141fc..ddee3376 100644 --- a/pollen-votecounting-majority-judgment/pom.xml +++ b/pollen-votecounting-majority-judgment/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.1.2</version> + <version>3.1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml index 5e496714..696bf3b1 100644 --- a/pollen-votecounting-normal/pom.xml +++ b/pollen-votecounting-normal/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.1.2</version> + <version>3.1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml index 5da6ee75..0b022c4c 100644 --- a/pollen-votecounting-number/pom.xml +++ b/pollen-votecounting-number/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.1.2</version> + <version>3.1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pom.xml b/pom.xml index 32fc15e1..a103cbd2 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>3.1.2</version> + <version>3.1.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Pollen</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm