branch develop updated (643ee6d -> 8946a1d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 643ee6d fixes #6704: LL/PS - Libellé des marées dans l'arbre new 5e5dc08 add .gitignore new 4165eb4 passage sous git et utilisation de codelutinpom new cb365f6 refs #6904 correction de la disposition new 8946a1d fixes #6904: Mauvais disposition sur l'écran des activités senne Merge branch 'feature/6904' into develop The 4 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 8946a1dd033b96ad62fe88359939403122bf81e1 Merge: 4165eb4 cb365f6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 20:32:11 2015 +0200 fixes #6904: Mauvais disposition sur l'écran des activités senne Merge branch 'feature/6904' into develop commit cb365f6a7e4c3fed85d23c894543477e7e772740 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 20:31:59 2015 +0200 refs #6904 correction de la disposition commit 4165eb4c3f1db2c76eee4efbd251695efbefba99 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 20:21:18 2015 +0200 passage sous git et utilisation de codelutinpom commit 5e5dc0895d07b4b378104be6e10e74a9e37ab546 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 20:14:17 2015 +0200 add .gitignore Summary of changes: .gitignore | 12 ++++++ .../content/open/impl/seine/ActivitySeineUI.jaxx | 6 +-- pom.xml | 34 ++++++--------- src/site/site_fr.xml | 48 +++++++--------------- 4 files changed, 42 insertions(+), 58 deletions(-) create mode 100644 .gitignore -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 5e5dc0895d07b4b378104be6e10e74a9e37ab546 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 20:14:17 2015 +0200 add .gitignore --- .gitignore | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f92d132 --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +/.idea +/*/.idea +/target +/*/target/ +/*.iml +/*/*.iml +/*.ipr +/*/*.ipr +/*.iws +/*/*.iws +/*~ +/*/*~ \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 4165eb4c3f1db2c76eee4efbd251695efbefba99 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 20:21:18 2015 +0200 passage sous git et utilisation de codelutinpom --- pom.xml | 34 ++++++++++++---------------------- src/site/site_fr.xml | 48 +++++++++++++++--------------------------------- 2 files changed, 27 insertions(+), 55 deletions(-) diff --git a/pom.xml b/pom.xml index 9a5ec0d..c4b0939 100644 --- a/pom.xml +++ b/pom.xml @@ -27,8 +27,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>6.1</version> + <artifactId>codelutinpom</artifactId> + <version>1.8.2</version> </parent> <groupId>fr.ird.observe</groupId> @@ -37,7 +37,7 @@ <packaging>pom</packaging> <name>ObServe</name> <description>Projet ObServe</description> - <url>http://observe.codelutin.com</url> + <url>https://observe.codelutin.com</url> <inceptionYear>2008</inceptionYear> <organization> <name>IRD</name> @@ -85,32 +85,30 @@ <module>observe-swing</module> </modules> - <scm> + <!--scm> <url>https://svn.mpl.ird.fr/osiris/observe/trunk</url> <connection>scm:svn:https://svn.mpl.ird.fr/osiris/observe/trunk</connection> <developerConnection> scm:svn:https://svn.mpl.ird.fr/osiris/observe/trunk </developerConnection> + </scm--> + <scm> + <url>https://gitweb.codelutin.com/observe.git</url> + <connection>scm:git:http://git.codelutin.com/observe.git</connection> + <developerConnection>scm:git:https://git.codelutin.com/observe.git</developerConnection> </scm> + <distributionManagement> <site> - <id>${siteDeployId}</id> - <url>${siteDeployUrl}</url> + <id>${site.server}</id> + <url>${site.url}</url> </site> </distributionManagement> - <prerequisites> - <maven>3.0</maven> - </prerequisites> - <properties> - <platform>codelutin.com</platform> <projectId>observe</projectId> - <!-- Release configuration --> - <releaseEmailDomain>forge.codelutin.com</releaseEmailDomain> - <eugenePluginVersion>2.14</eugenePluginVersion> <topiaVersion>2.9.4</topiaVersion> @@ -132,14 +130,6 @@ <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> <i18n.silent>true</i18n.silent> - <siteDeployUrl> - scpexe://forge.codelutin.com/var/lib/doc/maven-site/codelutin.com/${projectId}/${siteDeployClassifier} - </siteDeployUrl> - <mavenpomSiteCommonResourcesUrl>https://common.nuiton.org/0.3</mavenpomSiteCommonResourcesUrl> - - <!-- issues status to include in changelog --> - <redmine.statusIds>3,10,11,18,19</redmine.statusIds> - </properties> <repositories> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 77c1e37..b25f690 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -21,23 +21,10 @@ #L% --> -<project name="${project.name}"> - - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>${fluidoSkinVersion}</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>false</topBarEnabled> - <googleSearch/> - <sideBarEnabled>true</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -50,40 +37,35 @@ <href>http://www.codelutin.com</href> </bannerRight> - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/maven-feather.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> - <logo href="http://jrst.nuiton.org" name="JRst" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/jrst-logo.png"/> + <logo href="https://jrst.nuiton.org" name="JRst" + img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> - <logo href="http://topia.nuiton.org" name="ToPIA" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/topia-logo.png"/> + <logo href="https://jaxx.nuiton.org" name="JAXX" + img="${siteCommonResourcesUrl}/images/logos/jaxx-logo.png"/> - <logo href="http://jaxx.nuiton.org" name="JAXX" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/jaxx-logo.png"/> + <logo href="https://topia.nuiton.org" name="ToPIA" + img="${mavenpomSiteCommonResourcesUrl}/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/argouml-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/argouml-logo.png"/> </poweredBy> <body> <links> - <item name="Forge" href="http://www.forge.codelutin.com"/> - <item name="Code Lutin" href="http://www.codelutin.com"/> + <item name="Forge" href="https://forge.codelutin.com"/> + <item name="Code Lutin" href="https://codelutin.com"/> </links> <breadcrumbs> - <item name="${project.name}" href="${project.url}"/> + <item name="${project.name}" href="${project.url}/index.html"/> <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> </breadcrumbs> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit cb365f6a7e4c3fed85d23c894543477e7e772740 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 20:31:59 2015 +0200 refs #6904 correction de la disposition --- .../fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.jaxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.jaxx index 467f64a..8ab16fb 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.jaxx +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.jaxx @@ -98,7 +98,7 @@ void $afterCompleteSetup() { <cell anchor="north" weightx="1"> <JTabbedPane id='fishingOperationTabPane'> <tab id='generalTab'> - <Table fill="both" weightx="1"> + <Table fill="both"> <!-- heure observation --> <row> <cell columns="2" weightx="1"> @@ -190,13 +190,13 @@ void $afterCompleteSetup() { </tab> <tab id='measurementsTab'> - <Table fill="both" weightx="1"> + <Table fill="both"> <!-- vitesse vessel --> <row> <cell anchor='west'> <JLabel id='vesselSpeedLabel'/> </cell> - <cell anchor='east' fill="both"> + <cell anchor='east' weightx="1" fill="both"> <NumberEditor id='vesselSpeed' constructorParams='this'/> </cell> </row> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 8946a1dd033b96ad62fe88359939403122bf81e1 Merge: 4165eb4 cb365f6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 20:32:11 2015 +0200 fixes #6904: Mauvais disposition sur l'écran des activités senne Merge branch 'feature/6904' into develop .../fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.jaxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm