Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 84479565 by 166231 at 2017-09-11T11:19:07Z [jgitflow-maven-plugin]updating poms for 7.0-RC-9-SNAPSHOT development[skip ci] - - - - - 4ad06e3c by 166231 at 2017-09-11T11:35:03Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 782d0874 by 166231 at 2017-09-11T11:35:05Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 745f5026 by 166231 at 2017-09-11T11:35:07Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 72fc3de0 by 166231 at 2017-09-11T11:41:09Z Update changelog after stage of milestone 7.0-rc-8 [skip ci] - - - - - d1e8fb91 by Tony CHEMIT at 2017-09-11T11:51:01Z Update changelog after stage of milestone 7.0-rc-8 [skip ci] - - - - - 7c9acf7b by Tony CHEMIT at 2017-09-11T11:52:32Z update changelog - - - - - 2ec5c505 by Tony CHEMIT at 2017-09-12T20:38:03Z rename models (build but tests are dead) [skip ci] - - - - - af24ebd8 by Tony CHEMIT at 2017-09-12T20:41:10Z fix typo - - - - - 3d8a84e6 by Tony CHEMIT at 2017-09-13T10:54:46Z Revert lost commit, somewhere in 7.0-RC-8 - - - - - cc459a56 by Tony CHEMIT at 2017-09-14T12:22:40Z Renommage de certaines tables du modèle palangre en les suffixant par Obs (see #873) (migration et adaptations) - - - - - 95e06f56 by Tony CHEMIT at 2017-09-14T12:23:50Z Merge branch 'feature/873' into 'develop' See #873 See merge request ultreiaio/ird-observe!4 - - - - - 2cc074d0 by Tony CHEMIT at 2017-09-14T15:08:41Z Déplacer le référentiel Wind dans le schema commun (See #874) + fix obs migration for pg (See #873) - - - - - 08b08fdc by Tony CHEMIT at 2017-09-14T15:48:36Z Tranductions du référentiel Wind (See #875) - - - - - 699b45af by Tony CHEMIT at 2017-09-18T19:31:10Z fix some replication pb (for extra columns) + use new entity context api - - - - - 15fad292 by Tony CHEMIT at 2017-09-19T10:13:57Z use last eugene version - - - - - 08df2e60 by Tony CHEMIT at 2017-09-19T10:43:46Z use last pom - - - - - 778ed522 by Tony CHEMIT at 2017-09-19T10:44:08Z let's use very last spi api - - - - - 0be8b4f1 by Tony CHEMIT at 2017-09-19T11:38:18Z prepare next release - - - - - d2fa4fce by Tony CHEMIT at 2017-09-19T11:52:08Z [jgitflow-maven-plugin]updating poms for 7.0-RC-9 branch with snapshot versions[skip ci] - - - - - ea6d4813 by Tony CHEMIT at 2017-09-19T11:52:28Z [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-9' with non-snapshot versions[skip ci] - - - - - dae5c61e by Tony CHEMIT at 2017-09-19T11:59:19Z [jgitflow-maven-plugin]merging 'release/7.0-RC-9' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client-configuration/pom.xml - client/pom.xml - client/src/main/assembly/dist/obstuna-admin/extra/create-postgis-4-activity-longine.sql - client/src/main/java/fr/ird/observe/client/db/constants/DataContextType.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivityLonglineSetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseOpenUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglinesUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineObssUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ObserveFocusManager.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUI.jcss → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUIHandler.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUIModel.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglinesUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglinesUI.jcss → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglinesUIHandler.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglinesUIModel.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionUI.jcss → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionUIHandler.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/HooksCompositionUIModel.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BasketsTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionUI.jcss → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionUIHandler.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionUIModel.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6fedb21f3bb9f29859dd7f83e12... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6fedb21f3bb9f29859dd7f83e12... You're receiving this email because of your account on gitlab.com.