July 2019 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 2 commits: update pom
by Tony CHEMIT 16 Jul '19

16 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 73b9506c by tchemit at 2019-07-14T14:22:39Z update pom - - - - - 7f2e5857 by tchemit at 2019-07-16T11:02:35Z [PS][CALCUL] Problèmes de calcul avec quelques marées (findLengthLengthParameter) - Closes #1350 - - - - - 2 changed files: - pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.23</version> + <version>2019.8.24</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -695,6 +695,10 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements } SizeMeasureType outputSizeMeasureType = lengthWeightParameter.getSizeMeasureType(); + if (outputSizeMeasureType == null) { + log.error(String.format("No size measure type found for LengthWeightParameter (%s) will use the one of the species", lengthWeightParameter.getTopiaId())); + outputSizeMeasureType = lengthWeightParameter.getSpecies().getSizeMeasureType(); + } if (!Objects.equals(inputSizeMeasureType, outputSizeMeasureType)) { // on doit effectuer une conversion taille - taille avant de convertir en poids View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/59ddc8b286d5a16b2cfa7664a6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/59ddc8b286d5a16b2cfa7664a6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 11 commits: [PS][CALCUL] Problèmes de calcul avec quelques marées (findLengthLengthParameter) - Closes #1350
by Tony CHEMIT 16 Jul '19

16 Jul '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 7f2e5857 by tchemit at 2019-07-16T11:02:35Z [PS][CALCUL] Problèmes de calcul avec quelques marées (findLengthLengthParameter) - Closes #1350 - - - - - eef0ed93 by tchemit at 2019-07-16T11:02:43Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - 2f46e27c by tchemit at 2019-07-16T11:02:43Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - f5363a05 by tchemit at 2019-07-16T11:02:43Z Move to new version 9.0-alpha-1 - - - - - 98fbcc9b by tchemit at 2019-07-16T11:02:43Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - 3662771b by tchemit at 2019-07-16T11:02:44Z Module 2 (first flush) - - - - - 55958234 by tchemit at 2019-07-16T11:02:44Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - 81376301 by tchemit at 2019-07-16T11:02:44Z Module 2 - second flush - - - - - 11dd3fe2 by tchemit at 2019-07-16T11:02:45Z Report from v8 for ps logbook model - - - - - f76bb03c by tchemit at 2019-07-16T11:02:45Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 87d0b899 by tchemit at 2019-07-16T11:02:45Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java-enumeration.getter - client-configuration/src/main/i18n/getters/java.getter - client-core/.mvn/pom.gitflow.develop - client-core/.mvn/pom.gitflow.master - client-core/pom.xml - client-core/src/license/THIRD-PARTY.properties - client-core/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - client-core/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - client-core/src/main/dcp-presets/ps/logbook/03-update-preset.yml - client-core/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/ChooseRelatedObservedActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddActivitySeineFloatingObjectUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineFloatingObjectUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineSetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/AddFloatingObjectPresetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/CopyFloatingObjectPartToLeftAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/CopyFloatingObjectPartToRightAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/68f70e493b59d1a868db6ee208… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/68f70e493b59d1a868db6ee208… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: update pom
by Tony CHEMIT 16 Jul '19

16 Jul '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5971fd79 by tchemit at 2019-07-16T10:33:56Z update pom - - - - - cb723884 by tchemit at 2019-07-16T10:34:16Z [PS][CALCUL] Problèmes de calcul avec quelques marées (findLengthLengthParameter) - Closes #1350 - - - - - 2 changed files: - pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.23</version> + <version>2019.8.24</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -692,6 +692,10 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements } SizeMeasureType outputSizeMeasureType = lengthWeightParameter.getSizeMeasureType(); + if (outputSizeMeasureType == null) { + log.error(String.format("No size measure type found for LengthWeightParameter (%s) will use the one of the species", lengthWeightParameter.getTopiaId())); + outputSizeMeasureType = lengthWeightParameter.getSpecies().getSizeMeasureType(); + } if (!Objects.equals(inputSizeMeasureType, outputSizeMeasureType)) { // on doit effectuer une conversion taille - taille avant de convertir en poids View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ae2bfff91e79a423f67ce04e54… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ae2bfff91e79a423f67ce04e54… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 14 Jul '19

14 Jul '19

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 329f37d0 by 166231 at 2019-07-14T14:49:06Z Site checkin for project ObServe :: Pom - - - - - 8 changed files: - administration-web.html - architecture-logicielle.html - − img/logo-small.png - img/logo.png - img/logo_ird.png - index.html - install-serverPG.html - install.html Changes: ===================================== administration-web.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190706" /> + <meta name="Date-Revision-yyyymmdd" content="20190714" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation de lapplication web</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -18,8 +18,8 @@ <body class="topBarDisabled"> <div class="container-fluid"> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation de lapplication web</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-06</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.8</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-14</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -101,8 +101,8 @@ <pre class="source"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-7.0.8.log # logs de l'application - |-- observeweb-log4j2.xml # configuration des logs + | `-- observeweb-8.0-RC-3.log # logs de l'application + |-- observeweb-log4j.conf # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs </pre></div></div> @@ -196,6 +196,14 @@ <div> <div> <pre class="source"> http://localhost:8080/observeweb/admin/resetAuthenticationTokens?adminApiKe… (ou la clef que vous avez configuré) +</pre></div></div> + +<p>Par défaut le proxy_ajp a un timeout de 5 minutes, il faut augmenter cette valeur sinon les appels dépassant ce temps seront rejettés.</p> +<p>Dans le fichier de configuration <tt>httpd.conf</tt> ajouter la ligne : (timeout de 1200 secondes = 20 minutes)</p> + +<div> +<div> +<pre class="source">ProxyTimeout 1200 </pre></div></div> </div> </div> ===================================== architecture-logicielle.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190706" /> + <meta name="Date-Revision-yyyymmdd" content="20190714" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Architecture logicielle dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -18,8 +18,8 @@ <body class="topBarDisabled"> <div class="container-fluid"> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Architecture logicielle dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-06</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.8</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-14</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== img/logo-small.png deleted ===================================== Binary files a/img/logo-small.png and /dev/null differ ===================================== img/logo.png ===================================== Binary files a/img/logo.png and b/img/logo.png differ ===================================== img/logo_ird.png ===================================== Binary files a/img/logo_ird.png and b/img/logo_ird.png differ ===================================== index.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190706" /> + <meta name="Date-Revision-yyyymmdd" content="20190714" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – ObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -18,8 +18,8 @@ <body class="topBarDisabled"> <div class="container-fluid"> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">ObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-06</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.8</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-14</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install-serverPG.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190706" /> + <meta name="Date-Revision-yyyymmdd" content="20190714" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation du serveur Obstuna</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -18,8 +18,8 @@ <body class="topBarDisabled"> <div class="container-fluid"> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation du serveur Obstuna</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-06</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.8</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-14</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190706" /> + <meta name="Date-Revision-yyyymmdd" content="20190714" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -18,8 +18,8 @@ <body class="topBarDisabled"> <div class="container-fluid"> <div id="banner"> - <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo-small.png" alt="ObServe :: Pom"/></a></div> - <div class="pull-right"></div> + <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="./img/logo.png" alt="ObServe :: Pom"/></a></div> + <div class="pull-right"><a href="index.html" id="bannerRight"><img src="./img/logo_ird.png" alt="ObServe :: Pom"/></a></div> <div class="clear"><hr/></div> </div> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-06</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.8</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-07-14</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/329f37d08057770c4316c4c5b01… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/329f37d08057770c4316c4c5b01… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 17 commits: [jgitflow-maven-plugin]updating poms for 8.0-RC-4-SNAPSHOT development[skip ci]
by Tony CHEMIT 14 Jul '19

14 Jul '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: a019da5b by tchemit at 2019-07-14T13:54:37Z [jgitflow-maven-plugin]updating poms for 8.0-RC-4-SNAPSHOT development[skip ci] - - - - - e5835ad0 by tchemit at 2019-07-14T13:55:09Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-RC-3' with non-snapshot versions[skip ci] - - - - - 373ec662 by tchemit at 2019-07-14T14:02:34Z [jgitflow-maven-plugin]merging 'release/8.0-RC-3' into 'master' - - - - - 5fecf74a by tchemit at 2019-07-14T14:02:37Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 7669bc80 by tchemit at 2019-07-14T14:02:37Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 59ddc8b2 by tchemit at 2019-07-14T14:02:38Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 73b9506c by tchemit at 2019-07-14T14:22:39Z update pom - - - - - 5c66c3c0 by tchemit at 2019-07-14T14:22:49Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - 055ea07d by tchemit at 2019-07-14T14:22:49Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 67a9d2d8 by tchemit at 2019-07-14T14:22:49Z Move to new version 9.0-alpha-1 - - - - - 57cedbbf by tchemit at 2019-07-14T14:22:50Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - bd332824 by tchemit at 2019-07-14T14:22:50Z Module 2 (first flush) - - - - - 2b469c02 by tchemit at 2019-07-14T14:22:51Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - 28c26074 by tchemit at 2019-07-14T14:22:51Z Module 2 - second flush - - - - - f771007a by tchemit at 2019-07-14T14:40:29Z Report from v8 for ps logbook model - - - - - 60b96735 by tchemit at 2019-07-14T14:40:32Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 68f70e49 by tchemit at 2019-07-14T14:40:32Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java-enumeration.getter - client-configuration/src/main/i18n/getters/java.getter - client-core/.mvn/pom.gitflow.develop - client-core/.mvn/pom.gitflow.master - client-core/pom.xml - client-core/src/license/THIRD-PARTY.properties - client-core/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - client-core/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - client-core/src/main/dcp-presets/ps/logbook/03-update-preset.yml - client-core/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/ChooseRelatedObservedActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddActivitySeineFloatingObjectUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineFloatingObjectUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineSetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/AddFloatingObjectPresetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/CopyFloatingObjectPartToLeftAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/CopyFloatingObjectPartToRightAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/26ec02fbebb37bfeed06a4c5cb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/26ec02fbebb37bfeed06a4c5cb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/8.0-RC-3
by Tony CHEMIT 14 Jul '19

14 Jul '19

Tony CHEMIT deleted branch release/8.0-RC-3 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v8.0-RC-3
by Tony CHEMIT 14 Jul '19

14 Jul '19

Tony CHEMIT pushed new tag v8.0-RC-3 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/v8.0-RC-3 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/8.0-RC-3] [jgitflow-maven-plugin]updating poms for branch'release/8.0-RC-3' with...
by Tony CHEMIT 14 Jul '19

14 Jul '19

Tony CHEMIT pushed to branch release/8.0-RC-3 at ultreiaio / ird-observe Commits: e5835ad0 by tchemit at 2019-07-14T13:55:09Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-RC-3' with non-snapshot versions[skip ci] - - - - - 17 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services-validation/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-3-SNAPSHOT</version> + <version>8.0-RC-3</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-3-SNAPSHOT</version> + <version>8.0-RC-3</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-3-SNAPSHOT</version> + <version>8.0-RC-3</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-3-SNAPSHOT</version> + <version>8.0-RC-3</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-3-SNAPSHOT</version> + <version>8.0-RC-3</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-3-SNAPSHOT</version> + <version>8.0-RC-3</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-3-SNAPSHOT</version> + <version>8.0-RC-3</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-3-SNAPSHOT</version> + <version>8.0-RC-3</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-3-SNAPSHOT</version> + <version>8.0-RC-3</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-3-SNAPSHOT</version> + <version>8.0-RC-3</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-3-SNAPSHOT</version> + <version>8.0-RC-3</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-3-SNAPSHOT</version> + <version>8.0-RC-3</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-3-SNAPSHOT</version> + <version>8.0-RC-3</version> </parent> <artifactId>services-local</artifactId> ===================================== services-validation/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-3-SNAPSHOT</version> + <version>8.0-RC-3</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-3-SNAPSHOT</version> + <version>8.0-RC-3</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-3-SNAPSHOT</version> + <version>8.0-RC-3</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-RC-3-SNAPSHOT</version> + <version>8.0-RC-3</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e5835ad01a6914d9aebaa9bbd0e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e5835ad01a6914d9aebaa9bbd0e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 42 commits: [jgitflow-maven-plugin]updating poms for 8.0-RC-3-SNAPSHOT development[skip ci]
by Tony CHEMIT 14 Jul '19

14 Jul '19

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 3f6a4ea3 by tchemit at 2019-06-09T16:00:30Z [jgitflow-maven-plugin]updating poms for 8.0-RC-3-SNAPSHOT development[skip ci] - - - - - 66e69b1d by tchemit at 2019-06-09T18:25:34Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 13ed0778 by tchemit at 2019-06-09T18:25:35Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - c4e7974e by tchemit at 2019-06-09T18:25:36Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 63c5a32b by tchemit at 2019-06-11T12:07:40Z use next toolkit referential API - - - - - 0c2b5f0c by tchemit at 2019-06-11T16:08:18Z [PS] Transformation de deux énumérations en référentiels - Closes #1322 [PS FOB Buoys] Revoir cet écran - Closes #1326 - - - - - 4ba6c352 by tchemit at 2019-06-11T20:24:22Z never build javadoc (for the moment) - - - - - 3a7af63a by tchemit at 2019-06-13T12:34:53Z [PS FOB] Intégration du nœud Balise en tant qu'onglet du formulaire FOB - Closes #1333 - - - - - babb28a6 by tchemit at 2019-06-21T16:22:15Z [PS FOB] Mise en place des nouvelles templates de FOB - Closes #1321 - - - - - 5f42b428 by tchemit at 2019-06-21T16:22:17Z update pom - - - - - 63072452 by tchemit at 2019-06-21T16:22:17Z [UI REFERENTIEL] Liste des relations taille-poids et taille-taille - Closes #1335 - - - - - 6ece2117 by tchemit at 2019-06-25T14:05:27Z Reorganise navigation tree nodes - - - - - ddd980c3 by tchemit at 2019-06-25T15:55:55Z Use relative name on generated dto model and dao supplier - - - - - 19e30588 by tchemit at 2019-06-27T05:28:05Z update pom - - - - - f64a33aa by tchemit at 2019-06-27T05:30:37Z Clés de référentiel non traduite ou nom des clés invalide - Close #1336 - - - - - 5f644483 by tchemit at 2019-06-27T05:33:03Z [REFERENTIEL] Impossible de modifier le parent d'un matériau - Closes #1338 - - - - - 230a5851 by tchemit at 2019-06-27T05:34:46Z [REFERENTIEL] La validation sur les Objets flottant matériaux ne fonctionnent plus :( - Closes #1339 - - - - - 7cd87441 by tchemit at 2019-06-27T05:37:57Z [PS][FAD] Comportement des entrées 'FAD' et 'LOG' - Closes #1324 - - - - - 3bd3958b by tchemit at 2019-06-27T05:39:11Z Fix referential back to list action - - - - - e65a7d2f by tchemit at 2019-06-27T06:56:50Z update changelog [skip ci] - - - - - aca4d4c4 by tchemit at 2019-06-27T09:11:51Z [PS] Suppression de 2 champs - Closes #1337 - - - - - dfd0c3f9 by tchemit at 2019-06-29T16:52:58Z L'assistant migration via serveur pourrait refuser de continuer si l'utilisateur n'est pas assez acrédité - Closes #1145 Assistant création de base PG échoue - Closes #1331 - - - - - 74dcde81 by tchemit at 2019-06-29T19:13:44Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 994ae443 by tchemit at 2019-07-02T07:26:24Z Amélioration de l'API de TripMap - See #1293 - - - - - ee1758ad by tchemit at 2019-07-02T07:53:18Z update changelog [skip ci] - - - - - c5872151 by tchemit at 2019-07-02T08:14:45Z update libs before release - - - - - 21b7dfb2 by tchemit at 2019-07-02T09:18:12Z N° de versions mentionnés par l'assistant migration - Closes #1330 - - - - - 86710b87 by tchemit at 2019-07-02T09:51:53Z On ne peut pas sauvegarder une configuration d'un serveur distant en mode admin - Closes #1340 - - - - - 60687e47 by tchemit at 2019-07-03T15:52:36Z update changelog [skip ci] - - - - - 7c5335b3 by tchemit at 2019-07-03T16:07:57Z [REFERENTIEL] La validation sur les Objets flottant matériaux ne fonctionnent plus :( - Closes #1339 - - - - - 34e5df83 by tchemit at 2019-07-04T11:26:30Z [PS][FAD] Gestion visuelle de la hiérarchie des matériaux sélectionnée - Closes #1323 - - - - - 48360a56 by tchemit at 2019-07-04T11:47:23Z update changelog [skip ci] - - - - - 87e581b5 by tchemit at 2019-07-05T13:29:57Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - 1613a685 by tchemit at 2019-07-05T13:29:58Z Revert "Impossible de remplir le champ espèces - Closes #1273" This reverts commit d1f46eec - - - - - f23166ca by tchemit at 2019-07-06T13:57:54Z update changelog [skip ci] - - - - - e592713c by tchemit at 2019-07-14T13:15:05Z Déplacement de deux référentiels vers ps_common - Closes #1348 - - - - - efde2cc4 by tchemit at 2019-07-14T13:15:10Z set checkbox value from model if required - - - - - ebd14498 by tchemit at 2019-07-14T13:38:51Z [PS FOB] Mise en place des nouvelles templates de FOB (Mise en place de l'éditeur) - Closes #1321 - - - - - 620771f8 by tchemit at 2019-07-14T13:45:48Z update changelog [skip ci] - - - - - e4fbfe9e by tchemit at 2019-07-14T13:52:09Z update toolkit lib - - - - - e5835ad0 by tchemit at 2019-07-14T13:55:09Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-RC-3' with non-snapshot versions[skip ci] - - - - - 373ec662 by tchemit at 2019-07-14T14:02:34Z [jgitflow-maven-plugin]merging 'release/8.0-RC-3' into 'master' - - - - - 30 changed files: - + .mvn/gitlab-cache/milestones/898778-artifacts.json - .mvn/gitlab-cache/milestones/898778-issues.json - .mvn/gitlab-cache/milestones/898778.json - + .mvn/gitlab-cache/milestones/915205-artifacts.json - + .mvn/gitlab-cache/milestones/915205-issues.json - + .mvn/gitlab-cache/milestones/915205.json - + .mvn/gitlab-cache/milestones/916804-artifacts.json - + .mvn/gitlab-cache/milestones/916804-issues.json - + .mvn/gitlab-cache/milestones/916804.json - + .mvn/gitlab-cache/milestones/921497-issues.json - + .mvn/gitlab-cache/milestones/921497.json - + .mvn/gitlab-cache/milestones/925832-issues.json - + .mvn/gitlab-cache/milestones/925832.json - CHANGELOG.md - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/ui/dcprefs/FloatingObjectPresetsUI.jaxx → client-core/src/main/assembly/dcp-presets.xml - + client-core/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - + client-core/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - + client-core/src/main/dcp-presets/ps/logbook/03-update-preset.yml - + client-core/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml - + client-core/src/main/dcp-presets/ps/observation/01-deployment-preset.yml - + client-core/src/main/dcp-presets/ps/observation/02-removal-preset.yml - + client-core/src/main/dcp-presets/ps/observation/03-update-preset.yml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/FloatingObjectPresetsManager.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/49468472f1893967c255446711… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/49468472f1893967c255446711… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/8.0-RC-3' with...
by Tony CHEMIT 14 Jul '19

14 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e5835ad0 by tchemit at 2019-07-14T13:55:09Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-RC-3' with non-snapshot versions[skip ci] - - - - - 373ec662 by tchemit at 2019-07-14T14:02:34Z [jgitflow-maven-plugin]merging 'release/8.0-RC-3' into 'master' - - - - - 5fecf74a by tchemit at 2019-07-14T14:02:37Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 7669bc80 by tchemit at 2019-07-14T14:02:37Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 59ddc8b2 by tchemit at 2019-07-14T14:02:38Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a019da5b203d05378852356620… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a019da5b203d05378852356620… You're receiving this email because of your account on gitlab.com.

1 0