branch feature/7588_maree_ocean_modifiable_avec_sous_item created (now 5a6c6c7)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7588_maree_ocean_modifiable_avec_sous_item in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git at 5a6c6c7 Restaure le control d'activation sur l'ocean d'une marée This branch includes the following new commits: new 5a6c6c7 Restaure le control d'activation sur l'ocean d'une marée The 1 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 5a6c6c766f57a20993fddb4ce14c85fbb88dadd9 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Fri Aug 5 18:03:54 2016 +0200 Restaure le control d'activation sur l'ocean d'une marée refs #7588 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7588_maree_ocean_modifiable_avec_sous_item in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 5a6c6c766f57a20993fddb4ce14c85fbb88dadd9 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Fri Aug 5 18:03:54 2016 +0200 Restaure le control d'activation sur l'ocean d'une marée refs #7588 --- .../fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx | 3 ++- .../fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jcss | 2 +- .../java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx | 3 ++- .../java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jcss | 3 +-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx index 1735665..2dd9b68 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx @@ -29,6 +29,7 @@ fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.longline.TripLonglineDto fr.ird.observe.services.dto.longline.ActivityLonglineDto + fr.ird.observe.services.dto.longline.TripLonglineActivityDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.HarbourDto fr.ird.observe.services.dto.referential.PersonDtos @@ -74,7 +75,7 @@ <script><
codelutin.com scm