This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit 8e5e31c7c5045a4fe27050611ac0396eab1ae811 Merge: 6af647d 48f9e70 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:43:24 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.6' into 'master' bow-extension-chromium/pom.xml | 2 +- bow-ui/pom.xml | 77 ++++- .../main/java/org/chorem/bow/BookmarkUtils.java | 21 +- bow-ui/src/main/java/org/chorem/bow/BowConfig.java | 1 + bow-ui/src/main/java/org/chorem/bow/BowProxy.java | 5 +- .../main/java/org/chorem/bow/BowSearchResult.java | 27 +- .../src/main/java/org/chorem/bow/BowSession.java | 75 +++++ bow-ui/src/main/java/org/chorem/bow/BowUtils.java | 118 +++++++ .../java/org/chorem/bow/action/AliasAction.java | 32 +- .../java/org/chorem/bow/action/AtomAction.java | 17 +- .../java/org/chorem/bow/action/BowBaseAction.java | 6 + .../bow/action/bookmark/AddOrUpdateAction.java | 61 +++- .../action/bookmark/AuthenticationEditAction.java | 123 +++++++ .../action/bookmark/DeleteSearchResultsAction.java | 29 +- .../org/chorem/bow/action/bookmark/EditAction.java | 11 + .../org/chorem/bow/action/bookmark/HomeAction.java | 17 +- .../chorem/bow/action/bookmark/RemoveAction.java | 20 +- .../chorem/bow/action/group/GroupEditAction.java | 38 ++- .../chorem/bow/action/group/GroupViewAction.java | 5 +- .../bow/action/login/ForgotPasswordAction.java | 4 +- .../org/chorem/bow/action/login/LoginAction.java | 2 + .../chorem/bow/action/login/RegisterAction.java | 4 +- .../bow/action/preference/AdminTagAction.java | 34 +- .../action/preference/PreferenceBaseAction.java | 24 +- .../preference/UpdateAuthenticationAction.java | 66 ++++ .../action/sharedUser/SharedUserEditAction.java | 146 +++++++++ .../SharedUserViewAction.java} | 29 +- bow-ui/src/main/resources/bow.properties | 6 +- bow-ui/src/main/resources/bowpwd.sh | 58 ++++ .../main/resources/i18n/bow-ui_en_GB.properties | 35 +- .../main/resources/i18n/bow-ui_fr_FR.properties | 45 ++- bow-ui/src/main/resources/struts.xml | 45 +++ bow-ui/src/main/webapp/WEB-INF/bowutils.tld | 24 ++ bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp | 7 +- bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp | 3 - bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp | 54 +-- .../main/webapp/WEB-INF/jsp/authenticationEdit.jsp | 79 +++++ .../src/main/webapp/WEB-INF/jsp/editBookmark.jsp | 4 +- bow-ui/src/main/webapp/WEB-INF/jsp/error.jsp | 3 - .../src/main/webapp/WEB-INF/jsp/forgotPassword.jsp | 1 - bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp | 3 - bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 4 +- bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp | 38 ++- bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp | 51 +-- bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp | 1 - bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp | 53 ++- bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp | 1 - .../src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp | 58 ++++ .../src/main/webapp/WEB-INF/jsp/sharedUserView.jsp | 81 +++++ bow-ui/src/main/webapp/css/bookmark.css | 24 +- bow-ui/src/main/webapp/css/global.css | 12 + bow-ui/src/main/webapp/img/cadena.png | Bin 0 -> 647 bytes bow-ui/src/main/webapp/img/scriptlet.png | Bin 0 -> 998 bytes bow-ui/src/main/webapp/img/terminal.png | Bin 0 -> 946 bytes bow-ui/src/main/webapp/js/README | 36 ++ bow-ui/src/main/webapp/js/bowadd.js | 36 ++ bow-ui/src/main/webapp/js/bowpwd.js | 67 ++++ bow-ui/src/main/webapp/js/sha256.js | 363 +++++++++++++++++++++ bow-ui/src/main/xmi/README | 30 +- bow-ui/src/main/xmi/bow-model.properties | 20 ++ bow-ui/src/main/xmi/bow-model.zargo | Bin 10532 -> 11741 bytes pom.xml | 13 +- 64 files changed, 2053 insertions(+), 202 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.