Fix merge problems
[cdmlib.git] / cdmlib-ext /
2016-08-12 Katja Lutherspecimen import changes
2016-07-27 Andreas Müller#6000 Use new CASUAL Method instead of derpeacted INTRO...
2016-07-27 Andreas Müller#6000 Unify some PresenceAbsenceTerms (merge naturalize...
2016-07-19 Katja Lutherset the tests to ignore until the dna import is fixed...
2016-07-15 Andreas MüllerUse EN_DASH in E+M Condensed Distribution
2016-07-11 Katja LutherMerge branch 'develop' of ssh://dev.e-taxonomy.eu/var...
2016-07-11 Andreas KohlbeckerIt seems as if oclc number are no longer supported...
2016-07-08 Andreas MüllerUnignore MobotOpenUrlServices
2016-07-07 Patrick PlitznerMerge branch 'develop' into csvExport csvExport origin/csvExport root/branches/cdmlib/csvExport
2016-07-06 jenkinsUpdating develop poms back to pre merge state attic/branches/cdmlib/develop/28643
2016-07-06 jenkinsupdating develop poms to master versions to avoid merge...
2016-07-06 jenkinsMerge branch 'release/4.2.0' root/tags/cdmlib/4.2.0 root/trunk/cdmlib 4.2.0
2016-07-06 jenkinsupdating poms for branch'release/4.2.0' with non-snapsh...
2016-07-06 jenkinsupdating poms for 4.3.0-SNAPSHOT development
2016-07-05 Katja Lutherset failing tests to ignore
2016-07-05 Andreas KohlbeckerisServiceAvailable test for MobotOpenUrlServiceWrapperTest
2016-07-01 Andreas MüllerAdapt test dataset loading to standard path
2016-06-23 Andreas Müller#5909 revert unwanted commit
2016-06-23 Andreas Müller#5909 fix failing test
2016-06-23 Katja Lutherminor
2016-06-23 Katja LutherMerge branch 'develop' of ssh://dev.e-taxonomy.eu/var...
2016-06-21 Andreas Kohlbecker#4149 workaround implemented for #2707 completely removed
2016-06-21 Andreas MüllerUnignore GBIF Test
2016-06-15 Andreas MüllerFix Gbif test
2016-06-15 Andreas Müllertmp ignore gbif test
2016-06-15 Andreas MüllerMove E+M condensed string test
2016-06-15 Andreas MüllerFix failing test for Euro+Med condensed string
2016-06-15 Andreas MüllerFix NPE for distributions without area in composer
2016-06-14 Andreas MüllerFix sorting problem for subareas in CubaCondensedDistri...
2016-06-03 Katja Lutherfix CubaCondensedStringComposer
2016-06-02 Andreas Kohlbecker#4410 removing default status finally also from the...
2016-06-02 jenkinsUpdating develop poms back to pre merge state
2016-06-02 jenkinsMerge branch 'master' into develop
2016-06-02 jenkinsUpdating develop poms to hotfix version to avoid merge...
2016-06-02 jenkinsMerge branch 'hotfix/4.1.1' root/tags/cdmlib/4.1.1 4.1.1
2016-06-02 jenkinsupdating poms for branch'hotfix/4.1.1' with non-snapsho...
2016-06-02 Andreas MüllerFirst step to combine Distribution Composers
2016-06-01 jenkinsupdating poms for 4.1.1 branch with snapshot versions
2016-05-31 jenkinsUpdating develop poms back to pre merge state
2016-05-31 jenkinsupdating develop poms to master versions to avoid merge...
2016-05-31 jenkinsMerge branch 'release/4.1.0' root/tags/cdmlib/4.1.0 4.1.0
2016-05-31 jenkinsupdating poms for branch'release/4.1.0' with non-snapsh...
2016-05-31 jenkinsupdating poms for 4.2.0-SNAPSHOT development
2016-05-25 Andreas MüllerRemove generics from Reference in cdmlib (except for...
2016-05-09 Andreas Müllerminor
2016-05-03 jenkinsUpdating develop poms back to pre merge state
2016-05-03 jenkinsupdating develop poms to master versions to avoid merge...
2016-05-03 jenkinsMerge branch 'release/4.0.0' root/tags/cdmlib/4.0.0 4.0.0
2016-05-03 jenkinsupdating poms for branch'release/4.0.0' with non-snapsh...
2016-05-02 jenkinsupdating poms for 4.1.0-SNAPSHOT development
2016-05-02 Andreas MüllerUpdate Cuba Condensed String handling
2016-04-22 Andreas MüllerUnignore IPNI Service
2016-04-19 Andreas Kohlbecker#5482 web services now support different orderBy modes
2016-04-15 Andreas MüllerLatest changes to CubaDistributionComposer
2016-04-07 Andreas MüllerAdd test for condensed distribution string #5682
2016-04-07 Andreas MüllerDeproxy status in Condensed String #5682
2016-04-07 Andreas MüllerImprove condensed string for Cuba (still not yet ready...
2016-04-07 Katja LutherMerge branch 'develop' of ssh://dev.e-taxonomy.eu/var...
2016-04-06 Andreas MüllerFix NPE in FloraCubaCondensedDistributionComposer ...
2016-04-05 Andreas MüllerAdd status for doubtfully native: reported in error...
2016-04-05 Andreas MüllerFirst implementatio for Cuban Condensed Distribution...
2016-04-05 Andreas MüllerSymbols for Cuba Condensed Distribution String added
2016-04-05 Andreas KohlbeckerCondensedDistributionCompose for FloraCuba
2016-04-05 Andreas KohlbeckerCondensedDistributionCompose for FloraCuba
2016-04-04 Andreas MüllerPreliminary ignore IPNI tests
2016-04-04 Andreas MüllerImplement natural ordering for distributions in data...
2016-04-04 Andreas MüllerUnignore IPNI Service test again
2016-03-31 Andreas MüllerSet IPNI Service Test preliminary to ignore
2016-03-23 Andreas MüllerUnignore IPNI Test
2016-03-23 Andreas MüllerPreliminary set IPNI tests to ignore
2016-03-02 Andreas MüllerUpdate cdmlib version from 3.13.0-SNAPSHOT to 4.0.0...
2016-02-15 jenkinsMerge branch 'hotfix/3.12.4' into develop
2016-02-12 jenkinsupdating poms for branch'hotfix/3.12.4' with non-snapsh...
2016-02-12 jenkinsupdating poms for branch'hotfix/3.12.4' with non-snapsh... attic/tags/cdmlib/3.12.4/27239
2016-02-12 Andreas MüllerFix javassist error for specimen cache strategy loading...
2016-02-11 jenkinsupdating poms for 3.12.4 branch with snapshot versions
2016-02-10 Andreas KohlbeckerMerge branch 'hotfix/3.12.3' into develop
2016-02-10 jenkinsMerge branch 'hotfix/3.12.3' root/tags/cdmlib/3.12.3 3.12.3
2016-02-10 jenkinsupdating poms for branch'hotfix/3.12.3' with non-snapsh...
2016-02-03 jenkinsupdating poms for 3.12.3 branch with snapshot versions
2016-01-20 Andreas MüllerAdapt log4j.properties to hibernate deprecated logging...
2016-01-18 Andreas Kohlbecker#5479 preliminar solution for user defined presenceAbse...
2016-01-11 jenkinsMerge branch 'hotfix/3.12.2' root/tags/cdmlib/3.12.2 3.12.2
2016-01-11 jenkinsupdating poms for branch'hotfix/3.12.2' with non-snapsh...
2016-01-11 jenkinsupdating poms for 3.12.2 branch with snapshot versions
2016-01-11 Andreas Kohlbeckerfixing project versions root/tags/cdmlib/3.12.1 3.12.1
2016-01-11 Andreas KohlbeckerMerge branch 'hotfix/3.12.1' into develop
2016-01-08 jenkinsupdating poms for 3.12.1 branch with snapshot versions
2015-12-21 Andreas Kohlbeckerresolving conflicts after merge of ticket_4716 into...
2015-12-21 jenkinsUpdating develop poms back to pre merge state
2015-12-21 jenkinsupdating develop poms to master versions to avoid merge...
2015-12-21 jenkinsMerge branch 'release/3.12.0' root/tags/cdmlib/3.12.0 3.12.0
2015-12-21 jenkinsupdating poms for branch'release/3.12.0' with non-snaps...
2015-12-18 jenkinsupdating poms for 3.13.0-SNAPSHOT development
2015-12-18 Andreas MüllerFix TransientObjectException for distribution map ...
2015-12-17 Andreas MüllerCleanup description generics (related to #5357)
2015-12-16 Patrick PlitznerIncrease Gbif webservice version number #4571
2015-12-11 Andreas Kohlbeckerorganizing imports
2015-11-23 Andreas Müllermigrate to hibernate 5 for cdmlib-services and cdmlib...
2015-11-23 Andreas MüllerUpgrade to hibernate 5 with persistence tests running...
next