branch master updated (a319f1e -> 12c71d0)
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 a319f1e Merge branch 'release/0.4.2' adds 2a20746 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds d30743b Merge branch 'master' into develop adds 78d419a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 1f6f5c7 fixes #6430 rename document owner to depositor to be more explicit, and add authors in listing adds ad3f5a6 review document file management fixes #6208 manage both file and urlfor document adds 950a2ad review document file management adds 272cf04 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds 7fcc742 remove useless dependency adds fb2c3bc [jgitflow-maven-plugin]updating poms for 0.6-SNAPSHOT development adds 7882dc7 back to 0.5-SNAPSHOT adds f1f7e6f Refs#6432 : Add css modifications adds 4baa64d Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds 3ea89c3 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds 5dba8bb prepare release adds 9ebc85a [jgitflow-maven-plugin]updating poms for branch'release/0.5' with non-snapshot versions adds 12c71d0 Merge branch 'release/0.5' No new revisions were added by this update. Summary of changes: coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- .../src/main/xmi/coselmar-model.zargo | Bin 10252 -> 10322 bytes coselmar-rest/pom.xml | 2 +- ...orizedException.java => NoResultException.java} | 6 +-- .../coselmar/services/v1/DocumentsWebService.java | 52 +++++++++------------ coselmar-rest/src/main/resources/mapping | 1 + coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/css/coselmar.css | 10 +++- coselmar-ui/src/main/webapp/index.html | 2 +- .../src/main/webapp/views/documents/document.html | 4 +- .../src/main/webapp/views/documents/documents.html | 6 ++- .../views/documents/modalDocumentSearch.html | 6 ++- .../main/webapp/views/documents/newdocument.html | 2 +- .../main/webapp/views/questions/editquestion.html | 10 ++-- .../webapp/views/questions/newDocumentsPart.html | 6 ++- .../main/webapp/views/questions/viewquestion.html | 12 +++-- coselmar-ui/src/main/webapp/views/users/users.html | 2 +- pom.xml | 2 +- 19 files changed, 70 insertions(+), 59 deletions(-) copy coselmar-rest/src/main/java/fr/ifremer/coselmar/services/errors/{UnauthorizedException.java => NoResultException.java} (85%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm