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 6bcdda0bf6903cf503a7113ed26ebaf447dee9fa Merge: c546bbe 8df08ba Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 20 19:43:47 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' bow-extension-chromium/pom.xml | 2 +- bow-ui/pom.xml | 27 +-- bow-ui/src/license/THIRD-PARTY.properties | 6 +- .../main/java/org/chorem/bow/BookmarkUtils.java | 63 +++++- bow-ui/src/main/java/org/chorem/bow/BowConfig.java | 26 ++- .../main/java/org/chorem/bow/BowConfigOption.java | 59 +++--- bow-ui/src/main/java/org/chorem/bow/BowProxy.java | 3 +- .../src/main/java/org/chorem/bow/BowSession.java | 46 ++++- bow-ui/src/main/java/org/chorem/bow/BowUtils.java | 61 +++++- .../java/org/chorem/bow/action/AliasAction.java | 40 ++-- .../java/org/chorem/bow/action/AtomAction.java | 114 +++++++++++ .../java/org/chorem/bow/action/BowBaseAction.java | 21 ++ .../bow/action/admin/ReIndexationAction.java | 2 +- .../bow/action/bookmark/AddOrUpdateAction.java | 192 ++++++------------- .../action/bookmark/DeleteSearchResultsAction.java | 10 +- .../org/chorem/bow/action/bookmark/EditAction.java | 2 +- .../org/chorem/bow/action/bookmark/HomeAction.java | 5 +- .../chorem/bow/action/bookmark/RemoveAction.java | 4 +- .../bow/action/bookmark/ScreenshotAction.java | 6 +- .../chorem/bow/action/group/GroupEditAction.java | 211 +++++++++++++++++++++ .../chorem/bow/action/group/GroupViewAction.java | 86 +++++++++ .../bow/action/login/ForgotPasswordAction.java | 14 +- .../org/chorem/bow/action/login/LoginAction.java | 8 +- .../chorem/bow/action/login/RegisterAction.java | 18 +- .../action/opensearch/OpenSearchBaseAction.java | 7 +- .../action/opensearch/OpenSearchResultAction.java | 2 +- .../opensearch/OpenSearchSuggestionAction.java | 2 +- .../bow/action/opensearch/SuggestionAction.java | 2 +- .../bow/action/preference/AdminTagAction.java | 2 +- .../bow/action/preference/DeleteImportAction.java | 4 +- .../bow/action/preference/GenerateTokenAction.java | 4 +- .../action/preference/ImportBookmarksAction.java | 10 +- .../action/preference/PreferenceBaseAction.java | 2 +- .../bow/action/preference/UpdateSiteAction.java | 6 +- .../bow/action/preference/UpdateUserAction.java | 12 +- .../main/resources/i18n/bow-ui_en_GB.properties | 44 +++-- .../main/resources/i18n/bow-ui_fr_FR.properties | 160 +++++++++------- bow-ui/src/main/resources/struts.xml | 32 +++- bow-ui/src/main/webapp/WEB-INF/bowutils.tld | 6 + bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp | 129 +++++++++++++ .../src/main/webapp/WEB-INF/jsp/editBookmark.jsp | 9 +- bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp | 118 ++++++++++++ bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 79 ++++++++ .../src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp | 2 + bow-ui/src/main/webapp/css/global.css | 37 +++- bow-ui/src/main/xmi/bow-model.zargo | Bin 9807 -> 10532 bytes pom.xml | 25 ++- 47 files changed, 1355 insertions(+), 365 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.