February 2015 - Coselmar-commits - mailman.cloud.codelutin.com

branch release/0.8 updated (0c5e21f -> 6340aa6)
by codelutin.com scm 06 Feb '15

06 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch release/0.8 in repository coselmar. See http://git.codelutin.com/coselmar.git from 0c5e21f fixes #6618 add new types for document adds 51b86af prepare release adds 6340aa6 [jgitflow-maven-plugin]updating poms for branch'release/0.8' with non-snapshot versions No new revisions were added by this update. Summary of changes: coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- .../src/main/webapp/i18n/angular-locale_en.js | 23 ++++++++++++++++++++++ .../src/main/webapp/i18n/angular-locale_fr.js | 23 ++++++++++++++++++++++ pom.xml | 2 +- 7 files changed, 51 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (d735f55 -> b589625)
by codelutin.com scm 06 Feb '15

06 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch master in repository coselmar. See http://git.codelutin.com/coselmar.git from d735f55 Merge branch 'release/0.7.1' adds 7fba1f3 fixes #6583 : display date in french when it is the selected language adds 83d313d [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 3259b30 Merge branch 'master' into develop adds 503573d [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 92eb160 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds 609ebba fixes #6576 tape enter validate search in referential adds 31ffb9b fixes #6577 Display "no result" instead of nothing in search results adds ed571a6 prepare service : user is authorized to see a restricted document he is in list adds db2e7e2 add restricted document in documents list (update database request) adds 621be68 fix case of remove related and closing 'restricted' documents and impact on document access adds 658e66c just be sure participant group name is same as question title adds 3ced62e manage authorized user on restricted document creation adds 7e1d69d manage authorized users in document get, and begin update mangement adds 4d74950 can modify privacy and authorized user in document edit adds 8071f46 add API to get experts list, available for expert users adds 43e514c Refs #6577 : Syntaxical modification adds 0667fa1 Merge branch 'develop' into feature/6515-restrected-access-on-document adds 2ae6ffa Fixes #6515 Merge branch 'feature/6515-restrected-access-on-document' into develop adds f8c6153 fixes #6600 fix question parents update adds 232209c on creation, question status is IN_PROGRESS adds 416a73f fixes #6517 resolve encoding problem in current user name adds 3197429 fixes #6615 order documents by deposit date desc in questions adds 0c5e21f fixes #6618 add new types for document adds 51b86af prepare release adds 6340aa6 [jgitflow-maven-plugin]updating poms for branch'release/0.8' with non-snapshot versions adds b589625 Merge branch 'release/0.8' No new revisions were added by this update. Summary of changes: coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- .../persistence/entity/DocumentTopiaDao.java | 13 +- coselmar-rest/pom.xml | 3 +- .../fr/ifremer/coselmar/beans/DocumentBean.java | 23 ++- .../services/CoselmarWebServiceSupport.java | 77 ++++++++- .../coselmar/services/v1/DocumentsWebService.java | 192 ++++++++++++++++----- .../coselmar/services/v1/QuestionsWebService.java | 97 ++++++++--- .../coselmar/services/v1/UsersWebService.java | 48 +++++- coselmar-rest/src/main/resources/mapping | 1 + coselmar-ui/pom.xml | 8 +- .../src/main/webapp/i18n/angular-locale_en.js | 138 +++++++++++++++ .../src/main/webapp/i18n/angular-locale_fr.js | 120 +++++++++++++ coselmar-ui/src/main/webapp/i18n/en.js | 6 + coselmar-ui/src/main/webapp/i18n/fr.js | 6 + coselmar-ui/src/main/webapp/index.html | 1 + coselmar-ui/src/main/webapp/js/angular-jwt.js | 38 ++-- .../src/main/webapp/js/coselmar-controllers.js | 113 ++++++++++-- .../main/webapp/js/coselmar-questions-services.js | 2 - .../src/main/webapp/js/coselmar-services.js | 7 + coselmar-ui/src/main/webapp/js/coselmar.js | 8 +- .../src/main/webapp/views/documents/documents.html | 1 + .../main/webapp/views/documents/editDocument.html | 38 +++- .../webapp/views/documents/modalDocumentEdit.html | 2 + .../views/documents/modalDocumentSearch.html | 1 + .../main/webapp/views/documents/newdocument.html | 30 +++- .../main/webapp/views/documents/viewDocument.html | 2 + .../main/webapp/views/questions/closeQuestion.html | 2 +- .../main/webapp/views/questions/editquestion.html | 2 +- .../views/questions/modalQuestionSearch.html | 1 + .../webapp/views/questions/newDocumentsPart.html | 2 +- .../src/main/webapp/views/questions/questions.html | 1 + .../main/webapp/views/questions/viewquestion.html | 4 +- .../main/webapp/views/referential/referential.html | 13 +- coselmar-ui/src/main/webapp/views/users/users.html | 1 + pom.xml | 17 +- 36 files changed, 888 insertions(+), 134 deletions(-) create mode 100644 coselmar-ui/src/main/webapp/i18n/angular-locale_en.js create mode 100644 coselmar-ui/src/main/webapp/i18n/angular-locale_fr.js -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Coselmar 0.8 released
by codelutin.com Release Notification 06 Feb '15

06 Feb '15

The Coselmar team is pleased to announce the coselmar-0.8 release! Documentation of the project can be found here: https://coselmar.codelutin.com Changes ------- Changes in this version include: New features: o Review documents order in question view Issue: 6615. Thanks to Yannick Martel. Resolved by ymartel. o Add two new document types Issue: 6618. Thanks to Yannick Martel. Resolved by ymartel. o Manage restricted access for document Issue: 6515. Thanks to Yannick Martel. Resolved by ymartel. o Gestion de la touche entrée lors de la recherche dans le référentiel Issue: 6550. Thanks to Léo Kaufmann. Resolved by lkaufmann. o A la création d'une question, associer le statut In PROGRESS (ne plus utiliser OUVERT) Issue: 6585. Thanks to Vincent BADTS. Resolved by ymartel. Fixed Bugs: o Dans un projet, impossible de supprimer un projet parent initialement associé Issue: 6600. Thanks to Vincent BADTS. Resolved by ymartel. o Mauvais encodage des infos utilisateurs Issue: 6517. Thanks to Léo Kaufmann. Resolved by ymartel. o Date limite d'une question : afficher en Français si on est en vue français sur le site Issue: 6583. Thanks to Vincent BADTS. Resolved by ymartel. o Référentiel : activer la recherche avec la touche [Entrée] Issue: 6576. Thanks to Vincent BADTS. Resolved by ymartel. o Référentiel : si une recherche ne donne rien afficher "O résultats trouvé" Issue: 6577. Thanks to Vincent BADTS. Resolved by ymartel. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/coselmar/files * coselmar-bundle-0.8.war - http://forge.codelutin.com/attachments/download/2834 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Coselmar team

1 0

branch release/0.8 created (now 0c5e21f)
by codelutin.com scm 06 Feb '15

06 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch release/0.8 in repository coselmar. See http://git.codelutin.com/coselmar.git at 0c5e21f fixes #6618 add new types for document No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (0c5e21f -> 85fd0eb)
by codelutin.com scm 06 Feb '15

06 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 0c5e21f fixes #6618 add new types for document new 85fd0eb [jgitflow-maven-plugin]updating poms for 0.9-SNAPSHOT development The 1 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 85fd0ebaad8c8dff6b548698b47ce8dae806f1f3 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Feb 6 11:28:20 2015 +0000 [jgitflow-maven-plugin]updating poms for 0.9-SNAPSHOT development Summary of changes: coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (3197429 -> 0c5e21f)
by codelutin.com scm 06 Feb '15

06 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 3197429 fixes #6615 order documents by deposit date desc in questions new 0c5e21f fixes #6618 add new types for document The 1 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 0c5e21fe805ceed2481079deb45be005f866806e Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Feb 6 11:25:00 2015 +0100 fixes #6618 add new types for document Summary of changes: .../fr/ifremer/coselmar/beans/DocumentBean.java | 4 ++- coselmar-ui/src/main/webapp/i18n/en.js | 2 ++ coselmar-ui/src/main/webapp/i18n/fr.js | 2 ++ .../src/main/webapp/js/coselmar-controllers.js | 29 ++++++++++++++++++---- .../main/webapp/views/documents/editDocument.html | 10 +++++--- .../webapp/views/documents/modalDocumentEdit.html | 2 ++ .../main/webapp/views/documents/newdocument.html | 12 +++++---- .../main/webapp/views/documents/viewDocument.html | 2 ++ 8 files changed, 48 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (416a73f -> 3197429)
by codelutin.com scm 05 Feb '15

05 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 416a73f fixes #6517 resolve encoding problem in current user name new 3197429 fixes #6615 order documents by deposit date desc in questions The 1 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 31974298ad2ef406dd4ebb04f9687bc3779d8887 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Feb 5 17:58:36 2015 +0100 fixes #6615 order documents by deposit date desc in questions Summary of changes: coselmar-ui/src/main/webapp/views/questions/closeQuestion.html | 2 +- coselmar-ui/src/main/webapp/views/questions/editquestion.html | 2 +- coselmar-ui/src/main/webapp/views/questions/newDocumentsPart.html | 2 +- coselmar-ui/src/main/webapp/views/questions/viewquestion.html | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

01/01: fixes #6517 resolve encoding problem in current user name
by codelutin.com scm 05 Feb '15

05 Feb '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 416a73fbe4e36ca6e971fadb238d49e1a79145c6 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Feb 5 17:16:38 2015 +0100 fixes #6517 resolve encoding problem in current user name --- coselmar-rest/pom.xml | 1 - .../coselmar/services/v1/UsersWebService.java | 2 +- coselmar-ui/src/main/webapp/js/angular-jwt.js | 38 +++++++++++++--------- pom.xml | 7 ++++ 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 7c98e66..d7a4c43 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -128,7 +128,6 @@ <dependency> <groupId>com.auth0</groupId> <artifactId>java-jwt</artifactId> - <version>1.0.0</version> </dependency>  diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/UsersWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/UsersWebService.java index c0dbe5c..aa02c66 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/UsersWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/UsersWebService.java @@ -380,7 +380,7 @@ public class UsersWebService extends CoselmarWebServiceSupport { // return a Json Web Token for authentication JWTSigner jwtSigner = new JWTSigner(getCoselmarServicesConfig().getWebSecurityKey()); JWTSigner.Options signerOption = new JWTSigner.Options(); - signerOption.setAlgorithm(Algorithm.HS512); + signerOption.setAlgorithm(Algorithm.HS384); String userTopiaId = user.getTopiaId(); String shortId = getPersistenceContext().getTopiaIdFactory().getRandomPart(userTopiaId); diff --git a/coselmar-ui/src/main/webapp/js/angular-jwt.js b/coselmar-ui/src/main/webapp/js/angular-jwt.js index 512cf50..c132579 100644 --- a/coselmar-ui/src/main/webapp/js/angular-jwt.js +++ b/coselmar-ui/src/main/webapp/js/angular-jwt.js @@ -4,21 +4,29 @@ * $Id:$ * $HeadURL:$ * %% - * Copyright (C) 2014 Ifremer, Code Lutin + * https://github.com/auth0/angular-jwt * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU 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 General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * The MIT License (MIT) + * + * Copyright (c) 2015 Auth0, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. * #L% */ (function() { @@ -94,7 +102,7 @@ angular.module('angular-jwt', throw 'Illegal base64url string!'; } } - return window.atob(output); //polifyll https://github.com/davidchambers/Base64.js + return decodeURIComponent(escape(window.atob(output))); //polifyll https://github.com/davidchambers/Base64.js } diff --git a/pom.xml b/pom.xml index fa5218f..a6272d7 100644 --- a/pom.xml +++ b/pom.xml @@ -354,6 +354,13 @@ <version>3.1.0</version> </dependency> +  + <dependency> + <groupId>com.auth0</groupId> + <artifactId>java-jwt</artifactId> + <version>1.0.0</version> + </dependency> +  <dependency> <groupId>log4j</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (232209c -> 416a73f)
by codelutin.com scm 05 Feb '15

05 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 232209c on creation, question status is IN_PROGRESS new 416a73f fixes #6517 resolve encoding problem in current user name The 1 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 416a73fbe4e36ca6e971fadb238d49e1a79145c6 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Feb 5 17:16:38 2015 +0100 fixes #6517 resolve encoding problem in current user name Summary of changes: coselmar-rest/pom.xml | 1 - .../coselmar/services/v1/UsersWebService.java | 2 +- coselmar-ui/src/main/webapp/js/angular-jwt.js | 38 +++++++++++++--------- pom.xml | 7 ++++ 4 files changed, 31 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (f8c6153 -> 232209c)
by codelutin.com scm 05 Feb '15

05 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from f8c6153 fixes #6600 fix question parents update new 232209c on creation, question status is IN_PROGRESS The 1 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 232209c91a5500cb4c175b209586dd871579da79 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Feb 5 15:55:58 2015 +0100 on creation, question status is IN_PROGRESS Summary of changes: .../fr/ifremer/coselmar/services/v1/QuestionsWebService.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1