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

r273 - trunk/bow-ui/src/main/java/org/chorem/bow/action
by bpoussin＠users.chorem.org 28 Apr '11

28 Apr '11

Author: bpoussin Date: 2011-04-28 12:44:13 +0200 (Thu, 28 Apr 2011) New Revision: 273 Url: http://chorem.org/repositories/revision/bow/273 Log: les zones de recherche par defaut sont vide et non pas 'null' Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-04-27 08:56:17 UTC (rev 272) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-04-28 10:44:13 UTC (rev 273) @@ -52,8 +52,8 @@ protected String tags; protected String nameAndTags; protected String redirectTo; - protected String searchLine; - protected String fullTextLine; + protected String searchLine = ""; + protected String fullTextLine = ""; public String getBookmarkId() { return bookmarkId;

1 0

r272 - in trunk: . bow-extension-chromium bow-ui
by sletellier＠users.chorem.org 27 Apr '11

27 Apr '11

Author: sletellier Date: 2011-04-27 10:56:17 +0200 (Wed, 27 Apr 2011) New Revision: 272 Url: http://chorem.org/repositories/revision/bow/272 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-04-27 08:56:16 UTC (rev 271) +++ trunk/bow-extension-chromium/pom.xml 2011-04-27 08:56:17 UTC (rev 272) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> </parent> <artifactId>bow-extension-chromium</artifactId> Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2011-04-27 08:56:16 UTC (rev 271) +++ trunk/bow-ui/pom.xml 2011-04-27 08:56:17 UTC (rev 272) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> </parent> <artifactId>bow-ui</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-27 08:56:16 UTC (rev 271) +++ trunk/pom.xml 2011-04-27 08:56:17 UTC (rev 272) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.5</version> + <version>0.6-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-0.5</connection> + <connection>scm:svn:http://svn.chorem.org/svn/bow/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/bow/tags/bow-0.5 + scm:svn:http://svn.chorem.org/svn/bow/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/bow/tags/bow-0.5</url> + <url>http://www.chorem.org/repositories/browse/bow/trunk</url> </scm> <properties>

1 0

r271 - tags
by sletellier＠users.chorem.org 27 Apr '11

27 Apr '11

Author: sletellier Date: 2011-04-27 10:56:16 +0200 (Wed, 27 Apr 2011) New Revision: 271 Url: http://chorem.org/repositories/revision/bow/271 Log: [maven-release-plugin] copy for tag bow-0.5 Added: tags/bow-0.5/

1 0

r270 - in trunk: . bow-extension-chromium bow-ui
by sletellier＠users.chorem.org 27 Apr '11

27 Apr '11

Author: sletellier Date: 2011-04-27 10:56:14 +0200 (Wed, 27 Apr 2011) New Revision: 270 Url: http://chorem.org/repositories/revision/bow/270 Log: [maven-release-plugin] prepare release bow-0.5 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-04-27 08:51:22 UTC (rev 269) +++ trunk/bow-extension-chromium/pom.xml 2011-04-27 08:56:14 UTC (rev 270) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -11,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> </parent> <artifactId>bow-extension-chromium</artifactId> Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2011-04-27 08:51:22 UTC (rev 269) +++ trunk/bow-ui/pom.xml 2011-04-27 08:56:14 UTC (rev 270) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> </parent> <artifactId>bow-ui</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-27 08:51:22 UTC (rev 269) +++ trunk/pom.xml 2011-04-27 08:56:14 UTC (rev 270) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> <modules> <module>bow-extension-chromium</module> @@ -108,11 +108,11 @@ </contributors> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/bow/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/bow/tags/bow-0.5</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/bow/trunk + scm:svn:http://svn.chorem.org/svn/bow/tags/bow-0.5 </developerConnection> - <url>http://www.chorem.org/repositories/browse/bow/trunk</url> + <url>http://www.chorem.org/repositories/browse/bow/tags/bow-0.5</url> </scm> <properties>

1 0

r269 - trunk
by sletellier＠users.chorem.org 27 Apr '11

27 Apr '11

Author: sletellier Date: 2011-04-27 10:51:22 +0200 (Wed, 27 Apr 2011) New Revision: 269 Url: http://chorem.org/repositories/revision/bow/269 Log: - Up to wikitty 3.1 - Up to nuiton-utils 2.1.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-27 07:11:04 UTC (rev 268) +++ trunk/pom.xml 2011-04-27 08:51:22 UTC (rev 269) @@ -120,9 +120,9 @@ <projectId>bow</projectId> <eugenePluginVersion>2.3.2</eugenePluginVersion> - <nuitonUtilsVersion>2.1.1</nuitonUtilsVersion> + <nuitonUtilsVersion>2.1.2</nuitonUtilsVersion> <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <wikittyVersion>3.1-SNAPSHOT</wikittyVersion> + <wikittyVersion>3.1</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <struts2Version>2.1.8.1</struts2Version> <xWorkCoreVersion>2.1.6</xWorkCoreVersion>

1 0

r268 - in trunk: bow-extension-chromium/src/main/webapp bow-extension-chromium/src/main/webapp/_locales/en bow-extension-chromium/src/main/webapp/_locales/fr bow-ui bow-ui/src/license bow-ui/src/main/java/org/chorem/bow/action bow-ui/src/main/webapp/css bow-ui/src/main/webapp/js bow-ui/src/main/webapp/jsp/inc
by sletellier＠users.chorem.org 27 Apr '11

27 Apr '11

Author: sletellier Date: 2011-04-27 09:11:04 +0200 (Wed, 27 Apr 2011) New Revision: 268 Url: http://chorem.org/repositories/revision/bow/268 Log: - Update headers - Remove unused dependency - Fix third-party Modified: trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json trunk/bow-extension-chromium/src/main/webapp/manifest.json trunk/bow-extension-chromium/src/main/webapp/properties.js trunk/bow-ui/pom.xml trunk/bow-ui/src/license/THIRD-PARTY.properties trunk/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java trunk/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css trunk/bow-ui/src/main/webapp/js/bookmark.js trunk/bow-ui/src/main/webapp/js/jquery-1.5.2.min.js trunk/bow-ui/src/main/webapp/js/jquery-ui-1.8.11.custom.min.js trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp Modified: trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW :: Chromium extension + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ { "extensionName": { "message": "BOW extension", Modified: trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW :: Chromium extension + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ { "extensionName" : { "message" : "Extension pour BOW", Modified: trunk/bow-extension-chromium/src/main/webapp/manifest.json =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/manifest.json 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-extension-chromium/src/main/webapp/manifest.json 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW :: Chromium extension + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ { "name": "__MSG_extensionName__", "version": "1.0", Modified: trunk/bow-extension-chromium/src/main/webapp/properties.js =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/properties.js 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-extension-chromium/src/main/webapp/properties.js 2011-04-27 07:11:04 UTC (rev 268) @@ -1 +1,24 @@ +/* + * #%L + * BOW :: Chromium extension + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ var BOW_URL = "http://bow.chorem.org/bow"; Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/pom.xml 2011-04-27 07:11:04 UTC (rev 268) @@ -71,12 +71,6 @@ </dependency> <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.2.1</version> - </dependency> - - <dependency> <groupId>org.htmlparser</groupId> <artifactId>htmlparser</artifactId> </dependency> Modified: trunk/bow-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/bow-ui/src/license/THIRD-PARTY.properties 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/license/THIRD-PARTY.properties 2011-04-27 07:11:04 UTC (rev 268) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache 2 @@ -15,11 +15,10 @@ # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - LGPL 2.1 -# - LGPL 2.1 / The Apache Software License - Version 2.0 # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - Public Domain -# - Public domain +# - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 @@ -28,12 +27,16 @@ # Please fill the missing licenses for dependencies : # # -#Wed Feb 16 01:05:46 CET 2011 +#Tue Apr 26 16:51:54 CEST 2011 +antlr--antlr--2.7.2--jar=BSD License commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +dom4j--dom4j--1.1--jar=BSD License +jakarta-regexp--jakarta-regexp--1.4--jar=The Apache Software License, Version 2.0 javax.servlet--jsp-api--2.0--jar=Common Development and Distribution License (CDDL) v1.0 javax.servlet--servlet-api--2.5--jar=Common Development and Distribution License (CDDL) v1.0 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) v1.0 ognl--ognl--2.7.3--jar=The OpenSymphony Software License 1.1 -woodstox--wstx-asl--3.2.7--jar=LGPL 2.1 / The Apache Software License - Version 2.0 -xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme! Lab Software License, vesion 1.1.1 +org.apache.zookeeper--zookeeper--3.3.1--jar=The Apache Software License, Version 2.0 +oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 +xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.bow.action; import org.apache.commons.lang.StringUtils; Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.bow.action; import org.chorem.bow.BowBookmark; Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-04-27 07:11:04 UTC (rev 268) @@ -8,7 +8,7 @@ * %% * Copyright (C) 2010 CodeLutin * %% -* This program is free software: you can redistribute it and/or modify + * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. @@ -176,4 +176,4 @@ -moz-border-radius: 0.5em; padding:10px; -} \ No newline at end of file +} Modified: trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css 2011-04-27 07:11:04 UTC (rev 268) @@ -1,4 +1,27 @@ /* + * #%L + * BOW UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +/* * jQuery UI CSS Framework 1.8.11 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) Modified: trunk/bow-ui/src/main/webapp/js/bookmark.js =================================================================== --- trunk/bow-ui/src/main/webapp/js/bookmark.js 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/webapp/js/bookmark.js 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ function modify(name, alias, tags, link, action, id) { var form = $("#bookmarkForm")[0]; form.link.value = link; Modified: trunk/bow-ui/src/main/webapp/js/jquery-1.5.2.min.js =================================================================== --- trunk/bow-ui/src/main/webapp/js/jquery-1.5.2.min.js 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/webapp/js/jquery-1.5.2.min.js 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ /*! * jQuery JavaScript Library v1.5.2 * http://jquery.com/ Modified: trunk/bow-ui/src/main/webapp/js/jquery-ui-1.8.11.custom.min.js =================================================================== --- trunk/bow-ui/src/main/webapp/js/jquery-ui-1.8.11.custom.min.js 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/webapp/js/jquery-ui-1.8.11.custom.min.js 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ /*! * jQuery UI 1.8.11 * Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ + <%@ page import="static org.nuiton.i18n.I18n._" %> <%-- Document : popupAddUrl Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ + <%-- Document : popupPublicAlias Created on : 20 avr. 2011, 17:03:37

1 0

r267 - trunk
by echatellier＠users.chorem.org 26 Apr '11

26 Apr '11

Author: echatellier Date: 2011-04-26 17:04:35 +0200 (Tue, 26 Apr 2011) New Revision: 267 Url: http://chorem.org/repositories/revision/bow/267 Log: Fix contributors Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-26 14:49:16 UTC (rev 266) +++ trunk/pom.xml 2011-04-26 15:04:35 UTC (rev 267) @@ -89,7 +89,6 @@ <contributors> <contributor> - <id>bbrossaud</id> <name>Benoit Brossaud</name> <organization>CodeLutin</organization> <timezone>+1</timezone> @@ -99,7 +98,6 @@ </contributor> <contributor> - <id>vbriand</id> <name>Valentin Brillant</name> <organization>CodeLutin</organization> <timezone>+1</timezone> @@ -107,7 +105,6 @@ <role>Developer</role> </roles> </contributor> - </contributors> <scm>

1 0

r266 - trunk
by sletellier＠users.chorem.org 26 Apr '11

26 Apr '11

Author: sletellier Date: 2011-04-26 16:49:16 +0200 (Tue, 26 Apr 2011) New Revision: 266 Url: http://chorem.org/repositories/revision/bow/266 Log: - Add tony as developer - Add bbrossau and vbriand as contributor Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-26 13:47:31 UTC (rev 265) +++ trunk/pom.xml 2011-04-26 14:49:16 UTC (rev 266) @@ -74,8 +74,42 @@ <role>Debian packager</role> </roles> </developer> + + <developer> + <id>tchemit</id> + <name>Tony Chemit</name> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+1</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> </developers> + <contributors> + <contributor> + <id>bbrossaud</id> + <name>Benoit Brossaud</name> + <organization>CodeLutin</organization> + <timezone>+1</timezone> + <roles> + <role>Developer</role> + </roles> + </contributor> + + <contributor> + <id>vbriand</id> + <name>Valentin Brillant</name> + <organization>CodeLutin</organization> + <timezone>+1</timezone> + <roles> + <role>Developer</role> + </roles> + </contributor> + + </contributors> + <scm> <connection>scm:svn:http://svn.chorem.org/svn/bow/trunk</connection> <developerConnection>

1 0

r265 - trunk
by sletellier＠users.chorem.org 26 Apr '11

26 Apr '11

Author: sletellier Date: 2011-04-26 15:47:31 +0200 (Tue, 26 Apr 2011) New Revision: 265 Url: http://chorem.org/repositories/revision/bow/265 Log: Add developers Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-26 13:38:57 UTC (rev 264) +++ trunk/pom.xml 2011-04-26 13:47:31 UTC (rev 265) @@ -37,6 +37,45 @@ </license> </licenses> + <developers> + <developer> + <id>sletellier</id> + <name>Sylvain Letellier</name> + <email>letellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> + + <developer> + <id>kmorin</id> + <name>Kevin Morin</name> + <email>morin(a)codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> + + <developer> + <id>bpoussin</id> + <name>Benjamin Poussin</name> + <email>poussin(a)codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Developer</role> + <role>Debian packager</role> + </roles> + </developer> + </developers> + <scm> <connection>scm:svn:http://svn.chorem.org/svn/bow/trunk</connection> <developerConnection>

1 0

r264 - trunk/bow-ui/src/main/webapp/jsp/inc
by sletellier＠users.chorem.org 26 Apr '11

26 Apr '11

Author: sletellier Date: 2011-04-26 15:38:57 +0200 (Tue, 26 Apr 2011) New Revision: 264 Url: http://chorem.org/repositories/revision/bow/264 Log: - Forward to bookmark edition when create public alias without javascript Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-26 13:17:07 UTC (rev 263) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-26 13:38:57 UTC (rev 264) @@ -67,6 +67,9 @@ <s:property value="%{#wikittyId}" /> </s:a> --%> + <s:url var="editBookmark" action="editBookmark"> + <s:param name="id" value="%{#wikittyId}"/> + </s:url> <s:if test="%{!#publicAliasUrl.empty}"> <s:a cssClass="alias" href="%{#aliasServlet + #publicAliasUrl}.action" title="%{#bookmarkLink}" onclick="window.open(this.href); return false;"> <s:property value="%{#publicAliasUrl}" /> @@ -77,7 +80,7 @@ <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> <s:param name="alias">irock</s:param> </s:url> - <s:a cssClass="addAlias" onclick="return openPublicAliasForm('%{#wikittyId}')"> + <s:a cssClass="addAlias" href="%{editBookmark}" onclick="return openPublicAliasForm('%{#wikittyId}')"> <img style="border:none;" src="img/add.png" alt="Set alias" title="Set alias" /> </s:a> </s:else> @@ -94,9 +97,6 @@  - <s:url var="editBookmark" action="editBookmark"> - <s:param name="id" value="%{#wikittyId}"/> - </s:url> <s:a cssClass="edit" href="%{editBookmark}" onclick="return openPopupAddUrl('%{#wikittyId}', '%{#bookmarkLink}', '%{@org.apache.commons.lang.StringEscapeUtils@escapeJavaScript(#request.bookmark.description)}', '%{#bookmarkAlias}', '%{#publicAliasUrl}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}');"> </s:a>

1 0