Tony CHEMIT pushed to branch master at ultreiaio / ird-t3 Commits: 8230971e by Tony CHEMIT at 2018-03-23T19:08:34Z [jgitflow-maven-plugin]updating poms for 2.6-SNAPSHOT development[skip ci] - - - - - eec7d7d5 by Tony CHEMIT at 2018-03-23T19:15:11Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - dee53485 by Tony CHEMIT at 2018-03-23T19:15:11Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 1d637fad by Tony CHEMIT at 2018-03-23T19:15:11Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 4e78f0c0 by Tony CHEMIT at 2018-03-23T19:45:33Z fix ci [skip ci] - - - - - a580a2c3 by Tony CHEMIT at 2018-03-30T09:44:16Z fix doc - - - - - 77fda386 by Tony CHEMIT at 2018-03-30T09:45:30Z add comment in installer - - - - - b9691baf by Tony CHEMIT at 2018-03-30T11:14:34Z [IMPORT] Il manque un lien «Importer une autre marée» (closes #304) - - - - - 83f43d07 by Tony CHEMIT at 2018-04-04T20:27:58Z Correction des captures à utiliser dans le niveau 3 (See #263) - - - - - f7b27df4 by Tony CHEMIT at 2018-04-05T15:39:09Z [N3] Option à supprimer sur le N3 (closes #307) - - - - - a4966d74 by Tony CHEMIT at 2018-04-05T16:56:16Z Mise en page de certains écrans de configuration (Closes #306) - - - - - fadf16a7 by Tony CHEMIT at 2018-04-05T17:04:02Z [jgitflow-maven-plugin]updating poms for branch'release/2.6' with non-snapshot versions[skip ci] - - - - - e129e104 by Tony CHEMIT at 2018-04-05T17:08:49Z [jgitflow-maven-plugin]merging 'release/2.6' into 'master' - - - - - 30 changed files: - .gitlab-ci.yml - pom.xml - src/site/markdown/installer.md.vm - t3-actions/pom.xml - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Configuration.java - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action_en.ftl - t3-domain/pom.xml - t3-input-avdthv33/pom.xml - t3-input-avdthv35/pom.xml - t3-input-avdthv36/pom.xml - t3-installer/pom.xml - t3-installer/src/main/assembly/dist/db.properties - t3-msaccess-importer/pom.xml - t3-output-balbayav32/pom.xml - t3-web/pom.xml - t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step1Action.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step2Action.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3ConfigureAction.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3RunAction.java - t3-web/src/main/resources/i18n/t3-web_en_GB.properties - t3-web/src/main/resources/i18n/t3-web_fr_FR.properties - t3-web/src/main/webapp/WEB-INF/jsp/admin/deleteTripConfirm.jsp - t3-web/src/main/webapp/WEB-INF/jsp/admin/tripListGrid.jsp - t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF1Config.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF2Config.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeSetDurationAndPositiveSetCountConfig.jsp The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/d2f28d83aa7cf8c5f09558b4f1adc319... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/d2f28d83aa7cf8c5f09558b4f1adc319... You're receiving this email because of your account on gitlab.com.