Project

General

Profile

Statistics
| Branch: | Tag: | Revision:

# Date Author Comment
21d1be03 11/23/2015 04:10 PM Andreas Müller

Fix bug for embeddable classes in AdvancedBeanInitializer #5383

cd02d8bd 11/17/2015 03:54 PM Andreas Müller

Fix bug for embeddable classes in AdvancedBeanInitializer #5383

3dea8ed1 11/17/2015 02:46 PM Katja Luther

fixing #4878

2ae69503 11/11/2015 10:38 AM Patrick Plitzner

Add orphanRemoval to SingleReadAlignment set of Sequence #5200

6aa0af63 11/10/2015 12:34 PM Katja Luther

fixing #5303

1b12bb24 11/10/2015 12:30 PM Katja Luther

fixing #5303

455c5da0 11/10/2015 11:56 AM Patrick Plitzner

Set singleRead to null when removing SingleReadAlignment from sequence
to avoid "object would be re-saved" #5200

47ff0a08 11/10/2015 09:41 AM Katja Luther

Revert "accept the change from a number to null in TimePeriod fields #5319"

This reverts commit a3960fa7c279f2aa9fafbefde098c529e269d382.

3db5c325 11/05/2015 12:09 PM Katja Luther

fix #5341 and fixing deletion of specimen

9bfdcf39 10/28/2015 05:09 PM Patrick Plitzner

Return correct match strategy #5337

3087df1b 10/27/2015 04:24 PM Cherian Mathew

#5297 Refactor ProgressMonitorController, Add Remoting Progress monitor

#5297 Add progress monitor service, Add test services

#5297 Add monit import method

#5297 Update no. of work units

#5297 Add new thread class for remoting monitors

#5297 Add owner field to monitor thread and user checks in service...

f9656765 10/26/2015 03:12 PM Andreas Müller

Minor cleanup

b8b8ed11 10/22/2015 05:03 PM Andreas Müller

Fix test in dataportal with strict bean initalization #5077

5ab3e456 10/22/2015 12:33 PM Katja Luther

Revert "minor"

This reverts commit 64367d007ba404e037ccc2b6794b46c4f1f321bc.

64367d00 10/22/2015 12:21 PM Katja Luther

minor

70ba3ccf 10/21/2015 02:17 PM Andreas Müller

Fix bean read/write inconsistency in Taxon and TaxonBase #5307

8f6bbcc2 10/19/2015 01:15 PM Katja Luther

fix #5179 and adapting the tests because the classification argument is needed now

a3960fa7 10/12/2015 01:17 PM Katja Luther

accept the change from a number to null in TimePeriod fields #5319

d8fe1030 10/09/2015 02:38 PM Andreas Müller

Merge branch 'ticket-5066' into develop

Conflicts:
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java

eb9a6442 10/09/2015 02:15 PM Andreas Müller

minor clean ups

09081d2b 10/08/2015 05:02 PM Cherian Mathew

Add cascade merge to members field

5189077e 10/01/2015 05:23 PM Cherian Mathew

#5281 Make SingleReadAlignment.Shift serializable

27e202aa 10/01/2015 03:11 PM Cherian Mathew

#5299 Add new entity listener and event firing

dd12e4f8 09/23/2015 11:29 AM Katja Luther

minor

176f1bfc 09/16/2015 02:58 PM Cherian Mathew

#5259 Add method to init defaul terms

3824b825 09/15/2015 04:09 PM Cherian Mathew

#5249 Correct if statements

207c35e6 09/11/2015 05:35 PM Cherian Mathew

#5223 Copy utility method from service to derived unit

e9829ef9 09/11/2015 05:11 PM Andreas Müller

Implement hasCharacterData and isCharacterData.
And fix characterData semantics.

887126ca 09/11/2015 05:11 PM Andreas Müller

move specimen.getCharacterData to model

e75cf4e4 09/10/2015 03:07 PM Andreas Müller

clean up taxon cache strategy

a9bde125 09/10/2015 03:07 PM Andreas Müller

Document new initListener method (#5161)

f63cb922 09/10/2015 12:58 PM Andreas Müller

Simplify getNameTags in Taxon cache strategy (#5229)

c4de108d 09/10/2015 12:26 PM Andreas Müller

Create new tag type for secundum reference (#5229)

57c49a93 09/10/2015 11:40 AM Andreas Kohlbecker

#3991 hiding the delegeate boolean properties in TaggedText by making them protected

c59e35c4 09/10/2015 08:35 AM Andreas Müller

Deproxy name in taxon cache strategy.

3b2bbc66 09/09/2015 10:17 PM Andreas Müller

Fix tagged title generation for taxa

fe43cd3b 09/09/2015 05:45 PM Andreas Müller

Implement taggedTitle for taxon base #5229

331b2aa6 09/08/2015 02:08 PM Patrick Plitzner

Set sequence to null when removing a single read #5200

bc7c5cb9 09/07/2015 12:27 PM Cherian Mathew

#5138, #5102 Fix cascade delete orphan error for address list in contact entity

64787652 09/02/2015 03:27 PM Andreas Kohlbecker

removing System.out.println

28f177b1 09/02/2015 12:02 PM Katja Luther

minor

30df1c38 09/02/2015 10:48 AM Katja Luther

adding a convertmergeStrategy because of a different handling of merge and convert

6ae5ca99 09/02/2015 10:48 AM Katja Luther

changes for tcs import, fixing taxonnodecomparator, polytomouskey deletion and converting from person to team and team to person

6d62d023 09/02/2015 10:48 AM Katja Luther

adding a ConvertMergeStrategy

6c9b7962 08/27/2015 04:14 PM Cherian Mathew

#5161 Add initListener method to CdmBase object

1400c5b2 08/26/2015 12:36 PM U-BGBM\k.luther

add @Audited to startNumber

4293f24c 08/25/2015 01:56 PM U-BGBM\k.luther

changes for deleting polytomous key nodes

fe805a6c 08/07/2015 04:05 PM Cherian Mathew

Revert final qualifier after discussion in #5102

14c928ca 07/23/2015 03:24 PM Andreas Kohlbecker

adding IdInVocabulary to the toString representation of NamedAreas

9e1269fc 07/22/2015 03:54 PM Cherian Mathew

#5100 Fix default language for remoting

991ee108 07/22/2015 02:24 PM Cherian Mathew

Intialise addresses in declaration to avoid orphan cascade issue

3fda6c39 07/20/2015 10:53 AM Cherian Mathew

#5067 Updates for remoting derivate hierachy views

0498d2f2 07/20/2015 01:28 AM Andreas Müller

Fix preliminary 2 capitel author parsing #5096

8277d1c7 07/17/2015 03:41 PM Cherian Mathew

Update service layer calls to use uuids, Add property paths to find call for performance tuning

9b66c383 07/17/2015 02:26 PM Andreas Müller

Fix long running parser #5072

8aec9826 07/17/2015 01:25 AM Andreas Müller

Use ampersand as default for et al. teams #5093

c3d653f4 07/16/2015 01:38 PM Andreas Müller

Fix taxon node comparator handling #4226

3bbbc5c7 07/14/2015 01:30 PM Katja Luther
39880c49 07/14/2015 01:15 PM Katja Luther
945061f3 07/09/2015 04:51 PM Andreas Müller

Fix long running name parser problem #5072

14e8f6aa 07/09/2015 04:51 PM Andreas Müller

Avoid NPE in ShiftUserType

c83c2349 07/07/2015 02:53 PM Andreas Müller

Fix missing protected evaluation for Taxon titleCache #5018

7a4d764d 07/06/2015 06:34 PM Katja Luther

cacheUpdater Caryophyllales

c239e0b3 07/06/2015 05:48 PM Katja Luther

cacheUpdater for caryophyllales

a1d53662 07/01/2015 10:55 AM Patrick Plitzner

Fix singleton constructor with specimen types

ca363adb 07/01/2015 09:28 AM Patrick Plitzner

Do not set consensus sequence of single read alignment to null when
deleting the alignment

57df1e7e 06/26/2015 09:25 PM Andreas Müller

Add getTermByIdInVoc method to vocabularies

c16ec678 06/26/2015 07:00 PM Andreas Müller

Fix unparsed sections and subsections #4764

6a6ae886 06/25/2015 11:56 PM Andreas Müller

Fix possible but in FeatureNode sortindex creation

See similar issue in TaxonNode sortindex creation.

f37d249f 06/25/2015 11:47 PM Andreas Müller

minor

2fb0b459 06/25/2015 11:40 PM Andreas Müller

minor

3a35f0e6 06/25/2015 11:40 PM Andreas Müller

Fix sortindex computation in TaxonNode

After commit from 2015-06-18 the sortindex was computed slightly
different. In some cases the parent was not deproxied anymore and
therefore the parent.childNodes always returned the empty list of the
proxy object instead of returning the actual childrens list.

b4027377 06/25/2015 01:10 AM Andreas Müller

Improve E+M post import methods #3979

c31b52c2 06/24/2015 06:52 PM Andreas Müller

Add publisher role uuid and clean up FirstDataInserter #3979

236ab161 06/23/2015 05:56 PM Andreas Müller

Rename remaining occurrences of xxxAuthorTeam #4968

Rename remaining occurrences of combinationAuthorTeam and
basionymAuthorTeam in code and other files

ce7c7aa3 06/23/2015 05:56 PM Andreas Müller

Rename NonViralName.xxxAuthorTeam to xxxAuthorship #4968

92e55e8b 06/19/2015 02:51 PM Andreas Müller

fix titleCache for et al. teams #4967

f4f0f913 06/19/2015 12:02 PM Andreas Müller

fix parsing of names with teams in name and reference #2223

e064cc19 06/18/2015 02:50 PM Katja Luther

forgot to check in the changes

0a32c706 06/18/2015 02:46 PM Katja Luther
  • add @Audited to all type properties
  • add taxonNodeComparator for rank and alphabetical orderedVocabularyDao
  • change delete() methods arguments to UUIDs
844234ce 06/18/2015 11:58 AM Katja Luther

add @Audited to the argument type

53ec4369 06/16/2015 04:20 PM Andreas Müller

fix #4976 Titlecache for new vocabularies not filled correctly

97ecfa0d 06/16/2015 04:16 PM Andreas Müller

minor cleanup

95d79544 06/15/2015 02:57 PM Cherian Mathew

correcting wrong merge

1f478638 06/08/2015 01:08 PM Cherian Mathew

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java...

d3d5a408 06/04/2015 11:33 AM Katja Luther

fix team cache strategy, add et al. if hasMoreMembers is set

4b8eaa80 06/03/2015 01:00 PM Andreas Müller

jaxb annotation fixed for agentRelations #3583

840abdb1 06/03/2015 01:00 PM Andreas Müller

rename authorTeam -> authorship #4332 for name authors

bb7cf1c5 06/02/2015 02:43 PM Andreas Müller

merge trunk into 3.6 branch

02364271 06/02/2015 02:14 PM Katja Luther

last changes for #4869

108dbf1a 06/02/2015 11:43 AM Katja Luther

changes for #3998

d0f12c0a 06/01/2015 04:54 PM Andreas Müller

fix setStatisticalValue method

faa3e550 06/01/2015 04:53 PM Andreas Müller

minor

3c4607e9 05/29/2015 05:59 PM Andreas Müller

fix test and add factory method #3583

1cf17f11 05/29/2015 05:43 PM Andreas Müller

some cleanup, renaming and a test for TaxonNodeAgentRelation #3583

63228380 05/29/2015 05:13 PM Andreas Müller

more getters/adders, update script, vocabulary and test vocabulary for TaxonNodeAgentRelation #3583

2b296096 05/29/2015 02:50 PM Andreas Müller

first implementation of TaxonNodeAgentRelation #3583

ab85ded9 05/29/2015 02:23 PM Andreas Müller

minor

be4cf91a 05/29/2015 02:22 PM Andreas Müller

minor cleanup

7b121d03 05/29/2015 11:23 AM Andreas Müller

merging trunk into 3.6 branche