Project

General

Profile

Statistics
| Branch: | Tag: | Revision:

cdmlib / .gitattributes @ master

History | View | Annotate | Download (234 KB)

# Date Author Comment
2b63f911 02/24/2016 04:23 PM Andreas Kohlbecker

removing all (almost all) spy6 references and dependencies

f4ce2da9 01/13/2016 09:49 AM Patrick Plitzner

fix gitattributes and add derived file to gitignore

600bc50e 01/11/2016 11:32 AM Andreas Kohlbecker

setting merge driver to ours in gitattributes for all pom.xml - helps avoiding conflicts in gitflow

e56ac391 07/14/2015 01:36 PM Katja Luther
39880c49 07/14/2015 01:15 PM Katja Luther
c239e0b3 07/06/2015 05:48 PM Katja Luther

cacheUpdater for caryophyllales

6ebbd650 07/03/2015 10:29 PM Katja Luther

Caryophyllales stuff

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
dbaef697 06/16/2015 06:05 PM Andreas Kohlbecker

only a test

4a226647 06/16/2015 06:05 PM Andreas Kohlbecker

only a test

0849a0f4 06/15/2015 02:47 PM Cherian Mathew

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

9df1cbb4 06/15/2015 01:36 PM Patrick Plitzner
  • correctly cleaned up between test invocations
e5154356 06/15/2015 09:05 AM Patrick Plitzner
  • added test for "ignoreAuthorship" option
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...

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

merge trunk into 3.6 branch

815a9caa 06/02/2015 02:24 PM Andreas Müller

Move FullCoverageDataGenerator from test to real, to avoid dependency problems.

95b07aa3 06/02/2015 01:44 PM Katja Luther

add SortMode enum and change the param for sorting of loadChildNodesOfTaxonNode from boolean to SortMode enum see #4226

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

b25b282d 05/29/2015 02:49 PM Andreas Müller

fix naming of ClassificationServiceDeepTest

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

merging trunk into 3.6 branche

0c1869fa 05/28/2015 10:20 AM Andreas Müller

remove ExcelImportMapping.properties

7af4bdbe 05/27/2015 12:51 PM Andreas Müller

clean up old AbcdImport test #3279

a80117c1 05/27/2015 10:20 AM Andreas Müller

rename ABCD import tests

d26d6619 05/26/2015 01:40 PM Andreas Müller

moving UuidAndTitleCache from model to persistence. #4799

62f7f3cb 05/22/2015 02:24 PM Andreas Müller

merge trunk into model change 3.6

4944449a 05/22/2015 01:49 PM Andreas Müller

add MnTableRemover

8ee01de1 05/21/2015 05:00 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/common/DefinedTermBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java...

207d5d50 05/20/2015 02:03 PM Patrick Plitzner
  • implemented importing of DNA ABCD units
    • DNA sampled will be attached to already existing specimens
    • re-enabled tests
742aad84 05/12/2015 10:47 AM Patrick Plitzner
  • added config option to ignore already existing specimens during import
    • for ggbn import already existing specimens are searched and attached if associated to the dna unit
    • refactored AbcdReport to also display the unitId
a37e74f6 05/11/2015 01:37 PM Katja Luther

make the taxonomic tree editable in natural order (see #3771), adding comparator

d4361fc7 05/05/2015 02:50 PM Andreas Müller

implement datasource type inference for external datasources: #3910

552f7db9 05/04/2015 12:00 PM Katja Luther
bfc52c5f 04/14/2015 03:17 PM Patrick Plitzner
  • added findOccurrences() and countOccurrences() to service layer
    • added configurator for these methods
    • optimized retrieval with HQL query
    • made use of service method in DerivateSearchView
3a3ded31 04/13/2015 07:07 PM Andreas Müller

Create updater for cdm36 and update schema/term version

2ed5b432 04/13/2015 01:46 PM Katja Luther
f559f532 04/13/2015 01:37 PM Patrick Plitzner
  • added wrapper for map service query to have access to the data points
    • used data points as parameters for the bounding box of the point distribution map
a060f362 04/01/2015 05:13 AM Andreas Müller

first implementation of team->person->team conversion #4769, #4770

6c84a3ee 04/01/2015 01:59 AM Andreas Müller

Make deduplication of TeamOrPersonBase possible in cdmlib #4768 and solve test problem in CdmGenericDaoImplTest #2096, finding some bugs in between

83cd7dee 03/28/2015 11:46 AM Andreas Müller

Fixing failing search test, using better utf8 handling

b9b58fbb 03/27/2015 06:49 PM Andreas Kohlbecker

implementing better namedAreasInUse service for #3994 (Select widget to choose the filter areas for the advanced search)

3aad2f18 03/27/2015 05:21 PM Andreas Müller

first implementation of WrappedCdmDataSource #3910

b40e0f56 03/27/2015 11:40 AM Patrick Plitzner
  • refactored DTO assembly for compressed specimen table in the data portal
    • now data is assembled for each individual preserved specimen and the for the parent field unit
76b38e7a 03/25/2015 01:32 PM Andreas Kohlbecker

new launchers for JettyLauncher plugin, also new structure in ide folder

d6662fd7 03/24/2015 10:17 PM Andreas Müller

handle empty Shift #4734

1be86351 03/24/2015 11:57 AM Andreas Müller

merge validation commits r23146, r23162, r23163 into trunk

70ab1592 03/20/2015 04:17 PM Andreas Müller

add listener for taxon name in determination event and run update script again

ef081a36 03/20/2015 01:12 PM Andreas Müller

make identifier annotatable #4673

05cdf24e 03/19/2015 02:49 PM Andreas Müller

merge validation2 and model 3.5 into trunk

782d9cc1 03/19/2015 02:29 PM Andreas Müller

merge validation2 and model 3.5 into trunk

e902c13e 03/19/2015 02:28 PM Andreas Müller

merge validation2 and model 3.5 into trunk

ff84c9fb 03/17/2015 06:06 PM Patrick Plitzner
  • added test file
7ec3473d 03/17/2015 11:04 AM Patrick Plitzner
  • added new test cases (still temporarily @Ignore)
aefcbf9a 03/04/2015 01:14 PM Cherian Mathew

added class to override Hibernate EntityType class to fix problem with merge replace

fbf34d08 03/04/2015 08:46 AM Patrick Plitzner
  • added config option to choose mapping of ABCD UnitID
    • added config option to ignore authorship when matching taxa
    • added first draft of ggbn extension parsing
b53a83bc 02/23/2015 10:11 AM Cherian Mathew

merge from trunk

dc58d8a8 02/23/2015 10:08 AM Cherian Mathew

MockCdmCacher : not required
TaxonServiceSearchTest : removed reference to mock cacher

933e5ac3 02/23/2015 10:07 AM Cherian Mathew

ICdmCacher, ICdmUuidCacher, CdmCacher, CdmTermCacher : refactored and added load method
Language, NameRelationshipType, Rank : now uses cacher only if termap is null or empty and only when class matches the specific term type
MockCdmCacher: not required anymore...

a0bd02a0 02/11/2015 02:23 PM Katja Luther
48dde342 01/28/2015 05:42 PM Alexander Oppermann

created new service in classificationService

it is a first draft of the createHierarchyService
based on taxonNames and until genus level.

42926411 01/23/2015 02:59 PM Patrick Plitzner
  • added ABCD import test for subspecies
30936368 01/23/2015 12:40 PM Andreas Kohlbecker

activating the swagger rest service documentation by reverting the revertion of the premature committed experimental branch (swagger) svn: r21387, git: be528c1edf

ce8437b0 01/23/2015 09:07 AM Patrick Plitzner
  • add taxon name instead of taxon for determination
    • refactored taxon search
    • 1. search for taxon name (create if not found)
    • 2. search with taxon name for taxon (create if not found)
    • added basic reporting functionality to import
0b9c5cf2 01/21/2015 05:31 PM Andreas Müller

improve and rename findByIdentifier service

d903df51 01/19/2015 04:29 PM Cherian Mathew

removed vaadin references

7a61c9d3 01/19/2015 04:19 PM Cherian Mathew

pom.xml : added maven dependency goal to unpack the corresponding cdm-vaadin war into a directory in the target dir and added this directory as a resource when building the cdmlib-remote-webapp war
pom.xml, applicationContext.xml, cdmlib-remote-servlet.xml, web.xml, SpringMVCConfig.java : removed references to Vaadin...

2869c588 01/19/2015 03:49 PM Cherian Mathew

removed references to vaadin in pom file
removed vaadin classes as they have been migrated to cdm-vaadin project

d3ff3ed4 01/08/2015 05:03 PM Andreas Müller

adding ISelfDescriptive from validation branch

1dff1ca8 01/08/2015 04:40 PM Andreas Müller

rename abstract class

e02ff7c5 01/08/2015 04:36 PM Andreas Müller

merge cdmlib-persistence from validation branch to trunk

9020c13d 01/08/2015 04:34 PM Andreas Müller

merge cdmlib-service from validation branch to trunk

97ac524a 01/08/2015 11:46 AM Andreas Müller

first tests for listByIdentifier

905b7269 12/16/2014 09:29 PM Andreas Müller

add xslx test in io

88b4ec59 12/16/2014 10:32 AM Patrick Plitzner
  • extracted deepDelete tests to own java class
    • reduced exception logged in DeleteResult
b1f3fc31 12/15/2014 06:25 PM Andreas Müller

refactor validation classes

5188d906 12/15/2014 01:00 PM Patrick Plitzner
  • fully implemented deep delete (child derivates)
    • added tests
c36bd929 12/12/2014 09:41 AM Patrick Plitzner
  • implemented isDeletable() and delete()
    • fixed test XML files and tests
c6423b90 12/11/2014 04:29 PM Andreas Müller

test for Amplification labelCache

af283637 12/09/2014 05:03 PM Patrick Plitzner

merge-update from trunk

395ccc97 12/09/2014 04:44 PM Andreas Müller

separate Amplification and AmplificationResult.java #4541

404c0036 12/04/2014 04:00 PM Patrick Plitzner
  • added service method to get descriptions which have a specimen set as describedSpecimen
    • added test which fails because the XML is loaded incorrectly
6571e4e5 12/03/2014 10:13 PM Andreas Müller

implement SingleReadAlignment.java #4529
not yet ready

ec352541 12/03/2014 01:22 PM Patrick Plitzner

merge-update from trunk

61b380b5 12/03/2014 10:21 AM Andreas Müller

add first version of BigDecimal (still unclear if we want to keep the UserType) #4499

ccf1f2f1 12/03/2014 10:03 AM Andreas Müller

merge PresenceTerm and AbsenceTerm #4521

a84f8263 12/03/2014 09:36 AM Patrick Plitzner
  • added isDeleteFromIndividualsAssociation and isDeleteFromTypeDesignation to SpecimenDeleteConfigurator
    • implemented deletion for above mentioned flags
    • added more information to delete result when deleting specimens
    • added tests for above mentioned flags...
b82a6bfc 12/02/2014 09:55 AM Patrick Plitzner
  • added DISTINCT to HQL query for associated taxa
    • created and used XML data source in occurrence service test
d1fcc861 12/01/2014 02:48 PM Patrick Plitzner
  • added xml resources for tests
3ce0fa86 11/24/2014 05:28 PM Cherian Mathew

Fix (more of a hack) for conversation holder problem, subclassing the current servlet and setting the conversation so that it is bound every time a service call is made.

0e660e76 11/21/2014 01:55 PM Andreas Müller

add DnaMarker to Primer #4470

0386b59c 11/21/2014 10:24 AM Andreas Müller
710c18d5 11/21/2014 10:16 AM Andreas Müller

add DNA Quality Type vocabulary

d979d3a0 11/19/2014 05:44 PM Andreas Müller

Add DnaQuality.csv (not fully ready)

03aae089 11/18/2014 09:52 AM Cherian Mathew

ICdmCacher, DefaultTermInitializer : added comments
CdmCacher : added code to disallow null values in cache and moved term initialisation code to specific subclass
CdmDaoCacher : replaced with specialised CdmTermCacher
defaultApplicationContext : removed remoting exception

2554cb27 11/11/2014 09:33 AM Patrick Plitzner
  • added delete configurator to occurence service
b39ef2c4 10/27/2014 11:38 AM Alexander Oppermann

latest changes for Vaadin Editor
* added in Web.XML production mode

5970cb82 10/27/2014 11:21 AM Katja Luther
164795a7 10/22/2014 06:01 PM Alexander Oppermann

removed useless widgetset

c6d8699a 10/22/2014 12:31 AM Andreas Müller

add WebPageDefaultCacheStrategyTest

da3a032b 10/21/2014 03:36 PM Patrick Plitzner
  • removed accidentally committed class
Add picture from clipboard (Maximum size: 40 MB)