Tony CHEMIT pushed to branch master-5.x at ultreiaio / ird-observe Commits: c07b8063 by Tony CHEMIT at 2017-03-29T16:40:07+02:00 [jgitflow-maven-plugin]updating poms for 5.3.8-SNAPSHOT development - - - - - 21da2be8 by Tony CHEMIT at 2017-03-29T16:50:19+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 5fe91e2c by Tony CHEMIT at 2017-03-29T16:50:20+02:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - a5f7d0b5 by Tony CHEMIT at 2017-03-29T16:50:21+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - bbf265de by Tony CHEMIT at 2017-06-08T09:33:42+02:00 Erreur lors de synchros avec la base IEO (See #772) - - - - - 85a40b54 by Tony CHEMIT at 2017-06-08T09:44:42+02:00 prepare release 5.4 - - - - - 19f8c13e by Tony CHEMIT at 2017-06-08T10:02:10+02:00 Problème lors de la synchro de relation taille-poids entre la base française et la base espagnole (See #774) - - - - - ba5c754a by Tony CHEMIT at 2017-06-08T10:02:23+02:00 prepare release 5.4 - - - - - c6fdf759 by Tony CHEMIT at 2017-06-08T10:13:09+02:00 improve builds - - - - - c0a9625f by Tony CHEMIT at 2017-06-08T10:20:28+02:00 improve builds - - - - - b9037f26 by Tony CHEMIT at 2017-06-08T11:10:20+02:00 improve builds - - - - - ca983d25 by Tony CHEMIT at 2017-06-08T11:23:58+02:00 improve builds - - - - - 74581618 by Tony CHEMIT at 2017-06-09T10:21:38+02:00 Amélioration des libellés espagnols (See #775) - - - - - 42fcc279 by Tony CHEMIT at 2017-06-11T22:27:12+02:00 problème caractères accentués, encodage changé ? (See #729) - - - - - ecc6002a by Tony CHEMIT at 2017-06-12T11:32:09+02:00 Problème potentiel dans la gestion du fuseau horaire, pour l'affichage des dates selon le calendrier grégorien (See #769) - - - - - 1c750803 by Tony CHEMIT at 2017-06-12T17:37:32+02:00 Problème d'UI/menu contextuel lors du déplacement d'items (routes, activités) (See #768) - - - - - c307bf30 by Tony CHEMIT at 2017-06-12T18:02:25+02:00 libellés dans Exporter les données (See #730) - - - - - 005c946b by Tony CHEMIT at 2017-06-13T11:24:54+02:00 Add charset option to h2 restore sql command (See #729) - - - - - 62644877 by Tony CHEMIT at 2017-06-13T12:05:26+02:00 Set charset when creating a dump (See #729) - - - - - 857afc9a by Tony CHEMIT at 2017-06-13T12:10:46+02:00 Set charset when creating a delete script (See #729) - - - - - c6fc9e22 by Tony CHEMIT at 2017-06-13T12:36:45+02:00 Set charset when possible (See #729) - - - - - 782aabb9 by Tony CHEMIT at 2017-06-13T13:06:49+02:00 Amélioration des libellés espagnols (See #775) - - - - - 68463971 by Tony CHEMIT at 2017-06-13T11:17:01-04:00 Essaie de correction des problèmes de timezone (see #769) - - - - - 046c05fb by Tony CHEMIT at 2017-06-13T19:25:19+02:00 Correction pb timeZone sur couche http (See #769)" - - - - - 5208f502 by Pascal CAUQUIL at 2017-06-13T19:25:30+02:00 Correction d'un libellé - - - - - 74fe13fd by Tony CHEMIT at 2017-06-13T19:25:30+02:00 Revert "Essaie de correction des problèmes de timezone (see #769)" This reverts commit 68463971a5e4ed99e617c7a6223c6b5761b36c0a. - - - - - 545386ec by Tony CHEMIT at 2017-06-13T19:25:30+02:00 Revert "Problème potentiel dans la gestion du fuseau horaire, pour l'affichage des dates selon le calendrier grégorien (See #769)" This reverts commit ecc6002a1f44db6082a4421d2b8e5a18adb083d4. - - - - - d93684d4 by Tony CHEMIT at 2017-06-13T19:49:57+02:00 [jgitflow-maven-plugin]updating poms for branch'release/5.4' with non-snapshot versions - - - - - 30ac2ed1 by Tony CHEMIT at 2017-06-13T19:56:05+02:00 reformat code + optimize dependencies - - - - - f1601873 by Tony CHEMIT at 2017-06-13T20:26:25+02:00 [jgitflow-maven-plugin]merging 'release/5.4' into 'master-5.x' - - - - - 30 changed files: - .gitlab-ci.yml - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-validation/pom.xml - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing-validators/pom.xml - application-swing/pom.xml - application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java - application-swing/src/main/java/fr/ird/observe/application/swing/backup/BackupsManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglineUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeineUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveMultipleDataUIActionSupport.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRouteUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveSingleDataUIActionSupport.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripLonglineUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripLonglinesUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripSeineUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripSeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripsUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java - − application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java - − application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java - − application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/88829e6a67f418bc6fad0be8297... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/88829e6a67f418bc6fad0be8297... You're receiving this email because of your account on gitlab.com.