July 2015 - Bow-commits - mailman.cloud.codelutin.com

01/01: this commit fixes bug when we use alias to go to site, it don't increment count
by chorem.org scm 31 Jul '15

31 Jul '15

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 6b555479d47a8cf073368897271ba6f90d8c85e7 Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Sat Aug 1 00:13:19 2015 +0200 this commit fixes bug when we use alias to go to site, it don't increment count --- .../java/org/chorem/bow/action/AliasAction.java | 32 +++++++++++++++++----- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java b/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java index fef0d45..5272cff 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java @@ -23,6 +23,7 @@ package org.chorem.bow.action; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.bow.BookmarkUtils; import org.chorem.bow.BowBookmark; import org.chorem.bow.BowProxy; import org.chorem.bow.BowUser; @@ -81,24 +82,41 @@ public class AliasAction extends BowBaseAction { // with this hack, we can't count bookmark access via public alias WikittyQuery criteria = new WikittyQueryMaker() .select(BowBookmark.ELEMENT_FIELD_BOWBOOKMARK_LINK).where().or() - .ideq(alias) .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_PUBLICALIAS, alias) .end(); String link = proxy.findByQuery(criteria); if (link == null) { - // not id or public alias, looking for private if user is logged + // not public alias, looking for id or private if user is logged BowUser user = getBowSession().getUser(); if (user != null) { criteria = new WikittyQueryMaker().and() + .exteq(BowBookmark.EXT_BOWBOOKMARK) .eq(BowBookmark.FQ_FIELD_WIKITTYAUTHORISATION_OWNER, user.getWikittyId()) - .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_PRIVATEALIAS, alias) + .or() + .ideq(alias) + .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_PRIVATEALIAS, alias) .end(); BowBookmark bookmark = proxy.findByQuery(BowBookmark.class, criteria); - link = bookmark.getLink(); - int clicks = bookmark.getClick() + 1; - bookmark.setClick(clicks); - proxy.store(bookmark); + + if (bookmark == null) { + // not found in private alias of user, search into shared group + WikittyQueryMaker query = new WikittyQueryMaker().and(); + BookmarkUtils.addEqUser(query, user.getWikittyId()); + criteria = query.exteq(BowBookmark.EXT_BOWBOOKMARK) + .or() + .ideq(alias) + .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_PRIVATEALIAS, alias) + .end(); + bookmark = proxy.findByQuery(BowBookmark.class, criteria); + } + + if (bookmark != null) { + link = bookmark.getLink(); + int clicks = bookmark.getClick() + 1; + bookmark.setClick(clicks); + proxy.store(bookmark); + } } } if (link != null) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch develop updated (ffd0656 -> 6b55547)
by chorem.org scm 31 Jul '15

31 Jul '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from ffd0656 fixes #963: Rendre la recherche par tag insensible à la casse new 6b55547 this commit fixes bug when we use alias to go to site, it don't increment count The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6b555479d47a8cf073368897271ba6f90d8c85e7 Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Sat Aug 1 00:13:19 2015 +0200 this commit fixes bug when we use alias to go to site, it don't increment count Summary of changes: .../java/org/chorem/bow/action/AliasAction.java | 32 +++++++++++++++++----- 1 file changed, 25 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch develop updated (980ad7d -> ffd0656)
by chorem.org scm 31 Jul '15

31 Jul '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from 980ad7d - new BowAdd bookmarklet - add shell script to generate password as bookmarklet new ffd0656 fixes #963: Rendre la recherche par tag insensible à la casse The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ffd0656cd44ed4a119249dc940b53719d5bff21d Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Fri Jul 31 23:46:58 2015 +0200 fixes #963: Rendre la recherche par tag insensible à la casse Summary of changes: bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (540789a -> 980ad7d)
by chorem.org scm 31 Jul '15

31 Jul '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from 540789a fixes #233: Add support for login/password (change header jsp generation) (add minification css/js) new e73fa41 add shell script to compute password as same way that bookmarklet new 980ad7d - new BowAdd bookmarklet - add shell script to generate password as bookmarklet The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 980ad7d1853bf764a8eb820631980420d96ade70 Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Fri Jul 31 23:26:23 2015 +0200 - new BowAdd bookmarklet - add shell script to generate password as bookmarklet commit e73fa4105c785a395bd9bb3d170f27ac1948e388 Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Fri Jul 31 04:26:54 2015 +0200 add shell script to compute password as same way that bookmarklet Summary of changes: bow-ui/pom.xml | 20 +++++- bow-ui/src/main/java/org/chorem/bow/BowUtils.java | 75 +++++++++++++++++++--- bow-ui/src/main/resources/BowPwd.sh | 58 +++++++++++++++++ .../main/resources/i18n/bow-ui_en_GB.properties | 1 + .../main/resources/i18n/bow-ui_fr_FR.properties | 1 + bow-ui/src/main/webapp/WEB-INF/bowutils.tld | 12 ++++ bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp | 19 +++--- bow-ui/src/main/webapp/js/bowadd.js | 36 +++++++++++ bow-ui/src/main/webapp/js/bowpwd.js | 20 ++++++ 9 files changed, 224 insertions(+), 18 deletions(-) create mode 100755 bow-ui/src/main/resources/BowPwd.sh create mode 100644 bow-ui/src/main/webapp/js/bowadd.js -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

branch develop updated (c43a0f5 -> 540789a)
by chorem.org scm 31 Jul '15

31 Jul '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from c43a0f5 fixes #1270: the user must configure the atom stream to not receive its own links new 540789a fixes #233: Add support for login/password (change header jsp generation) (add minification css/js) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 540789ad4e35f5df72289f248aedb5bbd551b177 Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Fri Jul 31 03:54:30 2015 +0200 fixes #233: Add support for login/password (change header jsp generation) (add minification css/js) Summary of changes: bow-ui/pom.xml | 51 +++ bow-ui/src/main/java/org/chorem/bow/BowUtils.java | 27 ++ .../action/preference/PreferenceBaseAction.java | 30 +- ...Action.java => UpdateAuthenticationAction.java} | 42 ++- .../main/resources/i18n/bow-ui_en_GB.properties | 7 + .../main/resources/i18n/bow-ui_fr_FR.properties | 7 + bow-ui/src/main/resources/struts.xml | 5 + bow-ui/src/main/webapp/WEB-INF/bowutils.tld | 6 + bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp | 7 +- bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp | 3 - .../src/main/webapp/WEB-INF/jsp/editBookmark.jsp | 3 - 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 | 3 - bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp | 3 - bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp | 1 - bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp | 33 +- bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp | 1 - .../src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp | 3 - .../src/main/webapp/WEB-INF/jsp/sharedUserView.jsp | 6 +- bow-ui/src/main/webapp/js/bowpwd.js | 47 +++ bow-ui/src/main/webapp/js/sha256.js | 343 +++++++++++++++++++++ 23 files changed, 586 insertions(+), 49 deletions(-) copy bow-ui/src/main/java/org/chorem/bow/action/preference/{GenerateTokenAction.java => UpdateAuthenticationAction.java} (57%) create mode 100644 bow-ui/src/main/webapp/js/bowpwd.js create mode 100644 bow-ui/src/main/webapp/js/sha256.js -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (b36a9f5 -> c43a0f5)
by chorem.org scm 30 Jul '15

30 Jul '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from b36a9f5 add link to shared user to go home page new c43a0f5 fixes #1270: the user must configure the atom stream to not receive its own links The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c43a0f51e432a0e4515287d7ea66b6092be91ef7 Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Thu Jul 30 23:44:11 2015 +0200 fixes #1270: the user must configure the atom stream to not receive its own links Summary of changes: bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java | 6 +++++- bow-ui/src/main/java/org/chorem/bow/action/AtomAction.java | 13 ++++++++++++- .../bow/action/bookmark/DeleteSearchResultsAction.java | 2 +- .../java/org/chorem/bow/action/bookmark/HomeAction.java | 2 +- bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 1 + 5 files changed, 20 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (07d2743 -> b36a9f5)
by chorem.org scm 30 Jul '15

30 Jul '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from 07d2743 add markdown processor to process bookmark description (in safeMode) new 3ef8aca fixes #1274: add support for more complexe query for fulltext bookmark search new ab9fc2a add some FIXME and debug new b36a9f5 add link to shared user to go home page The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b36a9f5cbe929244eb13441a1d3d7d9e6a714528 Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Thu Jul 30 19:51:12 2015 +0200 add link to shared user to go home page commit ab9fc2ae635a12472129fa17ed5763e4c42e7aa8 Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Thu Jul 30 19:47:42 2015 +0200 add some FIXME and debug commit 3ef8aca24f735ffd53f27449ad7671bfbf70742e Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Thu Jul 30 19:46:39 2015 +0200 fixes #1274: add support for more complexe query for fulltext bookmark search Summary of changes: bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java | 14 +++++++++++++- .../java/org/chorem/bow/action/bookmark/HomeAction.java | 1 + .../java/org/chorem/bow/action/group/GroupEditAction.java | 6 ++++++ .../chorem/bow/action/sharedUser/SharedUserEditAction.java | 13 ++++--------- bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp | 6 ++++++ 5 files changed, 30 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

branch develop updated (684dfaa -> 07d2743)
by chorem.org scm 28 Jul '15

28 Jul '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from 684dfaa add support to share with user without bow login new 07d2743 add markdown processor to process bookmark description (in safeMode) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 07d2743f5d8d541284b1f37e853a562e68ee7782 Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Tue Jul 28 16:41:38 2015 +0200 add markdown processor to process bookmark description (in safeMode) Summary of changes: bow-ui/pom.xml | 6 ++++++ bow-ui/src/main/java/org/chorem/bow/BowUtils.java | 13 +++++++++++++ bow-ui/src/main/webapp/WEB-INF/bowutils.tld | 6 ++++++ bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp | 2 +- bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp | 6 +++--- bow-ui/src/main/webapp/css/bookmark.css | 13 ++++++++++++- pom.xml | 7 ++++++- 7 files changed, 47 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (b8a901b -> 684dfaa)
by chorem.org scm 28 Jul '15

28 Jul '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from 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 :( new 684dfaa add support to share with user without bow login The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 684dfaa732914a32f3ee689508c84530f06c3223 Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Tue Jul 28 03:13:32 2015 +0200 add support to share with user without bow login Summary of changes: bow-ui/src/main/java/org/chorem/bow/BowConfig.java | 1 + bow-ui/src/main/java/org/chorem/bow/BowUtils.java | 19 +++ .../java/org/chorem/bow/action/AtomAction.java | 4 +- .../bow/action/bookmark/AddOrUpdateAction.java | 61 ++++++++- .../org/chorem/bow/action/bookmark/EditAction.java | 11 ++ .../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 +- .../action/sharedUser/SharedUserEditAction.java | 148 +++++++++++++++++++++ .../SharedUserViewAction.java} | 29 ++-- .../main/resources/i18n/bow-ui_en_GB.properties | 7 + .../main/resources/i18n/bow-ui_fr_FR.properties | 7 + bow-ui/src/main/resources/struts.xml | 20 +++ .../src/main/webapp/WEB-INF/jsp/editBookmark.jsp | 1 + bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp | 51 +++---- .../src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp | 62 +++++++++ .../jsp/{groupView.jsp => sharedUserView.jsp} | 34 +++-- bow-ui/src/main/webapp/js/README | 36 +++++ bow-ui/src/main/xmi/README | 30 ++++- bow-ui/src/main/xmi/bow-model.properties | 2 + bow-ui/src/main/xmi/bow-model.zargo | Bin 10532 -> 11957 bytes 23 files changed, 468 insertions(+), 72 deletions(-) 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 100644 bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserEdit.jsp copy bow-ui/src/main/webapp/WEB-INF/jsp/{groupView.jsp => sharedUserView.jsp} (54%) create mode 100644 bow-ui/src/main/webapp/js/README create mode 100644 bow-ui/src/main/xmi/bow-model.properties -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (a064cf7 -> b8a901b)
by chorem.org scm 22 Jul '15

22 Jul '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from a064cf7 add author email if login is an email new 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 :( The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b8a901bd08317dd5d17ccd97c919bb1fec6a3d4e Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Wed Jul 22 14:39:04 2015 +0200 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 :( Summary of changes: bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1