Add files to ignore on merge conflict if the 'ours' driver is configured
[taxeditor.git] / eu.etaxonomy.taxeditor.editor /
2015-10-08 Cherian MathewUpdate transient services for new load method
2015-10-08 Katja LutherMerge branch 'develop' of https://dev.e-taxonomy.eu...
2015-10-08 Cherian MathewUpdate root entity merge calls to use new merge method.
2015-10-08 Katja LutherMerge branch 'develop' of https://dev.e-taxonomy.eu...
2015-10-08 Katja Luther#5114 fix
2015-10-07 Patrick PlitznerUse convenience method for associated taxa
2015-10-07 Katja Lutherimprove messaging for deleteresults
2015-10-07 Katja Lutherminor
2015-10-06 Patrick PlitznerI18n of login and data source view
2015-10-06 Katja Lutherminor
2015-10-06 Katja Luthermerge branches
2015-10-06 U-BGBM\k.luthermerge branches
2015-10-06 U-BGBM\k.luthermerge
2015-10-06 U-BGBM\k.lutherMerge branch 'develop' of https://dev.e-taxonomy.eu...
2015-10-06 U-BGBM\k.lutherimprove messaging for deleteResult
2015-10-05 Patrick PlitznerAdd null check to handler (#5283)
2015-10-05 Patrick PlitznerTrim code
2015-10-05 Patrick PlitznerDisable menu items when not connected to CDM store...
2015-10-05 Patrick PlitznerAdapt MediaSpecimen i18n
2015-10-05 Patrick PlitznerFix child hierarchy for DnaSamples
2015-10-05 Patrick PlitznerFix null selection for existing media
2015-10-02 Patrick PlitznerAdapt transient services
2015-10-02 Cherian MathewUpdate transient services with new merge method
2015-10-02 Cherian MathewAdd remoting checks for merge, Move to merge call which...
2015-10-01 Patrick PlitznerCorrect derivative hierarchy context menu label
2015-10-01 U-BGBM\k.lutherminor
2015-09-30 Patrick PlitznerFix i18n (#5155)
2015-09-30 U-BGBM\k.lutherMerge branch 'develop' of https://dev.e-taxonomy.eu...
2015-09-30 U-BGBM\k.luthermove descriptions in a service call
2015-09-30 Cherian MathewAdd check to ensure merge in editors is performed only...
2015-09-28 U-BGBM\k.lutherMerge branch 'develop' of https://dev.e-taxonomy.eu...
2015-09-24 Cherian Mathew#5247 Fix duplicate entity issue for new entities by...
2015-09-24 Cherian Mathew#5247 Use updated entities
2015-09-23 U-BGBM\k.luthermerge with local branch
2015-09-22 Cherian MathewMerge branch 'remoting-4.0' into develop
2015-09-22 Patrick PlitznerPre-select current classification for taxon node select...
2015-09-22 Patrick PlitznerDelete unused method
2015-09-22 Patrick PlitznerExpand polytomous key section #3461
2015-09-22 Patrick PlitznerFix media view selection
2015-09-21 Patrick PlitznerDisable menu "New..." meun entries when no connection...
2015-09-21 Patrick PlitznerDisable media view when synonym selected (#5195)
2015-09-21 Patrick PlitznerI18n for specimen editor (#5155)
2015-09-16 Cherian MathewFix versions
2015-09-16 Cherian MathewFix versions
2015-09-16 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-16 jenkinsRevert project versions to 3.11.0-SNAPSHOT
2015-09-16 jenkinsUpdated version in pom / project files to taxeditor...
2015-09-16 Patrick PlitznerAdd i18n to binary build path
2015-09-16 Cherian MathewCache the default feature tree
2015-09-15 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-15 jenkinsupdating poms for 3.11.0-SNAPSHOT development
2015-09-15 jenkinsRevert project versions to 3.10.0-SNAPSHOT
2015-09-15 jenkinsUpdated version in pom / project files to taxeditor...
2015-09-15 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-15 Cherian Mathew#5252 Add remove method to manually remove root derivate
2015-09-15 Patrick PlitznerAdd missing i18n properties to build path
2015-09-15 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-15 Patrick PlitznerFix initialization problems for preferences and editor...
2015-09-15 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-15 Patrick PlitznerOpen a newly created specimen in specimen editor
2015-09-14 jenkinsupdating poms for 3.10.0-SNAPSHOT development
2015-09-14 jenkinsRevert project versions to 3.9.0-SNAPSHOT
2015-09-14 jenkinsUpdated version in pom / project files to taxeditor...
2015-09-14 Cherian Mathewre-initialise group object in input constructor root/tags/taxeditor/remoting-3.9.0 remoting-3.9.0
2015-09-14 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-14 Cherian Mathew#5242, #5223 Improve performance of derivate loading...
2015-09-14 Patrick PlitznerUse wizard to create new specimen
2015-09-14 Patrick PlitznerKeep media view and factual data view enabled when...
2015-09-14 Patrick PlitznerTrim code
2015-09-10 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-10 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-10 jenkinsupdating poms for 3.9.0-SNAPSHOT development
2015-09-10 jenkinsRevert project versions to 3.8.0-SNAPSHOT
2015-09-10 jenkinsUpdated version in pom / project files to taxeditor...
2015-09-10 Andreas KohlbeckerRevert "Updated version in pom / project files to taxed...
2015-09-10 Andreas KohlbeckerRevert "Revert project versions to 3.8.0-SNAPSHOT"
2015-09-10 jenkinsRevert project versions to 3.8.0-SNAPSHOT
2015-09-10 jenkinsUpdated version in pom / project files to taxeditor...
2015-09-09 Patrick PlitznerDisable media view for taxon bulk editor with no select...
2015-09-09 Patrick PlitznerI18n for derivative module
2015-09-09 Patrick PlitznerI18n for Specimen Editor
2015-09-09 Cherian MathewAdd new service call
2015-09-09 Cherian Mathew#5224 Using new cdmlib call for changing synonym to...
2015-09-08 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-08 Cherian MathewAdd unimplemented methods
2015-09-08 Cherian Mathew#5213 Use method to move descriptions using uuids
2015-09-08 Cherian MathewAdd annotation service to config
2015-09-08 Patrick PlitznerTrim code
2015-09-07 Cherian MathewReplace saveOrUpdate with merge
2015-09-07 Cherian Mathew#5052 Integrate remoting in granted authorites editor
2015-09-04 Cherian MathewFix new occurrence / sequence move method calls
2015-09-04 Cherian MathewCorrect transient service method
2015-09-03 Cherian Mathew#5187 Use new move methods with uuids as args
2015-09-03 Cherian MathewUpdate operation for move taxon nodes
2015-09-03 Cherian MathewAdd unimplemented methods
2015-09-03 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-03 Cherian Mathew#5188 Add special for deleting sequence
2015-09-03 Cherian Mathew#5186 Fix erros in sequence merge and creating new...
2015-09-03 U-BGBM\k.lutherminor
2015-09-03 U-BGBM\k.lutherchange preferences page for taxonnode sort
next