fix merge description into another description
[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / service / TaxonNodeServiceImpl.java
2015-11-05 Katja Lutherfix #5341 and fixing deletion of specimen
2015-10-22 Katja LutherRevert "minor"
2015-10-22 Katja Lutherminor
2015-10-21 Katja Lutherminor
2015-10-19 Katja Lutherfix #5179 and adapting the tests because the classifica...
2015-10-15 Katja Lutherfix move taxon node in natural order
2015-10-07 Andreas MüllerMerge branch 'develop' into ticket-5066
2015-09-28 Andreas KohlbeckerMerge branch 'master' into develop
2015-09-28 Andreas Kohlbeckerresolving conficts in project versions after hotfixrelease
2015-09-23 k.lutherfixing merge conflict
2015-09-14 jenkinsMerge branch 'release/3.9.0' root/tags/cdmlib/3.9.0 3.9.0
2015-09-10 Cherian MathewAdd taxon to updated objects when taxon is not to be...
2015-09-10 jenkinsMerge branch 'release/3.8.0' root/tags/cdmlib/3.8.0 3.8.0
2015-09-10 U-BGBM\k.lutherfixing move Accepted taxon to synonym
2015-09-07 Cherian Mathew#5019 Set correct updated objects
2015-09-03 Cherian MathewMake new move method write on commit
2015-09-02 Katja Lutherchanges for tcs import, fixing taxonnodecomparator...
2015-07-16 jenkinsMerge branch 'release/3.7.0' root/tags/cdmlib/3.7.0 3.7.0
2015-07-16 Andreas MüllerFix taxon node comparator handling #4226
2015-06-25 Cherian Mathew#5025 : Add new cdm entity identifier object and use...
2015-06-23 Cherian Mathew#5007 : Correct setting of updated objects when deletin...
2015-06-18 Katja Luther- add @Audited to all type properties
2015-06-15 Cherian MathewMerge branch 'master' of wp5.e-taxonomy.eu:/var/git...
2015-06-12 Cherian MathewMerge branch 'master' of wp5.e-taxonomy.eu:/var/git... remoting-4.0 origin/remoting-4.0 root/branches/cdmlib/remoting-4.0
2015-06-09 Andreas M��llerminor
2015-06-08 Cherian MathewMerge branch 'master' of wp5.e-taxonomy.eu:/var/git...
2015-06-05 Andreas M��llerdefine default sort mode #4226
2015-06-05 Andreas M��llerAdapt enum names for NodeSortMode #4226
2015-06-03 Katja Lutherdelete taxonnode if taxon is used somewhere else fixed
2015-06-02 Andreas M��llermerge trunk into 3.6 branch
2015-06-02 Andreas M��llermerge trunk into 3.6 branch
2015-06-02 Katja Lutherminor
2015-06-02 Katja Lutheradd SortMode enum and change the param for sorting...
2015-05-22 Andreas M��llermerge trunk into model change 3.6
2015-05-21 Cherian MathewMerge branch 'master' of wp5.e-taxonomy.eu:/var/git...
2015-05-11 Katja Luthermake the taxonomic tree editable in natural order ...
2015-05-04 Katja Luther(no commit message)
2015-05-04 Katja Luther(no commit message)
2015-04-22 Katja Luther(no commit message)
2015-03-17 Katja Lutherfix search for common names in editor and minor
2015-03-12 Katja LuthermoveTaxon() with uuids instead of objects as arguments
2015-03-04 Cherian Mathewadded cdmEntity object in UpdateResult and updated...
2015-02-26 Cherian MathewCdmCacherTest : ignoring for now since we have reverted...
2015-02-23 Cherian Mathewmerge from trunk
2015-02-23 Cherian MathewICdmCacher, ICdmUuidCacher, CdmCacher, CdmTermCacher...
2015-02-11 Katja Lutheradd UpdateResult and make DeleteResult a subclass
2015-02-05 Cherian MathewITaxonNodeService, TaxonNodeServiceImpl : added methods...
2015-02-03 Cherian MathewConversationHolderMock : overriding all methods
2015-01-29 Katja Luther(no commit message)
2015-01-06 Katja Luther(no commit message)
2014-12-09 Patric Plitznermerge-update from trunk
2014-12-03 Katja LutherisDeletable returns DeleteResult
2014-09-17 Patric Plitznermerge-update from trunk
2014-09-15 Katja Lutherfix delete taxon nodes with children
2014-08-04 Patric Plitznermerge-update from trunk
2014-07-30 Katja Lutherreturn value of delete methods are DeleteResults
2014-05-29 Katja Lutherset sorting in getChildNodes optional & minor for delet...
2014-05-20 Andreas Müllerremove deprecated method
2014-05-15 Katja Lutheradapt the service method loadChildNodesOfTaxonNode
2014-05-05 Katja Lutherif deletion of an object fails the method does not...
2014-04-30 Alexander OppermannChanged limits to INTEGER, so it is possible to nullify...
2014-04-10 Alexander Oppermann*added service layer method: countAllNodesForClassification
2014-04-10 Alexander Oppermann*Update of the CSVExport WS.
2014-04-08 Katja Lutheradd service to get all nodes of a classification
2014-02-11 Katja Luthermove taxon to homotypical synonym fixed
2014-02-10 Katja Luther(no commit message)
2014-02-10 Katja Lutherfix changeTaxonToSynonym with homotypic Synonyms
2014-02-03 Katja Lutherfix bug in change accepted taxa to synonym with taxonre...
2014-01-29 Andreas Müllerfix accepted to synonym operation by removing call...
2014-01-29 Alexander Oppermannmerged trunk into branch ui-gwt origin/ui-gwt root/branches/cdmlib/ui-gwt
2014-01-14 Katja LutherrootNode adaption for classification
2013-12-03 Alexander Oppermanndaily merge of svn trunk into branch
2013-12-02 Katja Luther(no commit message)
2013-12-02 Alexander Oppermannupdated to trunk
2013-11-18 l.morrisMerged from trunk to statistics branch
2013-11-06 Katja Luther(no commit message)
2013-11-06 Katja Lutherminor
2013-10-30 Katja Lutherservice adaption for deletion of a selection of taxonnodes
2013-10-28 Katja Lutheradd deleteTaxonNode service method
2013-10-24 Alexander OppermannMajor Update to cdmlib-3.3
2013-10-22 s.buerscommit after merge from trunc wiki_statistics origin/wiki_statistics root/branches/cdmlib/wiki_statistics
2013-10-16 Andreas Kohlbeckerdocumentation
2013-10-16 Andreas Kohlbeckerwhitespace
2013-10-16 Andreas Kohlbeckerfixing #3792 (permission problem when turning a taxon...
2013-10-15 Katja Lutherfixed problem with deletion of nodes.
2013-10-09 Katja Luthermerging delete functionality into trunk
2013-09-26 Andreas Kohlbeckermoving all beaninitializer classes to new package ...
2013-09-25 Andreas Müllerreintegrate cdm-3.3 branch into trunk
2013-09-25 Andreas Müllerminor
2013-09-25 Andreas Müllerremove old TermsDataSet
2013-09-18 Patric Plitznermerge-update from trunk
2013-09-17 Andreas Müllerchange parent pom version in 3.3
2013-08-27 Andreas Müllerminor
2013-07-25 Katja Lutherminor changes
2013-07-22 Andreas Müllermerge trunk to cdm-3.3 branch
2013-07-22 Andreas Müllersome changes to the update script
2013-07-03 Alexander OppermannMerged the latest changes from the trunk into the branc...
2013-07-02 Andreas Müllerimplement sortIndex for TaxonNode and remove usedSynony...
2013-04-09 Andreas Müllermerge hibernate4 migration branch into trunk
2013-04-09 Andreas Müllermerge trunk to hibernate4
next