Fix merge problems
[cdmlib.git] / cdmlib-ext /
2015-11-23 Andreas MüllerFurther adapt to new jackson and new lucene version...
2015-11-23 Andreas MüllerUpgrade to spring 4.2.2, spring-security 4.0.2 and...
2015-11-12 Andreas Kohlbecker#2273 removing HACK: hardcoded distribution status...
2015-10-26 Cherian Mathew#5349 Add http invoker service config files to cdmlib...
2015-10-07 Andreas MüllerMerge branch 'develop' into ticket-5066
2015-09-28 Andreas KohlbeckerUpdating develop poms back to pre merge state
2015-09-28 Andreas KohlbeckerUpdating develop poms to hotfix version to avoid merge...
2015-09-28 Andreas KohlbeckerMerge branch 'hotfix/3.11.1' root/tags/cdmlib/3.11.1 3.11.1
2015-09-28 Andreas Kohlbeckerupdating poms for branch'hotfix/3.11.1' with non-snapsh...
2015-09-28 Andreas Kohlbeckerresolving conficts in project versions after hotfixrelease
2015-09-28 Andreas KohlbeckerMerge branch 'hotfix/3.11.1'
2015-09-28 jenkinsupdating poms for 3.11.1 branch with snapshot versions
2015-09-16 jenkinsUpdating develop poms back to pre merge state
2015-09-16 jenkinsupdating develop poms to master versions to avoid merge...
2015-09-16 jenkinsMerge branch 'release/3.11.0' root/tags/cdmlib/3.11.0 3.11.0
2015-09-16 jenkinsupdating poms for branch'release/3.11.0' with non-snaps...
2015-09-16 jenkinsupdating poms for 3.12.0-SNAPSHOT development
2015-09-15 jenkinsUpdating develop poms back to pre merge state
2015-09-15 jenkinsMerge branch 'master' into develop
2015-09-15 jenkinsupdating develop poms to master versions to avoid merge...
2015-09-15 jenkinsMerge branch 'release/3.10.0' root/tags/cdmlib/3.10.0 3.10.0
2015-09-15 jenkinsupdating poms for branch'release/3.10.0' with non-snaps...
2015-09-15 jenkinsupdating poms for 3.11.0-SNAPSHOT development
2015-09-15 Andreas M��llerremove ignore from IPNI test
2015-09-15 Andreas M��llerIgnore Ipni test preliminary
2015-09-14 jenkinsUpdating develop poms back to pre merge state
2015-09-14 jenkinsupdating develop poms to master versions to avoid merge...
2015-09-14 jenkinsMerge branch 'release/3.9.0' root/tags/cdmlib/3.9.0 3.9.0
2015-09-14 jenkinsupdating poms for branch'release/3.9.0' with non-snapsh...
2015-09-14 jenkinsupdating poms for 3.10.0-SNAPSHOT development
2015-09-14 Andreas MüllerPreliminary ignore IPNI test
2015-09-10 jenkinsUpdating develop poms back to pre merge state
2015-09-10 jenkinsupdating develop poms to master versions to avoid merge...
2015-09-10 jenkinsMerge branch 'release/3.8.0' root/tags/cdmlib/3.8.0 3.8.0
2015-09-10 jenkinsupdating poms for branch'release/3.8.0' with non-snapsh...
2015-09-10 jenkinsupdating poms for 3.9.0-SNAPSHOT development
2015-09-10 Andreas KohlbeckerRevert "updating poms for 3.9.0-SNAPSHOT development"
2015-09-10 jenkinsupdating poms for 3.9.0-SNAPSHOT development
2015-09-08 Andreas MüllerUpdate test database schema to allow null for consensus...
2015-09-08 Andreas MüllerUpdate test database schema to allow null for consensus...
2015-09-01 Patrick PlitznerMerge branch 'develop' into abcd abcd origin/abcd root/branches/cdmlib/abcd
2015-08-31 Andreas Kohlbecker#5112 - hiding fall back areas from the hierachchic...
2015-08-31 Patrick PlitznerIncrease reference titlecache in test DBs
2015-08-17 Patrick PlitznerCheck capabilites of BioCase provider for supported...
2015-08-12 Patrick PlitznerFix UniqueKey issue for sequence ciations
2015-07-24 Andreas Kohlbecker#2988 avoiding NPE and allowing empty omitlevels (bug...
2015-07-24 Andreas Kohlbeckerminor code cleaning
2015-07-23 Andreas Kohlbecker#4408 removing occurences of fallbackAreaMarkerType...
2015-07-22 Andreas Kohlbeckermerging fallbackAreaFilter rule into hiddenArea rule
2015-07-22 Andreas Kohlbeckerall rules separated
2015-07-16 jenkinsUpdating develop poms back to pre merge state
2015-07-16 jenkinsupdating develop poms to master versions to avoid merge...
2015-07-16 jenkinsupdating poms for branch'release/3.7.0' with non-snapsh...
2015-07-16 jenkinsupdating poms for 3.8.0-SNAPSHOT development
2015-07-16 Cherian MathewRevert back to earlier version
2015-07-15 jenkinsUpdating develop poms back to pre merge state
2015-07-15 jenkinsupdating develop poms to master versions to avoid merge...
2015-07-15 jenkinsMerge branch 'release/3.7.0' attic/tags/cdmlib/3.7.0/24929
2015-07-15 jenkinsupdating poms for branch'release/3.7.0' with non-snapsh...
2015-07-15 jenkinsupdating poms for 3.8.0-SNAPSHOT development
2015-07-15 Cherian MathewRemove unnecessary version property in sub-modules
2015-07-15 Cherian MathewRevert back to version 3.7.0-SNAPSHOT
2015-07-15 jenkinsUpdating develop poms back to pre merge state
2015-07-15 jenkinsupdating develop poms to master versions to avoid merge...
2015-07-15 jenkinsMerge branch 'release/3.7.0'
2015-07-15 jenkinsupdating poms for branch'release/3.7.0' with non-snapsh...
2015-07-15 jenkinsupdating poms for 3.8.0-SNAPSHOT development
2015-07-15 jenkinsupdating poms for 3.7.0 branch with snapshot versions
2015-07-15 Cherian MathewRevert versions back to current
2015-07-15 jenkinsUpdating develop poms back to pre merge state
2015-07-15 jenkinsupdating develop poms to master versions to avoid merge...
2015-07-15 jenkinsMerge branch 'release/3.13' attic/tags/cdmlib/3.13/24840
2015-07-15 jenkinsupdating poms for branch'release/3.13' with non-snapsho...
2015-07-15 jenkinsupdating poms for 3.14-SNAPSHOT development
2015-07-15 jenkinsupdating poms for 3.13-SNAPSHOT development
2015-07-15 jenkinsupdating poms for 3.12-SNAPSHOT development
2015-07-15 jenkinsupdating poms for 3.11-SNAPSHOT development
2015-07-15 Patrick PlitznerMerge branch 'develop' into abcd attic/branches/cdmlib/abcd/25144
2015-07-14 jenkinsupdating poms for 3.10-SNAPSHOT development attic/branches/cdmlib/develop/24823
2015-07-14 jenkinsupdating poms for 3.9-SNAPSHOT development
2015-07-14 jenkinsupdating poms for 3.8-SNAPSHOT development
2015-07-14 Cherian MathewUpdate all version to next snapshot and remove duplicat...
2015-07-14 Katja Luther(no commit message)
2015-07-06 Patrick PlitznerMerge branch 'master' into abcd
2015-07-01 Andreas Kohlbeckerimplementing fallbackArea rule into DescriptionUtility...
2015-07-01 Andreas Kohlbeckeradapting tests to changes in EuroPlusMedCondensedDistri...
2015-06-30 Andreas Kohlbeckercorrecting the cleanup of sub areas labes in condensed...
2015-06-30 Andreas Kohlbeckerapplying subAreaPreference exclusively for maps
2015-06-29 Andreas Kohlbeckercorrectly assigning INTRODUCED_NATURALIZED to n=natural...
2015-06-29 Andreas Kohlbeckerremoving obsolete warning from log - #3907
2015-06-25 Andreas Kohlbeckersome bugfixes in CondensedDistribution composition...
2015-06-25 Andreas Kohlbeckerminor documentation cleaning
2015-06-25 Andreas Kohlbeckercomposition of condensed distribution fully implemented...
2015-06-25 Andreas Kohlbeckerbase framework for condensedDistributions implemented...
2015-06-25 Andreas Kohlbeckerperformance: avoiding second distribution filtering...
2015-06-25 Andreas Kohlbeckerreplacing 'non-java-doc by {@inheritDoc}
2015-06-24 Andreas MüllerImprove E+M post import methods #3979
2015-06-24 Andreas MüllerAdd E+M vocabulary uuid to E+M-Transformer
2015-06-23 Andreas MüllerRename NonViralName.xxxAuthorTeam to xxxAuthorship...
2015-06-23 Andreas Kohlbecker3.6.2 has just been released, setting version to 3...
next