branch develop updated (7f5b0e5 -> f510580)
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 7f5b0e5 revert commit new f966c64 log d'error a l'import du LDAP new f510580 Merge remote-tracking branch 'origin/develop' 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 f510580d035a13abca77a5d12713e67406708f66 Merge: f966c64 7f5b0e5 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 30 13:33:09 2017 +0200 Merge remote-tracking branch 'origin/develop' into develop commit f966c64b7d59465990608824aacb88848f6c4ab5 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 30 13:32:31 2017 +0200 log d'error a l'import du LDAP Summary of changes: .../src/main/java/org/chorem/pollen/rest/api/v1/ErrorAction.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 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 f966c64b7d59465990608824aacb88848f6c4ab5 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 30 13:32:31 2017 +0200 log d'error a l'import du LDAP --- .../src/main/java/org/chorem/pollen/rest/api/v1/ErrorAction.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ErrorAction.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ErrorAction.java index 7839f36..146353a 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ErrorAction.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ErrorAction.java @@ -21,6 +21,8 @@ package org.chorem.pollen.rest.api.v1; * #L% */ +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.pollen.rest.api.PollenRenderError; import org.chorem.pollen.services.service.FavoriteListImportException; import org.chorem.pollen.services.service.InvalidFormException; @@ -38,6 +40,8 @@ import javax.servlet.http.HttpServletResponse; */ public class ErrorAction extends WebMotionController { + private static final Log log = LogFactory.getLog(ErrorAction.class); + public InvalidFormException on400Form(HttpContext context, InvalidFormException e) { // just return the exception, @@ -46,7 +50,9 @@ public class ErrorAction extends WebMotionController { } public FavoriteListImportException on400Import(HttpContext context, FavoriteListImportException e) { - + if (log.isErrorEnabled()) { + log.error(e.getMessage(), e); + } // just return the exception, return e; -- 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 f510580d035a13abca77a5d12713e67406708f66 Merge: f966c64 7f5b0e5 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 30 13:33:09 2017 +0200 Merge remote-tracking branch 'origin/develop' into develop .../org/chorem/pollen/services/bean/PollBean.java | 3 +- .../services/job/SendPollEndReminderJob.java | 7 +- pollen-ui-riot-js/src/main/web/i18n.json | 22 +++--- pollen-ui-riot-js/src/main/web/js/Error.js | 3 +- pollen-ui-riot-js/src/main/web/js/UIHelper.js | 2 +- .../main/web/tag/components/date-picker.tag.html | 37 +++++++--- .../web/tag/components/date-time-picker.tag.html | 78 ++++++++++++++++++++++ .../main/web/tag/components/time-picker.tag.html | 67 ++++++++++++------- .../src/main/web/tag/poll/EditPoll.tag.html | 14 ++-- .../src/main/web/tag/poll/Settings.tag.html | 67 +++++++++---------- 10 files changed, 210 insertions(+), 90 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm