Tony CHEMIT pushed to branch master-5.x at ultreia.io / ird-observe Commits: 18749dca by root at 2017-02-21T10:30:43+00:00 [jgitflow-maven-plugin]updating poms for 5.3.3-SNAPSHOT development - - - - - 311fc09f by Tony CHEMIT at 2017-02-21T11:50:10+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - da2a4bcb by Tony CHEMIT at 2017-02-21T11:50:11+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - 3cb19ebc by Tony CHEMIT at 2017-02-21T11:50:12+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 9ff34303 by Tony CHEMIT at 2017-02-21T12:01:18+01:00 update changelog for staging version 5.3.2 - - - - - 04a29ba2 by Tony CHEMIT at 2017-02-24T11:08:09+01:00 Ajout chemin de backups dans la configuration (See #735) - - - - - db280d6d by Tony CHEMIT at 2017-02-24T11:08:59+01:00 Ajout du gestionnaire de sauvegardes (See #735) - - - - - 3c5c7631 by Tony CHEMIT at 2017-02-24T14:28:51+01:00 Au démarrage possibilité de charger la dernière sauvegarde automatique (See #735) - - - - - 2c9f4439 by Tony CHEMIT at 2017-02-24T18:03:37+01:00 Traduction de la nouvelle template (See #735) - - - - - d0b5631a by Tony CHEMIT at 2017-02-25T14:09:52+01:00 Amélioration de la fermeture de l'application (See #735) - - - - - 845c0fdb by Tony CHEMIT at 2017-03-01T16:01:00+01:00 On ne détruit pas la base à la fermeture - - - - - 1d162b3a by Tony CHEMIT at 2017-03-01T16:01:20+01:00 fix site url - - - - - 02a5c01c by Tony CHEMIT at 2017-03-01T16:21:59+01:00 amélioration ouverture base (See #735) - - - - - 07048a0e by Tony CHEMIT at 2017-03-01T16:24:30+01:00 review builds - - - - - 009a43b9 by Tony CHEMIT at 2017-03-01T16:24:42+01:00 Merge branch 'feature/backupStorage' into develop-5.x - - - - - a3b105b9 by Tony CHEMIT at 2017-03-01T16:38:28+01:00 downgrade version - - - - - 2d6e713d by Tony CHEMIT at 2017-03-01T17:24:52+01:00 amélioration ouverture base (See #735) - - - - - ab2efc88 by Tony CHEMIT at 2017-03-01T17:45:55+01:00 optimize dependencies - - - - - fb17d43d by Tony CHEMIT at 2017-03-01T17:46:17+01:00 add missing headers - - - - - 97eadf31 by Tony CHEMIT at 2017-03-01T17:46:46+01:00 Pouvoir modifier le référentiel d'une base locale (See #724) - - - - - 08f84088 by Tony CHEMIT at 2017-03-01T19:03:43+01:00 use maven search bagde - - - - - 126f6a37 by Tony CHEMIT at 2017-03-01T19:03:58+01:00 Improve changelog in about ui - - - - - ca3181ed by Tony CHEMIT at 2017-03-01T19:10:08+01:00 improve code - - - - - 01930f8f by Tony CHEMIT at 2017-03-02T09:45:55+01:00 improve web deploy - - - - - ef268c46 by Tony CHEMIT at 2017-03-02T09:47:45+01:00 fix build number for web application - - - - - f07d5d9a by Tony CHEMIT at 2017-03-02T10:12:22+01:00 fix build number for web application - - - - - 902c4dd4 by Tony CHEMIT at 2017-03-02T10:30:04+01:00 update demo urls - - - - - f5dc88a1 by Tony CHEMIT at 2017-03-02T10:36:40+01:00 improve demo build - - - - - f9e49b1e by Tony CHEMIT at 2017-03-02T11:04:03+01:00 improve readme [skip ci] - - - - - 82e6592a by Tony CHEMIT at 2017-03-02T11:56:37+01:00 fix release build - - - - - 65e55e77 by Tony CHEMIT at 2017-03-02T12:17:33+01:00 fix release build [skip ci] - - - - - 4c53157a by Tony CHEMIT at 2017-03-02T14:37:20+01:00 fix release build [skip ci] - - - - - 9fd7dd08 by Tony CHEMIT at 2017-03-02T15:05:22+01:00 optimize dependencies [skip ci] - - - - - 777ace02 by Tony CHEMIT at 2017-03-02T15:46:00+01:00 fix builds [skip ci] - - - - - a6591545 by Tony CHEMIT at 2017-03-02T16:02:53+01:00 fix site build [skip ci] - - - - - c1cb277f by Tony CHEMIT at 2017-03-02T18:20:51+01:00 mettre dans le même ordre les binders et les décorateurs (See #737) - - - - - 07ea97e9 by Tony CHEMIT at 2017-03-03T14:06:47+01:00 Correction de la valeur non déclanchée lors du changement de section (See #740) - - - - - 26afb510 by Tony CHEMIT at 2017-03-03T14:07:37+01:00 section mal recopiée par hibernate (See #737) - - - - - ef5095cd by Tony CHEMIT at 2017-03-03T17:49:03+01:00 Meilleure gestion de l'action Consolidation pour tenir quelque soit le nombre de marées à traiter (See #732) - - - - - c992525f by Tony CHEMIT at 2017-03-03T18:08:56+01:00 add nuiton before central repo - - - - - bcd48848 by Tony CHEMIT at 2017-03-03T18:12:09+01:00 add nuiton before central repo - - - - - 0f18a58d by Tony CHEMIT at 2017-03-03T19:55:50+01:00 [jgitflow-maven-plugin]updating poms for 5.3.2 branch with snapshot versions - - - - - 60880d56 by Tony CHEMIT at 2017-03-03T19:56:14+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.2' with non-snapshot versions - - - - - b699eabf by Tony CHEMIT at 2017-03-03T20:02:10+01:00 [jgitflow-maven-plugin]merging 'release/5.3.2' into 'master-5.x' - - - - - 30 changed files: - .gitlab-ci.yml - CHANGELOG.md - README.md - application-swing-configuration/src/main/config/ObserveSwingApplication.ini - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties - application-swing/pom.xml - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java - application-swing/src/main/java/fr/ird/observe/application/swing/LocalDatabaseBackupTask.java → application-swing/src/main/java/fr/ird/observe/application/swing/backup/AutomaticLocalDatabaseBackupTask.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/BackupStorage.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/BackupsManager.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/LocalDatabaseBackupTaskSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowAboutAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java - + application-swing/src/main/resources/ftl/initStorage_en.ftl - + application-swing/src/main/resources/ftl/initStorage_es.ftl - + application-swing/src/main/resources/ftl/initStorage_fr.ftl - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - application-web-configuration/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/c0e9ad9b27bb4af19e7b294e3a...