branch develop updated (9113977 -> a3760d9)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wlo. See http://git.codelutin.com/wlo.git from 9113977 fixes #6364 Corrections pour la mise à jour automatique de l'application new c697605 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 81e8998 [maven-release-plugin] copy for tag wlo-1.0 adds c4ac664 [jgitflow-maven-plugin]updating poms for branch '1.1' with snapshot versions new 8017fc5 [jgitflow-maven-plugin]updating poms for branch'release/1.1' with non-snapshot versions new dcd8a25 Merge branch 'release/1.1' new c68c177 Merge branch 'master' into develop new a3760d9 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a3760d96c62588b3ba65a116c6d31cb8bda584d3 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 23 15:24:49 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit c68c17730dec8a813e2a0c9c30d532e2ee8fba43 Merge: c697605 dcd8a25 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 23 15:24:48 2014 +0000 Merge branch 'master' into develop commit c6976058109d99f849b91c1f65a591813b27113d Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 23 15:24:47 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit dcd8a25af8fa80cc720df3f793c33fffc71af51a Merge: 81e8998 8017fc5 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 23 15:24:47 2014 +0000 Merge branch 'release/1.1' commit 8017fc5a9f583dc7aa5a18dd9dda02dff291d005 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 23 13:24:47 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.1' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wlo. See http://git.codelutin.com/wlo.git commit 8017fc5a9f583dc7aa5a18dd9dda02dff291d005 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 23 13:24:47 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.1' with non-snapshot versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1627317..d856272 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wlo</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> <name>WLO</name> <description> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wlo. See http://git.codelutin.com/wlo.git commit dcd8a25af8fa80cc720df3f793c33fffc71af51a Merge: 81e8998 8017fc5 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 23 15:24:47 2014 +0000 Merge branch 'release/1.1' .gitignore | 102 +++++++++++++ pom.xml | 78 +++++----- res/drawable-hdpi/drawer_shadow.9.png | Bin 161 -> 114 bytes .../ifremer/wlo/utils/BigFinFeedReaderRecord.java | 161 --------------------- .../fr/ifremer/wlo/BigFinCommunicationService.java | 52 ++++--- .../fr/ifremer/wlo/CommercialSpeciesActivity.java | 5 +- .../ifremer/wlo/CommercialSpeciesFormActivity.java | 2 +- .../java}/fr/ifremer/wlo/ContextFormActivity.java | 2 +- .../java}/fr/ifremer/wlo/ContextsActivity.java | 2 +- .../java}/fr/ifremer/wlo/DeviceListActivity.java | 19 +-- .../java}/fr/ifremer/wlo/LocationFormActivity.java | 2 +- .../java}/fr/ifremer/wlo/LocationsActivity.java | 4 +- .../java}/fr/ifremer/wlo/MainActivity.java | 4 +- .../java}/fr/ifremer/wlo/MetierFormActivity.java | 2 +- .../java}/fr/ifremer/wlo/MetiersActivity.java | 4 +- .../fr/ifremer/wlo/ScientificSpeciesActivity.java | 4 +- .../ifremer/wlo/ScientificSpeciesFormActivity.java | 2 +- .../java}/fr/ifremer/wlo/VesselFormActivity.java | 11 +- .../java}/fr/ifremer/wlo/VesselsActivity.java | 4 +- .../java}/fr/ifremer/wlo/WeightsActivity.java | 5 +- .../java}/fr/ifremer/wlo/WloApplication.java | 2 +- .../java}/fr/ifremer/wlo/WloBaseActivity.java | 2 +- .../java}/fr/ifremer/wlo/WloBaseListActivity.java | 2 +- .../fr/ifremer/wlo/WloModelEditionActivity.java | 2 +- .../wlo/imports/CalcifiedPartTakingRowModel.java | 2 +- .../wlo/imports/CommercialSpeciesRowModel.java | 4 +- .../fr/ifremer/wlo/imports/LocationRowModel.java | 4 +- .../ifremer/wlo/imports/MensurationRowModel.java | 4 +- .../fr/ifremer/wlo/imports/MetierRowModel.java | 4 +- .../ifremer/wlo/imports/PresentationRowModel.java | 4 +- .../wlo/imports/QualitativeValueRowModel.java | 2 +- .../wlo/imports/ScientificSpeciesRowModel.java | 4 +- .../fr/ifremer/wlo/imports/StateRowModel.java | 4 +- .../fr/ifremer/wlo/imports/VesselRowModel.java | 4 +- .../wlo/imports/WloAbstractImportExportModel.java | 3 +- .../fr/ifremer/wlo/measurement/GraphActivity.java | 6 +- .../fr/ifremer/wlo/measurement/GraphFragment.java | 9 +- .../fr/ifremer/wlo/measurement/LogsFragment.java | 3 +- .../wlo/measurement/MeasurementActivity.java | 12 +- .../measurement/MeasurementsDisplayerFragment.java | 6 +- .../fr/ifremer/wlo/measurement/TableAdapter.java | 4 +- .../fr/ifremer/wlo/measurement/TableFragment.java | 8 +- .../java}/fr/ifremer/wlo/models/BaseModel.java | 2 +- .../fr/ifremer/wlo/models/CategoryWeightModel.java | 4 +- .../ifremer/wlo/models/CommercialSpeciesModel.java | 2 +- .../java}/fr/ifremer/wlo/models/ContextModel.java | 4 +- .../fr/ifremer/wlo/models/HierarchicalModel.java | 2 +- .../java}/fr/ifremer/wlo/models/LocationModel.java | 2 +- .../fr/ifremer/wlo/models/MeasurementModel.java | 2 +- .../fr/ifremer/wlo/models/MeasurementsModel.java | 3 +- .../java}/fr/ifremer/wlo/models/MetierModel.java | 2 +- .../ifremer/wlo/models/ScientificSpeciesModel.java | 3 +- .../java}/fr/ifremer/wlo/models/VesselModel.java | 2 +- .../wlo/models/categorization/CategoryModel.java | 5 +- .../categorization/QualitativeValueModel.java | 4 +- .../models/referentials/CalcifiedPartTaking.java | 4 +- .../wlo/models/referentials/CommercialSpecies.java | 2 +- .../ifremer/wlo/models/referentials/HasCode.java | 2 +- .../ifremer/wlo/models/referentials/Location.java | 2 +- .../wlo/models/referentials/Mensuration.java | 2 +- .../fr/ifremer/wlo/models/referentials/Metier.java | 2 +- .../wlo/models/referentials/Presentation.java | 2 +- .../wlo/models/referentials/ScientificSpecies.java | 2 +- .../fr/ifremer/wlo/models/referentials/State.java | 2 +- .../fr/ifremer/wlo/models/referentials/Vessel.java | 2 +- .../wlo/preferences/CategoryCreationAcivity.java | 4 +- .../wlo/preferences/ListItemPreference.java | 2 +- .../wlo/preferences/MultiSelectItemPreference.java | 2 +- .../wlo/preferences/MultiSelectionActivity.java | 5 +- .../ifremer/wlo/preferences/SettingsActivity.java | 4 +- .../ifremer/wlo/preferences/StringPreference.java | 2 +- .../java}/fr/ifremer/wlo/storage/CsvExporter.java | 5 +- .../java}/fr/ifremer/wlo/storage/DataCache.java | 2 +- .../java}/fr/ifremer/wlo/storage/JsonExporter.java | 24 ++- .../java}/fr/ifremer/wlo/storage/StorageUtils.java | 2 +- .../fr/ifremer/wlo/storage/WloSqlOpenHelper.java | 2 +- .../wlo/utils/AbstractDateTimePickerFragment.java | 2 +- .../ifremer/wlo/utils/BaseModelArrayAdapter.java | 2 +- .../fr/ifremer/wlo/utils/BaseTextWatcher.java | 2 +- .../fr/ifremer/wlo/utils/DatePickerFragment.java | 2 +- .../fr/ifremer/wlo/utils/ImportExportUtil.java | 13 +- .../fr/ifremer/wlo/utils/TimePickerFragment.java | 2 +- .../java}/fr/ifremer/wlo/utils/UIUtils.java | 3 +- .../fr/ifremer/wlo/utils/UpdateCheckTask.java | 2 +- .../ifremer/wlo/utils/WloAutoCompleteTextView.java | 2 +- .../WloAutoCompleteTextViewWithFavorites.java | 4 +- .../ifremer/wlo/utils/WloItemListViewBinder.java | 2 +- .../ifremer/wlo/utils/filechooser/FileDialog.java | 2 +- .../wlo/utils/filechooser/SelectionMode.java | 2 +- 89 files changed, 302 insertions(+), 411 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wlo. See http://git.codelutin.com/wlo.git commit c6976058109d99f849b91c1f65a591813b27113d Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 23 15:24:47 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5bc1f32..c9ba179 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wlo</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1</version> <name>WLO</name> <description> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wlo. See http://git.codelutin.com/wlo.git commit c68c17730dec8a813e2a0c9c30d532e2ee8fba43 Merge: c697605 dcd8a25 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 23 15:24:48 2014 +0000 Merge branch 'master' into develop -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wlo. See http://git.codelutin.com/wlo.git commit a3760d96c62588b3ba65a116c6d31cb8bda584d3 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 23 15:24:49 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c9ba179..5bc1f32 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wlo</artifactId> - <version>1.1</version> + <version>1.1.1-SNAPSHOT</version> <name>WLO</name> <description> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm