branch develop updated (8f9251c -> f50a2ce)
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 8f9251c add icon before script(let) link default password length to 15 new 96069df add all missing translation for UI new e8c3260 use last wikitty version to use wikitty service authorisation with null if no access new 5f3fc79 add support for more than one BowAuthentication for one Bookmark (need when bookmark is shared) new 9beee43 add small documentation in UI new c5b884e remove problematic field with struts and multiple setter new 5b06dcb use entity to < char new f50a2ce remove log.info use to debug The 7 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 f50a2ce440f8e42c67cf0e639bdac2481b9a2f9d Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 16:35:33 2015 +0200 remove log.info use to debug commit 5b06dcb1bc7538f7b9de35258e7ba1734ab46863 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 16:35:17 2015 +0200 use entity to < char commit c5b884ec190adaac71ae18542483f5e1e83637c7 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 16:30:45 2015 +0200 remove problematic field with struts and multiple setter commit 9beee43a9a8bf002b304d8c00d6bfa1acf5cba9e Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 16:30:23 2015 +0200 add small documentation in UI commit 5f3fc79c850147985828c748dde7bed5ce918d21 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 16:28:30 2015 +0200 add support for more than one BowAuthentication for one Bookmark (need when bookmark is shared) commit e8c32606e1fd1b4982356d6aceb5f81d7055b476 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 16:27:21 2015 +0200 use last wikitty version to use wikitty service authorisation with null if no access commit 96069df0679f5b9aa78ed62e1362a6749aaf96e2 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 16:26:37 2015 +0200 add all missing translation for UI Summary of changes: .../main/java/org/chorem/bow/BowSearchResult.java | 17 +++++--- .../action/bookmark/AuthenticationEditAction.java | 3 -- .../org/chorem/bow/action/bookmark/HomeAction.java | 2 +- bow-ui/src/main/resources/bow.properties | 2 +- .../main/resources/i18n/bow-ui_en_GB.properties | 49 ++++++++++------------ .../main/resources/i18n/bow-ui_fr_FR.properties | 49 ++++++++++------------ .../main/webapp/WEB-INF/jsp/authenticationEdit.jsp | 5 ++- bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp | 39 +++++++++-------- .../src/main/webapp/WEB-INF/jsp/sharedUserView.jsp | 1 + pom.xml | 4 +- 11 files changed, 85 insertions(+), 88 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 96069df0679f5b9aa78ed62e1362a6749aaf96e2 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 16:26:37 2015 +0200 add all missing translation for UI --- .../main/resources/i18n/bow-ui_en_GB.properties | 49 ++++++++++------------ .../main/resources/i18n/bow-ui_fr_FR.properties | 49 ++++++++++------------ 2 files changed, 44 insertions(+), 54 deletions(-) diff --git a/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties b/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties index 5ecbd82..d1a13de 100644 --- a/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties +++ b/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties @@ -12,20 +12,21 @@ bow.admin.panel=Admin panel bow.admin.reIndexationDone=Data reindexed successfully bow.alias.already.exists=The alias {0} already exists bow.alias.bookmarkId.unknown=There is no bookmark with id {0} -bow.authenticationEdit.delete= -bow.authenticationEdit.description= -bow.authenticationEdit.domain= -bow.authenticationEdit.exclude= -bow.authenticationEdit.form= -bow.authenticationEdit.include= -bow.authenticationEdit.login= -bow.authenticationEdit.maxLength= -bow.authenticationEdit.prefix= -bow.authenticationEdit.save= -bow.authenticationEdit.shareSecurity= -bow.authenticationEdit.suffix= -bow.authenticationEdit.title= +bow.authenticationEdit.delete=Delete +bow.authenticationEdit.description=Description +bow.authenticationEdit.domain=Domain +bow.authenticationEdit.exclude=Excluding chars +bow.authenticationEdit.form=Authentication form +bow.authenticationEdit.include=Inluding chars +bow.authenticationEdit.login=Login +bow.authenticationEdit.maxLength=Maximum length +bow.authenticationEdit.prefix=String to add before password computation +bow.authenticationEdit.save=Save +bow.authenticationEdit.shareSecurity=Sharing\: same as bookmark +bow.authenticationEdit.suffix=String to add after password computation +bow.authenticationEdit.title=Authentication parameter bow.bookmark.add.successful=Bookmark successfully added +bow.bookmark.authentication=Authentication bow.bookmark.badFileFormat=Bad bookmarks file format \: unsuccessful import (expected Netscape-like bookmarks file) bow.bookmark.description=Description bow.bookmark.favicon.updated.successful=Update favicon successful @@ -105,15 +106,8 @@ bow.permanent.link.search=Permanent search URL bow.permanent.link.searchDescription=Permalink to use Bow as search engine in your browser bow.permanent.link.suggestion=Permanent suggest URL bow.permanent.link.suggestionDescription=Permalink to use Bow as suggest engine in your browser -bow.preference.authentication.exclude= -bow.preference.authentication.include= -bow.preference.authentication.login= -bow.preference.authentication.maxLength= -bow.preference.authentication.maxlength= bow.preference.opensearch.prefix.separator=OpenSeach prefix separator bow.preferences.authentication= -bow.preferences.authentication.prefix= -bow.preferences.authentication.suffix= bow.preferences.badCurrentPassword=Your current password is incorrect bow.preferences.bookmarksHomePage=Number of bookmarks displayed on the home page bow.preferences.colors=Site color @@ -204,13 +198,14 @@ bow.search.orderby=Order by bow.search.results.deleted=Search results deleted successfully bow.search.submit=Search bow.search.title=Search -bow.sharedUser.new= -bow.sharedUserEdit.delete= -bow.sharedUserEdit.description= -bow.sharedUserEdit.name= -bow.sharedUserEdit.save= -bow.sharedUserEdit.title= -bow.sharedUserView.title= +bow.sharedUser.new=New shared user +bow.sharedUserEdit.delete=Delete +bow.sharedUserEdit.description=Description +bow.sharedUserEdit.name=Name +bow.sharedUserEdit.save=Save +bow.sharedUserEdit.title=Shared user edition +bow.sharedUserView.documentation=Add to tag '\# <user name>' for this user to access the bookmark with this tag +bow.sharedUserView.title=Your shared user bow.temporary.link.search=Temporary search URL bow.temporary.link.searchDescription=Temporary link (session) to use Bow as search engine in your browser bow.temporary.link.suggestion=Temporary suggest URL diff --git a/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties b/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties index a20ba20..a194a76 100644 --- a/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties +++ b/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties @@ -12,20 +12,21 @@ bow.admin.panel=Panneau d''administration bow.admin.reIndexationDone=Les données ont bien été réindexées (et migration si nécessaire) bow.alias.already.exists=L''alias {0} existe déjà bow.alias.bookmarkId.unknown=Il n''y a pas de marque-page correspondant à l''identifiant {0} -bow.authenticationEdit.delete= -bow.authenticationEdit.description= -bow.authenticationEdit.domain= -bow.authenticationEdit.exclude= -bow.authenticationEdit.form= -bow.authenticationEdit.include= -bow.authenticationEdit.login= -bow.authenticationEdit.maxLength= -bow.authenticationEdit.prefix= -bow.authenticationEdit.save= -bow.authenticationEdit.shareSecurity= -bow.authenticationEdit.suffix= -bow.authenticationEdit.title= +bow.authenticationEdit.delete=Supprimer +bow.authenticationEdit.description=Description +bow.authenticationEdit.domain=Domaine +bow.authenticationEdit.exclude=Caractères refusé (ex\: /\=+) +bow.authenticationEdit.form=Formulaire d'authentification +bow.authenticationEdit.include=Caractères acceptés (ex\: A-Z0-9) +bow.authenticationEdit.login=Login +bow.authenticationEdit.maxLength=Longueur maximum du mot de passe (hors suffixe) +bow.authenticationEdit.prefix=Préfix ajouté au super mot de passe avant le calcul +bow.authenticationEdit.save=Sauver +bow.authenticationEdit.shareSecurity=Partage\: identique au bookmark +bow.authenticationEdit.suffix=Suffix à ajouter au mot de passe final +bow.authenticationEdit.title=Paramètrage d'authentification bow.bookmark.add.successful=Marque-page ajouté avec succès +bow.bookmark.authentication=Authentification bow.bookmark.badFileFormat=Mauvais format de fichier de favoris \: import impossible (le format de type Netscape n'est pas supporté) bow.bookmark.description=Description bow.bookmark.favicon.updated.successful=Mise à jour du favicon réussi @@ -105,15 +106,8 @@ bow.permanent.link.search=URL de recherche permanente bow.permanent.link.searchDescription=Lien permanent pour utiliser Bow comme moteur de recherche dans votre navigateur bow.permanent.link.suggestion=URL de suggesion permanente bow.permanent.link.suggestionDescription=Lien permanent pour utiliser Bow comme moteur de suggestion dans votre navigateur -bow.preference.authentication.exclude= -bow.preference.authentication.include= -bow.preference.authentication.login= -bow.preference.authentication.maxLength= -bow.preference.authentication.maxlength= bow.preference.opensearch.prefix.separator=Separateur de préfix bow.preferences.authentication= -bow.preferences.authentication.prefix= -bow.preferences.authentication.suffix= bow.preferences.badCurrentPassword=Votre mot de passe actuel est incorrect bow.preferences.bookmarksHomePage=Nombre de marque-pages affichés bow.preferences.colors=Couleur du site @@ -204,13 +198,14 @@ bow.search.orderby=Trier par bow.search.results.deleted=Les résultats de la recherche ont été supprimés avec succès bow.search.submit=Rechercher bow.search.title=Recherche -bow.sharedUser.new= -bow.sharedUserEdit.delete= -bow.sharedUserEdit.description= -bow.sharedUserEdit.name= -bow.sharedUserEdit.save= -bow.sharedUserEdit.title= -bow.sharedUserView.title= +bow.sharedUser.new=Créer un nouvel utilisateur de partage +bow.sharedUserEdit.delete=Supprimer +bow.sharedUserEdit.description=Description +bow.sharedUserEdit.name=Nom +bow.sharedUserEdit.save=Save +bow.sharedUserEdit.title=Edition d'un utilisateur de partage +bow.sharedUserView.documentation=Ajouter au tag '\#<nom de l'utilisateur>' pour que cet utilisateur puisse accéder au bookmark ayant ce tag +bow.sharedUserView.title=Tous vos utilisateurs de partage bow.temporary.link.search=URL de recherche temporaire bow.temporary.link.searchDescription=Lien temporaire (le temps de la session) pour utiliser Bow comme moteur de recherche dans votre navigateur bow.temporary.link.suggestion=URL de suggesion temporaire -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 e8c32606e1fd1b4982356d6aceb5f81d7055b476 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 16:27:21 2015 +0200 use last wikitty version to use wikitty service authorisation with null if no access --- bow-ui/src/main/resources/bow.properties | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bow-ui/src/main/resources/bow.properties b/bow-ui/src/main/resources/bow.properties index de4b911..20e8f95 100644 --- a/bow-ui/src/main/resources/bow.properties +++ b/bow-ui/src/main/resources/bow.properties @@ -42,7 +42,7 @@ wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStor org.nuiton.wikitty.services.WikittyServiceNotifier,\ org.nuiton.wikitty.services.WikittyServiceCached,\ org.nuiton.wikitty.services.WikittyServiceAuthentication,\ -org.nuiton.wikitty.services.WikittyServiceAuthorisation +org.nuiton.wikitty.services.WikittyServiceAuthorisationReadNullify wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr diff --git a/pom.xml b/pom.xml index bbf36ed..aaa0f9e 100644 --- a/pom.xml +++ b/pom.xml @@ -117,9 +117,9 @@ <nuitonConfigVersion>3.0-rc-2</nuitonConfigVersion> <nuitonWebVersion>1.17</nuitonWebVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> - <wikittyVersion>3.12.1</wikittyVersion> + <wikittyVersion>3.13-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> - <struts2Version>2.3.16.3</struts2Version> + <struts2Version>2.3.24</struts2Version> <struts2jqueryVersion>3.7.1</struts2jqueryVersion> <htmlParserVersion>1.6</htmlParserVersion> <javaxMailVersion>1.4.3</javaxMailVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 5f3fc79c850147985828c748dde7bed5ce918d21 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 16:28:30 2015 +0200 add support for more than one BowAuthentication for one Bookmark (need when bookmark is shared) --- .../main/java/org/chorem/bow/BowSearchResult.java | 17 +++++++--- .../org/chorem/bow/action/bookmark/HomeAction.java | 2 +- bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp | 39 +++++++++++----------- 4 files changed, 33 insertions(+), 27 deletions(-) diff --git a/bow-ui/src/main/java/org/chorem/bow/BowSearchResult.java b/bow-ui/src/main/java/org/chorem/bow/BowSearchResult.java index 2ddfe5e..cc77710 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BowSearchResult.java +++ b/bow-ui/src/main/java/org/chorem/bow/BowSearchResult.java @@ -55,7 +55,7 @@ public class BowSearchResult { protected List<BowBookmark> bookmarks; - protected Map<String, BowAuthentication> authMap; + protected Map<String, List<BowAuthentication>> authMap; protected List<FacetTopic> tagsCloud; @@ -81,9 +81,16 @@ public class BowSearchResult { setBookmarks(result.getAll()); - authMap = new HashMap<String, BowAuthentication>(); + authMap = new HashMap<String, List<BowAuthentication>>(); for (BowAuthentication auth : auths) { - authMap.put(auth.getTarget(), auth); + if (auth != null) { + String targetId = auth.getTarget(); + List<BowAuthentication> authList = authMap.get(targetId); + if (authList == null) { + authMap.put(targetId, authList = new ArrayList<BowAuthentication>()); + } + authList.add(auth); + } } List<FacetTopic> topics = result.getTopic(BowBookmark.FQ_FIELD_WIKITTYLABEL_LABELS); @@ -149,11 +156,11 @@ public class BowSearchResult { return bookmarks; } - public BowAuthentication getAuthentication(String id) { + public List<BowAuthentication> getAuthentication(String id) { return authMap.get(id); } - public BowAuthentication getAuthentication(BowBookmark bookmark) { + public List<BowAuthentication> getAuthentication(BowBookmark bookmark) { return getAuthentication(bookmark.getWikittyId()); } diff --git a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/HomeAction.java b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/HomeAction.java index 32a6089..7402d60 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/HomeAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/HomeAction.java @@ -109,7 +109,7 @@ public class HomeAction extends BowBaseAction { proxy.findAllByQuery(BowAuthentication.class, criteria); log.debug("******** query was: " + result.getQueryString()); - log.info("******** auths query was: " + auths.getQueryString()); + log.debug("******** auths query was: " + auths.getQueryString()); searchResult = new BowSearchResult(result, auths, tagLine); } diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp index 2188574..db4b961 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp @@ -79,7 +79,7 @@ <s:else> <s:iterator value="searchResult.bookmarks" var="bookmark"> <s:set name="bookmark" value="bookmark"/> - <s:set name="auth" value="searchResult.getAuthentication(#bookmark)"/> + <s:set name="auths" value="searchResult.getAuthentication(#bookmark)"/> <jsp:include page="inc/bookmark.jsp" flush="true"/> </s:iterator> </s:else> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp index a0dd242..248cc28 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp @@ -56,14 +56,6 @@ </s:a> </s:if> </span> - <s:if test="#auth != null"> - <span class="left"> - <a class="scriptlet" href="${u:scriptletPassword(auth)}">BowPwd${bookmark.privateAlias}</a> - </span> - <span class="left"> - <a class="script" href="${u:scriptPassword(auth)}" download="BowPwd${bookmark.privateAlias}.sh">BowPwd${bookmark.privateAlias}.sh</a> - </span> - </s:if> <span class="spacemax"></span> <span class="right"> <s:url var="screenshotBookmark" action="screenshotBookmark" escapeAmp="true"> @@ -129,19 +121,26 @@ <div class="markdown"> ${u:toHtml(bookmark.description)} </div> - <s:if test="#auth != null"> - <h3><s:text name="bow.bookmark.authentication" /> :</h3> - <s:if test="!#auth.description.empty"> - <div class="markdown"> - ${u:toHtml(auth.description)} - </div> + <s:iterator value="#auths" var="auth"> + <s:set name="auth" value="auth"/> + <s:if test="#auth != null"> + <h3> + <s:text name="bow.bookmark.authentication" /> : + <a class="scriptlet" href="${u:scriptletPassword(auth)}">BowPwd${bookmark.privateAlias}</a> + <a class="script" href="${u:scriptPassword(auth)}" download="BowPwd${bookmark.privateAlias}.sh">BowPwd${bookmark.privateAlias}.sh</a> + </h3> + <s:if test="!#auth.description.empty"> + <div class="markdown"> + ${u:toHtml(auth.description)} + </div> + </s:if> + <s:if test="!#auth.form.empty"> + <div class="markdown"> + ${u:toHtml(auth.form)} + </div> + </s:if> </s:if> - <s:if test="!#auth.form.empty"> - <div class="markdown"> - ${u:toHtml(auth.form)} - </div> - </s:if> - </s:if> + </s:iterator> <p class="tags"> <strong><s:text name="bow.bookmark.tags" /> :</strong> <s:iterator value="#bookmark.labels" var="tag"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 9beee43a9a8bf002b304d8c00d6bfa1acf5cba9e Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 16:30:23 2015 +0200 add small documentation in UI --- bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp index 507d4da..bc4eec3 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/sharedUserView.jsp @@ -39,6 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. </div> <s:actionerror/> <div class="formFrame fond"> + <div class="documentation"><s:text name="bow.sharedUserView.documentation"/></div> <s:a action="sharedUserEdit"><s:text name="bow.sharedUser.new" /></s:a> <ul> <s:iterator value="sharedUsers" var="sharedUser"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 c5b884ec190adaac71ae18542483f5e1e83637c7 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 16:30:45 2015 +0200 remove problematic field with struts and multiple setter --- bow-ui/src/main/webapp/WEB-INF/jsp/authenticationEdit.jsp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/authenticationEdit.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/authenticationEdit.jsp index 7d4c6dc..5200c5e 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/authenticationEdit.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/authenticationEdit.jsp @@ -41,8 +41,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <s:hidden name="tagLine" /> <s:hidden name="fullTextLine" /> <s:hidden name="bookmarkId"/> + <%-- struts2/ognl problem, try to use setter with wikitty argument + and not setter with String argument :( + fortunately we don't need it any more <s:hidden name="authentication.target"/> - + --%> <s:checkbox key="bow.authenticationEdit.shareSecurity" labelposition="left" labelSeparator=" " name="shareSecurity" /> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 5b06dcb1bc7538f7b9de35258e7ba1734ab46863 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 16:35:17 2015 +0200 use entity to < char --- bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties | 2 +- bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties b/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties index d1a13de..a3f0a97 100644 --- a/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties +++ b/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties @@ -204,7 +204,7 @@ bow.sharedUserEdit.description=Description bow.sharedUserEdit.name=Name bow.sharedUserEdit.save=Save bow.sharedUserEdit.title=Shared user edition -bow.sharedUserView.documentation=Add to tag '\# <user name>' for this user to access the bookmark with this tag +bow.sharedUserView.documentation=Add tag '\#<user name>' for this user to access the bookmark with this tag bow.sharedUserView.title=Your shared user bow.temporary.link.search=Temporary search URL bow.temporary.link.searchDescription=Temporary link (session) to use Bow as search engine in your browser diff --git a/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties b/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties index a194a76..c20926c 100644 --- a/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties +++ b/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties @@ -204,7 +204,7 @@ bow.sharedUserEdit.description=Description bow.sharedUserEdit.name=Nom bow.sharedUserEdit.save=Save bow.sharedUserEdit.title=Edition d'un utilisateur de partage -bow.sharedUserView.documentation=Ajouter au tag '\#<nom de l'utilisateur>' pour que cet utilisateur puisse accéder au bookmark ayant ce tag +bow.sharedUserView.documentation=Ajouter le tag '\#<nom de l'utilisateur>' pour que cet utilisateur puisse accéder au bookmark ayant ce tag bow.sharedUserView.title=Tous vos utilisateurs de partage bow.temporary.link.search=URL de recherche temporaire bow.temporary.link.searchDescription=Lien temporaire (le temps de la session) pour utiliser Bow comme moteur de recherche dans votre navigateur -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 f50a2ce440f8e42c67cf0e639bdac2481b9a2f9d Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 16:35:33 2015 +0200 remove log.info use to debug --- .../java/org/chorem/bow/action/bookmark/AuthenticationEditAction.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/AuthenticationEditAction.java b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/AuthenticationEditAction.java index fbe3147..1cea0d5 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/AuthenticationEditAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/AuthenticationEditAction.java @@ -75,7 +75,6 @@ public class AuthenticationEditAction extends BowBaseAction { public BowAuthentication getAuthentication() { if (authentication == null) { authentication = getBowSession().getAuthentication(bookmarkId); - log.info("authentication loaded " + authentication); if (log.isDebugEnabled()) { log.debug("authentication loaded " + authentication); } @@ -88,7 +87,6 @@ public class AuthenticationEditAction extends BowBaseAction { } public String save() throws Exception { - log.info("authentication save " + authentication); if (log.isDebugEnabled()) { log.debug("authentication save " + authentication); } @@ -107,7 +105,6 @@ public class AuthenticationEditAction extends BowBaseAction { } public String delete() throws Exception { - log.info("authentication delete " + authentication); if (log.isDebugEnabled()) { log.debug("authentication delete " + authentication); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm