EDIT

Updating develop poms to hotfix version to avoid merge conflicts

added jgitflow plugin

• updating versions due to release

updated to snapshot version

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath

Updated version in config files to 3.6.1-SNAPSHOT

Merge branch 'move-to-luna' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath

Updated version in config files to 3.6.0

• added wizard page listener to react on ENTER key #4853

• added wizard page listener to react on ENTER key #4853

• added context menu entry for editing classifications
  • used generic extension point for cdmViewer in navigation project (#4865)

• code conventions

• code conventions

minor

add checkbox for additional team members

change synonym to accepted taxon message when taxon could not be deleted

delete taxonnode if taxon is used somewhere else fixed

#4725

minor

fix for #3998

• fixed compile error and possible NPE #4810

MANIFEST.MF : added apache commons exception package for use in messaging utils
MessagingUtils : updated to add all causes in the child statuses

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

DefinedTermDropAdapter : added selection of source objects after drop and disabled insert feedback for non OrderedTermBase objects
DefinedTermEditor : added custom sorter for OrderedTermBase (descending)
MoveDefinedTermOperation : added possibility to move term when cursor is in the insert part of the list

new session for every search in bulk editor

Improve error message

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

replaced simple editor-datasource compatibility check with version comparison check

fixing the disabling of the ToggleableTextElement when the titlecache is protected.

fix potential NPE

cleanup

minor

clean up

Renaming menu labels for new team and person

use plural for bulk editor labels

minor

• fixed preferences for adding vocabulary name to term label #4448

• added preferences for vocabulary names in term labels #4448

• combo dropdowns intitially show an empty field which is now removed when selecting any other entry
  • added vocabulary information to term label #4448

• removed empty element from combo dropdown #4448

moving UuidAndTitleCache from model to persistence (changes in Editor). #4799

• initially expand modifier section if modifiers exist #4448

• moved OriginalLabel above sources #4776

• fixed copy&paste error #4799

• refactored naming of modifier section #4448

• fixed NPE (#4448)

• fixed NPE (#4883)

• added identifier section to specimen details view

• moved OriginalLabelData to specimen details section (#4776)

• added id to entity selection dialogs (#4799)

• adding of empty persons to teams via DetailsView is not possible anymore (#4913)

removed test dir as source dir

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

corrected visibility check for edit authorities editor

fix UTF-8 issue in menu label

MANIFEST.MF, feature.xml : removed dependency on specific versions
rcp.target : added vm arguments

corrected target definition

Merge remote-tracking branch 'origin/master' into move-to-luna

added id to uuidAndTitleCache fixes in TaxEditor #4799

changed nebula update site to the stable release url

dependency changes to move to e4

#4907 create in agent bulkeditor has no effect

remove syso

minor

• deproxy CDM entities to get correct class as part title of DetailsView

• show recordBasis for specimens as part title of DetailsView

• simplified part title of DetailsView

bulkeditor: merge of teams and persons and convert team to person and person to team

• unified section headers for derivative details view
  • show selected element in part title of DetailsView

• fixed filtering by specimen type (UNKNOWN = wild card)

• added transient service methods

• when searching for a taxon also the indirectly associated specimens of the derivative hierarchy are shown

• missing @Override

minor

natural order preferences

add dialog for the natural order preference

make the order of the taxon nodes editable

#4855 add MoveSynonymToAnotherAcceptedTaxonHandler and some clean up of the plugin.xml especially the delete

• added missing dependencies to feature

fixing NPE for empty float values #4448

fix remaining issues for taxon field prefill #4860

• added text for non-exisiting label to factual data view (#4883)

• removed "Copy" menu entry for classifications (#4864)

• added property tester to check if CdmStore is connected (#4809, #4856)

• pre-fill parent taxon name in new taxon wizard (#4860)

• fixed combo drop down list by using only plant kind of unit vocabulary

• added hybrid formula checkbox (#4870)

• changed "derivate" to "derivatives"

• changed label provider according to requirements

• added sorting by title cache of specimens to individual associations in factual data view

• filtered combo dropdown for modifiers in details view (#4448)

• fixed potential NPE

revert message handling for ApplicationWorkbencAdvisor #4657

Updated version in config files to 3.5.2-SNAPSHOT

Updated version in config files to 3.5.1

remove javadoc

potential fix for #4535

fixed potential NPE see Ticket #4854

#4653 if a text field is empty, getText returns null instead of an empty string

• added missing required plugins to feature platform (#4807)