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 6af647d [jgitflow-maven-plugin]merging 'release/1.5.1' into 'master' adds b2ce337 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds dabf83e [jgitflow-maven-plugin]merging 'master' into 'develop' adds 6ab099f [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds fa9c5c4 add tag and filter in title to make difference between all atom flux adds 061ef35 change dev bow url to work with mvn tomcat7:run adds 5d624c3 rewrite to prevent XSS rewrite to have correct URL adds a064cf7 add author email if login is an email adds b8a901b fix charset escape JavaScript only not HTML to prevent bug with python feedparser :( (rss2email) (escape transforme accent to entity (é) and when parser recreate accent caractere this caractere is byte and not string :( adds 684dfaa add support to share with user without bow login adds 07d2743 add markdown processor to process bookmark description (in safeMode) adds 3ef8aca fixes #1274: add support for more complexe query for fulltext bookmark search adds ab9fc2a add some FIXME and debug adds b36a9f5 add link to shared user to go home page adds c43a0f5 fixes #1270: the user must configure the atom stream to not receive its own links adds 540789a fixes #233: Add support for login/password (change header jsp generation) (add minification css/js) adds e73fa41 add shell script to compute password as same way that bookmarklet adds 980ad7d - new BowAdd bookmarklet - add shell script to generate password as bookmarklet adds ffd0656 fixes #963: Rendre la recherche par tag insensible à la casse adds 6b55547 this commit fixes bug when we use alias to go to site, it don't increment count adds dc7a27c add support for BowAuthentication on all Bookmark - add description in BowAuthentication - inverse link now: BowUser <- BowAuthentication -> BowBookmark via field target:Wikitty - register new extension in Proxy adds 8f9251c add icon before script(let) link default password length to 15 adds 96069df add all missing translation for UI adds e8c3260 use last wikitty version to use wikitty service authorisation with null if no access adds 5f3fc79 add support for more than one BowAuthentication for one Bookmark (need when bookmark is shared) adds 9beee43 add small documentation in UI adds c5b884e remove problematic field with struts and multiple setter adds 5b06dcb use entity to < char adds f50a2ce remove log.info use to debug adds ffebec5 bug fixes: '' -> ', {0} -> %s (old i18n syntax to new) adds 5a93fe2 use " to encapsulate tag string in fullTextLine (prevent interpretation of #) adds e6c7ee8 - add getBowUser on BowBaseAction - remove problematics field in form (owner) not very useful (and bug with struts adds 10ca968 rename group or shareUser tag, if user is no more in group or share user is deleted adds e4b7b7f use last wikitty version adds 2d2e367 not use Collections4 adds 60eca73 fixes bug (NPE) when we try to delete adds a43de67 fixes ending space line adds 48f9e70 [jgitflow-maven-plugin]updating poms for branch'release/1.6' with non-snapshot versions adds 8e5e31c [jgitflow-maven-plugin]merging 'release/1.6' into 'master' No new revisions were added by this update. Summary of changes: 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 +- ...Action.java => UpdateAuthenticationAction.java} | 30 +- .../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-model.properties} | 3 +- bow-ui/src/main/xmi/bow-model.zargo | Bin 10532 -> 11741 bytes pom.xml | 13 +- 64 files changed, 1983 insertions(+), 219 deletions(-) create mode 100644 bow-ui/src/main/java/org/chorem/bow/action/bookmark/AuthenticationEditAction.java copy bow-ui/src/main/java/org/chorem/bow/action/preference/{GenerateTokenAction.java => UpdateAuthenticationAction.java} (69%) create mode 100644 bow-ui/src/main/java/org/chorem/bow/action/sharedUser/SharedUserEditAction.java copy bow-ui/src/main/java/org/chorem/bow/action/{group/GroupViewAction.java => sharedUser/SharedUserViewAction.java} (70%) create mode 100755 bow-ui/src/main/resources/bowpwd.sh create mode 100644 bow-ui/src/main/webapp/WEB-INF/jsp/authenticationEdit.jsp create mode 100644 bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp create mode 100644 bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp create mode 100644 bow-ui/src/main/webapp/img/cadena.png create mode 100644 bow-ui/src/main/webapp/img/scriptlet.png create mode 100644 bow-ui/src/main/webapp/img/terminal.png create mode 100644 bow-ui/src/main/webapp/js/README create mode 100644 bow-ui/src/main/webapp/js/bowadd.js create mode 100644 bow-ui/src/main/webapp/js/bowpwd.js create mode 100644 bow-ui/src/main/webapp/js/sha256.js copy bow-ui/src/main/{resources/freemarker.properties => xmi/bow-model.properties} (91%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.