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 bec58be049f0839efe9f231ffcc1b5e927c25c7c Merge: cf4f833 6220fb4 Author: Yannick Martel <martel@©odelutin.com> Date: Fri Jan 23 15:20:40 2015 +0100 fixes #6202 Merge branch 'feature/6202-add-multiliguage' into develop coselmar-ui/pom.xml | 6 + coselmar-ui/src/main/webapp/i18n/en.js | 210 +++++++++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 210 +++++++++++++++++++++ coselmar-ui/src/main/webapp/img/en.png | Bin 0 -> 599 bytes coselmar-ui/src/main/webapp/img/fr.png | Bin 0 -> 545 bytes coselmar-ui/src/main/webapp/index.html | 58 +++--- .../src/main/webapp/js/coselmar-constants.js | 3 +- .../src/main/webapp/js/coselmar-controllers.js | 37 +++- coselmar-ui/src/main/webapp/js/coselmar.js | 13 +- .../src/main/webapp/views/admin/admintools.html | 12 +- .../src/main/webapp/views/documents/documents.html | 22 +-- .../main/webapp/views/documents/editDocument.html | 44 ++--- .../webapp/views/documents/modalDocumentEdit.html | 55 +++--- .../views/documents/modalDocumentSearch.html | 17 +- .../main/webapp/views/documents/newdocument.html | 64 +++---- .../main/webapp/views/documents/viewDocument.html | 44 ++--- .../main/webapp/views/questions/closeQuestion.html | 14 +- .../main/webapp/views/questions/editquestion.html | 56 +++--- .../views/questions/modalQuestionSearch.html | 12 +- .../webapp/views/questions/newDocumentsPart.html | 12 +- .../main/webapp/views/questions/newquestion.html | 4 +- .../src/main/webapp/views/questions/question.html | 16 +- .../src/main/webapp/views/questions/questions.html | 24 +-- .../views/questions/viewRestrictedQuestion.html | 6 +- .../main/webapp/views/questions/viewquestion.html | 52 ++--- .../main/webapp/views/referential/referential.html | 33 ++-- .../src/main/webapp/views/users/adminUsers.html | 49 +++-- .../src/main/webapp/views/users/edituser.html | 49 +++-- .../src/main/webapp/views/users/newuser.html | 12 +- .../main/webapp/views/users/supervisorUsers.html | 48 ++--- coselmar-ui/src/main/webapp/views/users/user.html | 26 +-- coselmar-ui/src/main/webapp/views/users/users.html | 2 +- pom.xml | 8 + 33 files changed, 847 insertions(+), 371 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.