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

71e146f7 11/23/2015 04:10 PM Andreas Müller

Upgrade jaxb version and to new glassfish implementation and more spring
cleanup #4716

8a386b2c 11/23/2015 04:10 PM Andreas Müller

Upgrade to spring 4.2.2, spring-security 4.0.2 and latest hibernate
validator #4716 and #4702

718b436c 11/23/2015 04:02 PM Andreas Müller

Add spring-context to cdmlib-model

cb57fc9c 11/23/2015 04:02 PM Andreas Müller

Fix spring-jdbc dependency

23e27cfd 11/23/2015 04:02 PM Andreas Müller

Change springframework to spring in cdmlib-model #4702

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

c38734e6 10/21/2015 02:41 PM Andreas Müller

Add some more BeanUtil test to other classes #5307

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

b8712a66 09/28/2015 05:34 PM Andreas Kohlbecker

Updating develop poms back to pre merge state

1e3df039 09/28/2015 05:34 PM Andreas Kohlbecker

Updating develop poms to hotfix version to avoid merge conflicts

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

minor

af701e3c 09/16/2015 07:41 PM jenkins

Updating develop poms back to pre merge state

ed8f34b1 09/16/2015 07:41 PM jenkins

updating develop poms to master versions to avoid merge conflicts

b8ecd62d 09/16/2015 06:24 PM jenkins

updating poms for 3.12.0-SNAPSHOT development

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

#5259 Add method to init defaul terms

d912ee1f 09/15/2015 07:03 PM jenkins

Updating develop poms back to pre merge state

5a289cca 09/15/2015 07:03 PM jenkins

updating develop poms to master versions to avoid merge conflicts

a9dedd2d 09/15/2015 06:16 PM jenkins

updating poms for 3.11.0-SNAPSHOT development

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

#5249 Correct if statements

0559d46f 09/14/2015 06:29 PM jenkins

Updating develop poms back to pre merge state

1faebd77 09/14/2015 06:29 PM jenkins

updating develop poms to master versions to avoid merge conflicts

59a7d976 09/14/2015 05:57 PM jenkins

updating poms for 3.10.0-SNAPSHOT development

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

7dac0ba4 09/10/2015 05:55 PM jenkins

Updating develop poms back to pre merge state

1f957550 09/10/2015 05:55 PM jenkins

updating develop poms to master versions to avoid merge conflicts

5f339b7e 09/10/2015 04:52 PM jenkins

updating poms for 3.9.0-SNAPSHOT development

44069fdc 09/10/2015 04:48 PM Andreas Müller

minor

6b8d3592 09/10/2015 04:15 PM Andreas Kohlbecker

Revert "updating poms for 3.9.0-SNAPSHOT development"

This reverts commit 1a052a9893afe93249cf81603f410a4e454c305a.

1a052a98 09/10/2015 03:51 PM jenkins

updating poms for 3.9.0-SNAPSHOT development

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

ba5aa750 07/17/2015 01:49 AM Andreas Müller

Preliminary fix long runnig parser test

dfd8db1f 07/17/2015 01:28 AM Andreas Müller

Add commented test for long running parsing #5072

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

Use ampersand as default for et al. teams #5093

18321cc8 07/16/2015 04:21 PM jenkins

Updating develop poms back to pre merge state

67ea7963 07/16/2015 04:21 PM jenkins

Merge branch 'release/3.7.0'

74b56066 07/16/2015 04:05 PM jenkins

updating poms for branch'release/3.7.0' with non-snapshot versions

d5c26feb 07/16/2015 03:20 PM Cherian Mathew

Revert back to earlier version

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

Fix taxon node comparator handling #4226

d37a4156 07/16/2015 01:18 PM Andreas Müller

index on master: 945061f Fix long running name parser problem #5072

6f1311cf 07/15/2015 06:10 PM jenkins

Updating develop poms back to pre merge state

c811d93d 07/15/2015 06:10 PM jenkins

updating develop poms to master versions to avoid merge conflicts

cd726312 07/15/2015 05:54 PM jenkins

updating poms for branch'release/3.7.0' with non-snapshot versions

a2d9b7ba 07/15/2015 05:52 PM jenkins

updating poms for 3.8.0-SNAPSHOT development

afbed711 07/15/2015 03:02 PM Cherian Mathew

Remove unnecessary version property in sub-modules

9040b0a5 07/15/2015 02:32 PM Cherian Mathew

Revert back to version 3.7.0-SNAPSHOT

47980b28 07/15/2015 02:00 PM jenkins

Updating develop poms back to pre merge state

12ce88ff 07/15/2015 02:00 PM jenkins

updating develop poms to master versions to avoid merge conflicts

a3023509 07/15/2015 01:42 PM jenkins

updating poms for 3.8.0-SNAPSHOT development

3b335479 07/15/2015 11:51 AM Cherian Mathew

Revert versions back to current

f438faae 07/15/2015 11:39 AM jenkins

Updating develop poms back to pre merge state

05cb19c8 07/15/2015 11:39 AM jenkins

updating develop poms to master versions to avoid merge conflicts

3b12cfbb 07/15/2015 10:25 AM jenkins

updating poms for 3.14-SNAPSHOT development