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 3290654 Refs #6308 : Change information text for supervisor admin page new 4e09a96 prepare document edit service new b54a05d Merge branch 'develop' into feature/6435-modify-document new 9139630 add edit document page new b0a9c28 cannot edit document used by questions new b789cd4 fixes #6435 Merge branch 'feature/6435-modify-document' into develop new c615964 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop The 6 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 c6159649a91059ac02da323514732d87f108eb2c Merge: b789cd4 3290654 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 21 18:16:22 2015 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop commit b789cd461e14f93efc0545fbf7c75ad4de39b101 Merge: 19ba20f b0a9c28 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 21 18:16:07 2015 +0100 fixes #6435 Merge branch 'feature/6435-modify-document' into develop commit b0a9c2844cf0fb97a679f554e56b464269ba1ea8 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 21 18:16:03 2015 +0100 cannot edit document used by questions commit 91396303b4273f34348bfbfce74a715e7e2eb2d2 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 21 17:50:23 2015 +0100 add edit document page commit b54a05d8704d102690de5e3d57957ff23dbaec1d Merge: 4e09a96 19ba20f Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 21 12:08:03 2015 +0100 Merge branch 'develop' into feature/6435-modify-document commit 4e09a9665c18f531809074b5a80cae3ca7deb8df Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 21 11:57:34 2015 +0100 prepare document edit service Summary of changes: .../fr/ifremer/coselmar/beans/DocumentBean.java | 16 +++++ .../coselmar/services/v1/DocumentsWebService.java | 84 +++++++++++++++++++++- .../src/main/webapp/js/coselmar-controllers.js | 82 ++++++++++++++++++++- .../src/main/webapp/js/coselmar-services.js | 7 +- .../src/main/webapp/views/documents/document.html | 82 +-------------------- .../{newdocument.html => editDocument.html} | 80 +++++---------------- .../documents/{document.html => viewDocument.html} | 41 ++++------- 7 files changed, 211 insertions(+), 181 deletions(-) copy coselmar-ui/src/main/webapp/views/documents/{newdocument.html => editDocument.html} (75%) copy coselmar-ui/src/main/webapp/views/documents/{document.html => viewDocument.html} (67%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.