Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: f6a02c54 by 166231 at 2017-08-19T11:52:10+00:00 [jgitflow-maven-plugin]updating poms for 7.0-RC-7-SNAPSHOT development[skip ci] - - - - - 24801cee by 166231 at 2017-08-19T12:01:26+00:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 5394ba53 by 166231 at 2017-08-19T12:01:26+00:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - de93e318 by 166231 at 2017-08-19T12:01:27+00:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 81510ce5 by 166231 at 2017-08-19T12:04:32+00:00 Update changelog after stage of milestone 7.0-RC-6 [skip ci] - - - - - 3c96e740 by Tony CHEMIT at 2017-08-24T16:30:44+02:00 Improve i18n keys (See #855) - - - - - 602be994 by Tony CHEMIT at 2017-08-24T16:53:40+02:00 Improve i18n keys (See #855) : sanitize i18n keys - - - - - 6d8a5a83 by Tony CHEMIT at 2017-08-24T21:36:14+02:00 Impossible de recopier les valeurs des matérials via les actions en bas (See #856) - - - - - c95b2094 by Tony CHEMIT at 2017-08-24T21:37:58+02:00 Lors de la création d'un dcp, les matériaux ne sont pas validés si on y touche pas (See #857) - - - - - 41db386d by Tony CHEMIT at 2017-08-24T21:44:38+02:00 Improve i18n keys (See #855) : mise en place des nouveaux décorateurs - - - - - 1dd7775c by Tony CHEMIT at 2017-08-24T22:42:00+02:00 Impossible d'accéder au menu configuration lorsqu'une base est chargée (See #858) - - - - - d1285f4f by Tony CHEMIT at 2017-08-24T22:57:27+02:00 up toolkit - - - - - 4f3e50ee by Tony CHEMIT at 2017-08-25T02:20:56+02:00 Ajout du zoom +/- sur les cartes (See #859) - - - - - 2288c30b by Tony CHEMIT at 2017-08-25T17:33:56+02:00 revue des templates de tickets [skip ci] - - - - - a5b592a6 by Tony CHEMIT at 2017-08-25T17:40:31+02:00 Ajout d'un nouvel éditeur de température qui permet les conversions °C/°F (See #860) - - - - - 742c43b1 by Tony CHEMIT at 2017-08-25T17:50:15+02:00 revue des templates de tickets [skip ci] - - - - - d355814e by Tony CHEMIT at 2017-08-25T18:24:09+02:00 Improve i18n keys (See #855) : uniformisation des clefs pour les constantes - - - - - 5e416e5a by Tony CHEMIT at 2017-08-25T19:32:14+02:00 up jaxx - - - - - c242a069 by Tony CHEMIT at 2017-08-30T17:39:00+02:00 Hum je vais commenter ce commit..... mais plus tard..... stop... over.... - - - - - 626a3c3a by Tony CHEMIT at 2017-08-30T23:31:07+02:00 Storm numero deux : on reintroduit le module dto, et on génére tous les binders dans les modules des objets crées, pratique... - - - - - 296e36a8 by Tony CHEMIT at 2017-08-31T00:38:59+02:00 fix decorate issues + add test - - - - - 304313f0 by Tony CHEMIT at 2017-08-31T00:39:10+02:00 fix old binder generic order - - - - - 6c5dba8d by Tony CHEMIT at 2017-08-31T02:03:25+02:00 fix decorator (the test is here to prove it :) + still renaming some generic order - - - - - 4ab85dc2 by Tony CHEMIT at 2017-08-31T02:08:37+02:00 validators in validation module ? - - - - - 57f320a5 by Tony CHEMIT at 2017-08-31T02:26:55+02:00 up toolkit and optimize dependencies - - - - - ad003551 by Tony CHEMIT at 2017-08-31T13:24:04+02:00 fix typo - - - - - 86817ff9 by Tony CHEMIT at 2017-08-31T14:10:45+02:00 add a check to be sure ui are not initialized twice - - - - - 7965b5b8 by Tony CHEMIT at 2017-08-31T14:10:49+02:00 up toolkit - - - - - b8f1b435 by Tony CHEMIT at 2017-08-31T20:07:58+02:00 L'assistant de migration de la RC6 ne démarre pas (See #864) - - - - - c7a89f44 by Tony CHEMIT at 2017-08-31T20:21:07+02:00 move data dto to a real package like for referentials - - - - - d00daa68 by Tony CHEMIT at 2017-09-01T15:43:24+02:00 [PS][Echantillons][Faune accessoires] Report du type de mensuration standard (See #835) - - - - - cbee8b09 by Tony CHEMIT at 2017-09-01T15:45:10+02:00 Amélioration des logs (on essaye de ne plus afficher les détails techniques (topia par exemple) - - - - - 7719a794 by Tony CHEMIT at 2017-09-01T17:51:08+02:00 Rethink modules for services (remove services-runner + rename to local and client) - - - - - 553dc4da by Tony CHEMIT at 2017-09-04T00:27:33+02:00 introduce spi api - - - - - ec066c75 by Tony CHEMIT at 2017-09-04T00:42:45+02:00 optimize dependencies - - - - - 320f090d by Tony CHEMIT at 2017-09-05T19:37:20+02:00 Simplify jobs - - - - - 7e25c9db by Tony CHEMIT at 2017-09-05T20:21:17+02:00 use toolkit 1.3 with new very nice apis - - - - - 2b89c068 by Tony CHEMIT at 2017-09-05T23:43:00+02:00 move some tests + use new pom and new deploy layout - - - - - d3dbb631 by Tony CHEMIT at 2017-09-05T23:48:38+02:00 fix snapshot - - - - - b5f98dbe by Tony CHEMIT at 2017-09-05T23:49:08+02:00 [jgitflow-maven-plugin]updating poms for 7.0-RC-7 branch with snapshot versions[skip ci] - - - - - ed6015eb by Tony CHEMIT at 2017-09-05T23:49:26+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-7' with non-snapshot versions[skip ci] - - - - - e6a6b953 by Tony CHEMIT at 2017-09-06T00:03:43+02:00 [jgitflow-maven-plugin]merging 'release/7.0-RC-7' into 'master' - - - - - 30 changed files: - .gitlab-ci.yml - .gitlab/issue_templates/Bug-6.md → .gitlab/issue_templates/Contrat-AZTI-2017-Anomalie.md - + .gitlab/issue_templates/Contrat-AZTI-2017-Evolution.md - .gitlab/issue_templates/Bug.md → .gitlab/issue_templates/Contrat-CodeLutin-2016-Anomalie.md - + .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md - + .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md - + .gitlab/issue_templates/Evolution future.md - − .gitlab/issue_templates/Feature-6.md - − .gitlab/issue_templates/Feature-IRD.md - − .gitlab/issue_templates/Feature.md - CHANGELOG.md - CONTRIBUTING.md - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/constants/CreationMode.java - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client-configuration/src/main/resources/log4j.properties - client-configuration/src/main/resources/observe-log4j.properties - client/pom.xml - client/src/main/ftl/validationReport_en.ftl - client/src/main/ftl/validationReport_es.ftl - client/src/main/ftl/validationReport_fr.ftl - client/src/main/java/fr/ird/observe/client/FloatingObjectReferencesManager.java → client/src/main/java/fr/ird/observe/client/FloatingObjectPresetsManager.java - client/src/main/java/fr/ird/observe/client/ObserveRunner.java - client/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client/src/main/java/fr/ird/observe/client/backup/BackupsManager.java - client/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/971ada96943be4511a47b2fb3ed... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/971ada96943be4511a47b2fb3ed... You're receiving this email because of your account on gitlab.com.