This is an automated email from the git hooks/post-receive script. New change to branch master in repository bow. See http://git.chorem.org/bow.git from c546bbe [jgitflow-maven-plugin]merging 'release/1.4.1' into 'master' adds b19adc7 [jgitflow-maven-plugin]updating poms for 1.5-SNAPSHOT development adds 6e86824 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 5462a81 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 10fdada [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 63a6644 fixes #1261: Can use prefix that start with another existing prefix adds a074606 fixes #1203: Pouvoir masquer les resultats filtres ayant un certain tag adds cfd39ae upgrade library adds 2ed8277 fixes #1262: add support to track bookmark add throw atom feed adds e7b3213 fixes #1262: add support to track bookmark add throw atom feed - fixes bug in atom format adds 92b801d add support to filter on specific BowBookmark wikittyId (listId) useful to show bookmark after editing or for atom link adds 28e6673 improve redirect after add (reditect to editing if no information) use new funtionnality (filter on id) to present bookmark after editing adds 5935a25 url to web site for one entry use new filter on id to display only one bookmark adds 7fc8eaf better form presentation for bookmark edition adds d5a2dc7 fixes #229: Partage de bookmark entre utilisateur fixes #1263: Add support for group (private/public) and with specific tag share some bookmark with this groups adds b0b91ff fixes #229: Partage de bookmark entre utilisateur fixes #1263: Add support for group (private/public) and with specific tag share some bookmark with this groups can't use group if not members (when try to add tag) adds f33801d if no group tag, don't try to search group adds 1731b2a add Group description adds eac7769 update translation adds ffd8da4 update translation adds 05c45bd add support for speudo bookmarks title (first work of descriotion) adds 4b78382 add login of currently logged user in logout block adds 6303a70 add configuration to allow or not public group adds 9be947e add comment about proxy.logout() adds 0a47cc8 add key for new config option (allow public group) adds bf124e7 - add wikitty AppAdminGroup when admin login - WikittyClient has now correct Wikitty SecurityToken and with AppAdminGroup can check if user can read/write bookmark adds de67fa9 hack to support public alias with new security constraints adds f7c36c1 use wikitty 3.12 adds 4cbfb21 fixes dependancy and license problem adds 8df08ba [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions adds 6bcdda0 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' No new revisions were added by this update. Summary of changes: 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(-) create mode 100644 bow-ui/src/main/java/org/chorem/bow/action/AtomAction.java create mode 100644 bow-ui/src/main/java/org/chorem/bow/action/group/GroupEditAction.java create mode 100644 bow-ui/src/main/java/org/chorem/bow/action/group/GroupViewAction.java create mode 100644 bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp create mode 100644 bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp create mode 100644 bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.