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

r303 - trunk/bow-ui/src/main/java/org/chorem/bow
by bpoussin＠users.chorem.org 13 Aug '11

13 Aug '11

Author: bpoussin Date: 2011-08-13 03:00:21 +0200 (Sat, 13 Aug 2011) New Revision: 303 Url: http://chorem.org/repositories/revision/bow/303 Log: Anomalie #431: Bad sort order for last added bookmark Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowInit.java Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowInit.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BowInit.java 2011-08-04 09:52:39 UTC (rev 302) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowInit.java 2011-08-13 01:00:21 UTC (rev 303) @@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletRequest; import java.util.List; +import org.nuiton.wikitty.search.Search; public class BowInit { @@ -107,12 +108,12 @@ Criteria criteria = BookmarkUtils.getBookmarkListCriteriaByUser(user, null); if (criteria != null) { - Criteria sortCriteria = - criteria.addSortDescending(BowBookmark.FQ_FIELD_BOWBOOKMARK_CLICK) + Criteria sortCriteria = Search.query(criteria).criteria() + .addSortDescending(BowBookmark.FQ_FIELD_BOWBOOKMARK_CLICK) .setEndIndex(MAX_ELEMENT_NUMBER); PagedResult<BowBookmark> result = proxy.findAllByCriteria(BowBookmark.class, sortCriteria); //Selects all bookmarks by user - sortCriteria = - criteria.addSortDescending(BowBookmark.FQ_FIELD_BOWBOOKMARK_CREATIONDATE) + sortCriteria =Search.query(criteria).criteria() + .addSortDescending(BowBookmark.FQ_FIELD_BOWBOOKMARK_CREATIONDATE) .setEndIndex(MAX_ELEMENT_NUMBER); List<BowBookmark> lastBookmarks = proxy.findAllByCriteria(BowBookmark.class, sortCriteria).getAll();

1 0

r302 - trunk
by tchemit＠users.chorem.org 04 Aug '11

04 Aug '11

Author: tchemit Date: 2011-08-04 11:52:39 +0200 (Thu, 04 Aug 2011) New Revision: 302 Url: http://chorem.org/repositories/revision/bow/302 Log: Update mavenpom4redmine to 3.0. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-20 15:22:50 UTC (rev 301) +++ trunk/pom.xml 2011-08-04 09:52:39 UTC (rev 302) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.5.5</version> + <version>3.0</version> </parent> <groupId>org.chorem</groupId>

1 0

r301 - in trunk/bow-ui/src/main/webapp: css jsp jsp/inc
by kmorin＠users.chorem.org 20 Jun '11

20 Jun '11

Author: kmorin Date: 2011-06-20 17:22:50 +0200 (Mon, 20 Jun 2011) New Revision: 301 Url: http://chorem.org/repositories/revision/bow/301 Log: Anomalie #372 : Tags are not separted by space Anomalie #262 : Site color Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp trunk/bow-ui/src/main/webapp/jsp/preferences.jsp Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-06-20 15:13:56 UTC (rev 300) +++ trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-06-20 15:22:50 UTC (rev 301) @@ -180,6 +180,11 @@ margin-bottom:-70px; } +.bookmark .description .tags .tag{ + margin-right:5px; + text-decoration:none; +} + .bookmark .click{ background:transparent url('../img/click.jpg') no-repeat scroll 0 0; float:right; Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-06-20 15:13:56 UTC (rev 300) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-06-20 15:22:50 UTC (rev 301) @@ -128,7 +128,7 @@ <s:url var="search" action="search"> <s:param name="searchLine"><s:property /></s:param> </s:url> - <s:a href="%{search}" cssStyle="text-decoration:none"><s:property /></s:a> + <s:a href="%{search}" cssClass="tag"><s:property /></s:a> </s:iterator> </p> </div> Modified: trunk/bow-ui/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-06-20 15:13:56 UTC (rev 300) +++ trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-06-20 15:22:50 UTC (rev 301) @@ -111,9 +111,6 @@ <h3><s:text name="bow.preferences.siteLook"/></h3> <br/> <s:form action="preferences" theme="simple"> - <s:text name="bow.preferences.colors"/><br/> - <s:textfield name="colors" labelposition="top"/><br/> - <s:text name="bow.preferences.tagsNb"/><br/> <s:textfield name="tagsNb" labelposition="top"/><br/>

1 0

r300 - trunk/bow-extension-chromium/src/main/webapp
by kmorin＠users.chorem.org 20 Jun '11

20 Jun '11

Author: kmorin Date: 2011-06-20 17:13:56 +0200 (Mon, 20 Jun 2011) New Revision: 300 Url: http://chorem.org/repositories/revision/bow/300 Log: Anomalie #406 : Wrong website link on extension information --> link removed Modified: trunk/bow-extension-chromium/src/main/webapp/manifest.json Modified: trunk/bow-extension-chromium/src/main/webapp/manifest.json =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/manifest.json 2011-06-17 16:01:31 UTC (rev 299) +++ trunk/bow-extension-chromium/src/main/webapp/manifest.json 2011-06-20 15:13:56 UTC (rev 300) @@ -39,7 +39,6 @@ "background_page": "background.html", "options_page": "options.html", - "homepage_url": "http://www.codelutin.com", "permissions": [ "tabs", "http://*/*", "https://*/*" ]

1 0

r299 - trunk/bow-extension-chromium/src/main/webapp
by kmorin＠users.chorem.org 17 Jun '11

17 Jun '11

Author: kmorin Date: 2011-06-17 18:01:31 +0200 (Fri, 17 Jun 2011) New Revision: 299 Url: http://chorem.org/repositories/revision/bow/299 Log: - add permissions for all websites - close popup when the request returns an answer Modified: trunk/bow-extension-chromium/src/main/webapp/manifest.json trunk/bow-extension-chromium/src/main/webapp/popup.html Modified: trunk/bow-extension-chromium/src/main/webapp/manifest.json =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/manifest.json 2011-06-07 20:10:20 UTC (rev 298) +++ trunk/bow-extension-chromium/src/main/webapp/manifest.json 2011-06-17 16:01:31 UTC (rev 299) @@ -41,6 +41,6 @@ "options_page": "options.html", "homepage_url": "http://www.codelutin.com", "permissions": [ - "tabs", "http://*" + "tabs", "http://*/*", "https://*/*" ] } Modified: trunk/bow-extension-chromium/src/main/webapp/popup.html =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/popup.html 2011-06-07 20:10:20 UTC (rev 298) +++ trunk/bow-extension-chromium/src/main/webapp/popup.html 2011-06-17 16:01:31 UTC (rev 299) @@ -61,9 +61,14 @@ var xhr = new XMLHttpRequest(); xhr.open("GET", link, true); + xhr.onreadystatechange = function() { + if (xhr.readyState == 4) { + close(); + self.close(); + } + }; xhr.send(); - close(); - self.close(); + } function init() {

1 0

r298 - trunk
by tchemit＠users.chorem.org 07 Jun '11

07 Jun '11

Author: tchemit Date: 2011-06-07 22:10:20 +0200 (Tue, 07 Jun 2011) New Revision: 298 Url: http://chorem.org/repositories/revision/bow/298 Log: Update mavenpom4redmine to 2.5.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-30 12:40:42 UTC (rev 297) +++ trunk/pom.xml 2011-06-07 20:10:20 UTC (rev 298) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.5.4</version> + <version>2.5.5</version> </parent> <groupId>org.chorem</groupId>

1 0

r297 - trunk/bow-ui/src/main/webapp/jsp/inc
by echatellier＠users.chorem.org 30 May '11

30 May '11

Author: echatellier Date: 2011-05-30 14:40:42 +0200 (Mon, 30 May 2011) New Revision: 297 Url: http://chorem.org/repositories/revision/bow/297 Log: Fix redmine download links Modified: trunk/bow-ui/src/main/webapp/jsp/inc/footer.jsp Modified: trunk/bow-ui/src/main/webapp/jsp/inc/footer.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/footer.jsp 2011-05-27 12:06:31 UTC (rev 296) +++ trunk/bow-ui/src/main/webapp/jsp/inc/footer.jsp 2011-05-30 12:40:42 UTC (rev 297) @@ -29,7 +29,7 @@ xmlns:jsp="http://java.sun.com/JSP/Page"> <p> <a shape="rect" href="http://www.chorem.org/projects/show/bow">bow</a> - <a shape="rect" href="http://www.chorem.org/projects/list_files/bow"></a> - + <a shape="rect" href="http://www.chorem.org/projects/bow/files"></a> - <a shape="rect" href="http://www.gnu.org/licenses/agpl.html"><s:text name="bow.footer.license" /></a> - <span title="Copyright">©2011</span> <a shape="rect" href="http://www.codelutin.com">Code Lutin</a> - @@ -44,4 +44,4 @@ <s:a href="%{localeEN}"><s:text name="bow.action.locale.english" /></s:a> - <s:a href="%{localeFR}"><s:text name="bow.action.locale.french" /></s:a> </p> -</div> \ No newline at end of file +</div>

1 0

r296 - trunk/bow-ui/src/main/webapp/WEB-INF
by echatellier＠users.chorem.org 27 May '11

27 May '11

Author: echatellier Date: 2011-05-27 14:06:31 +0200 (Fri, 27 May 2011) New Revision: 296 Url: http://chorem.org/repositories/revision/bow/296 Log: Update web-app version Modified: trunk/bow-ui/src/main/webapp/WEB-INF/web.xml Modified: trunk/bow-ui/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/web.xml 2011-05-18 10:22:45 UTC (rev 295) +++ trunk/bow-ui/src/main/webapp/WEB-INF/web.xml 2011-05-27 12:06:31 UTC (rev 296) @@ -23,9 +23,10 @@ #L% --> -<web-app id="bow" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> <display-name>Bow</display-name>

1 0

r295 - in trunk: . bow-ui/src src
by echatellier＠users.chorem.org 18 May '11

18 May '11

Author: echatellier Date: 2011-05-18 12:22:45 +0200 (Wed, 18 May 2011) New Revision: 295 Url: http://chorem.org/repositories/revision/bow/295 Log: Move maven site to project root Added: trunk/src/ trunk/src/site/ Removed: trunk/bow-ui/src/site/

1 0

r294 - in trunk: . bow-extension-chromium bow-ui
by sletellier＠users.chorem.org 17 May '11

17 May '11

Author: sletellier Date: 2011-05-17 17:15:35 +0200 (Tue, 17 May 2011) New Revision: 294 Url: http://chorem.org/repositories/revision/bow/294 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/bow-extension-chromium/pom.xml trunk/bow-ui/pom.xml trunk/pom.xml Modified: trunk/bow-extension-chromium/pom.xml =================================================================== --- trunk/bow-extension-chromium/pom.xml 2011-05-17 15:15:34 UTC (rev 293) +++ trunk/bow-extension-chromium/pom.xml 2011-05-17 15:15:35 UTC (rev 294) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.0</version> + <version>1.1-SNAPSHOT</version> </parent> <artifactId>bow-extension-chromium</artifactId> Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2011-05-17 15:15:34 UTC (rev 293) +++ trunk/bow-ui/pom.xml 2011-05-17 15:15:35 UTC (rev 294) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.0</version> + <version>1.1-SNAPSHOT</version> </parent> <artifactId>bow-ui</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-17 15:15:34 UTC (rev 293) +++ trunk/pom.xml 2011-05-17 15:15:35 UTC (rev 294) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.0</version> + <version>1.1-SNAPSHOT</version> <modules> <module>bow-extension-chromium</module> @@ -108,11 +108,11 @@ </contributors> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/bow/tags/bow-1.0</connection> + <connection>scm:svn:http://svn.chorem.org/svn/bow/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/bow/tags/bow-1.0 + scm:svn:http://svn.chorem.org/svn/bow/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/bow/tags/bow-1.0</url> + <url>http://www.chorem.org/repositories/browse/bow/trunk</url> </scm> <properties>

1 0