EDIT

fix #5216: merge grantedAuthority checks for existing grantedAuthority first and some other fixes for grantedAuthority handling in editor

increase maven-source-plugin, decrease tycho

Update tycho version

ref #6401 Update taxeditor to jdk1.8

• Fix generic problems

fix #3737: improve handling of protected/not protected cache fields

ref #1606: for inReferences use service methods filtering for the right referencetype

fix #5924: reauthenticate after changing the password

fix #6372 fix NPE in datasource view

ref #6365 use TaxonNameFactory for factory methods in TaxEditor

ref #6365 ref #6366 ref 6364 Update CdmModelCacher in TaxEditor

ref #6362 and ref #6365 remove some NVN and Bot/Zoo name occurrences in TaxEditor

Reverting the last version updates

Increase java code level to java 1.8

Update tycho version from 0.22.0 to 0.26.0

ref #6389 avoid service call for icon determination (performance)

• additionally the service call returned undeterministic results

(java)doc

ref #6360 and ref #6369 update cached model in taxeditor

manually set version numbers

manually setting the project and cdmlib version to 4.6.0-SNAPSHOT

Merge branch 'hotfix/4.5.1' into develop

remove private source path

Merge branch 'develop' into hotfix/4.5.1

Conflicts:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.cdmlib/.classpath...

Updated version in pom / project files to taxeditor version : 4.5.1 and cdmlib version : 4.5.1

fix #6376: remove markAsDelete for merged items in bulk editor

Correctly set default values for EntitySelectionElements

Fix LibrAlign dependencies

Merge branch 'develop' into LibrAlign

ref #5488 Do not abbreviate terms by default

LibrAlign dependency version updated.

check for id==0 before try to delete the media

Merge branch 'release/4.5.0' into develop

Merge branch 'release/4.5.0'

Updated version in pom / project files to taxeditor version : 4.6.0-SNAPSHOT and cdmlib version : 4.6.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 4.5.0 and cdmlib version : 4.5.0

missed to add some selection dialogs with last commit

fix #6342: fix exception when using ? in selection dialog

ref #5474 other -> others

ref #5714 Fix ordering of source types

• order by key instead of message
• always have either taxonomic or media source as first and the other as second

ref #6283 Fixed potential NPE for EntitySelectionElement

• refactored constructors to always initialise the clazz variable

fix #5496 Refactor preference pages to use TermType

TIC dependecy version updated.

ref #6333 Remove framework for exchanging an element in the details view

• This is against the concept of the DetailsView just showing an element which you can edit. Changing the element requires the DetailsView to know where the element comes from

ref #6333 Add generic support for entity collection sections to allow
adding existing entities

• this is done by two abstract methods allowAddExisting() and addExisting()

ref #6307 remove cdmserver/ from contextpath

ref #5922 Change order in supplemental data view (cont.)

minor

fix #6334: unsaved description needs to be removed from the taxon

add missing changes

minor

fix #5365: add delete configuration to media view

Removed double reference to TIC in molecular.lib.

remove unused bin.include

Saving files before refreshing line endings

Merge branch 'develop' into LibrAlign

Alternative versions for build.properties added. Current state set to "dependencies from JARs". (Can be merged to trunk in this state.)

ref #5495 always empty details view when there is no active editor
providing a selection

pom.xml and MANIFEST.MF updated in molecular.lib.

Adjustments to project structure changes in JPhyloIO.

ref #6158 Add missing git clone command to doc

fix #6158 updated taxeditor installation documentation

fix #5922 Move extensions section down

cleanup

fix #5671: add filter element for selection dialog

ref #6320 show pherogram title cache in single read label

Fix icon for media derivative

fix #6307 Show contextPath in error log

Removed unused import

fix #4246: move insert node and create new key node to one menu item with submenu

fix #5488 show only zoological nomenclatural status types not for
botanical names

• also dis some refactoring

fix #5495 DetailsView is emptied when upon context stop i.e. when the
connection is shut down

fix #5714 Add possibility for adding a comparator to EnumComboElement

• for Sources always have PrimaryTaxonomicSource or PrimaryMediaSource on top depending on IdentifiableSource

fix #5474 moved Feature and NamedArea to top level

• remaining terms are under "Other..."

fix #5698 Duplicate ampersand to avoid conversion to mnemonic

fix #5922 Move credits and rights section to the bottom

fix #4821: create OrderedTermvoc for OrderedTerms

Fix possible NPE

ref #6190 removing svn property place holder in first line of code - java files

ref #6190 removing svn property place holder in first line of code - java files

missing changes

minor

minor to fix failing jenkins

more changes for configurable name details view

adaptions for polytomous key editing to avoid null values in children list

ref #6105: add name details view configuration to the cdm preferences view

deduplicate the nomenclatural code preference page in preferences menu

ref #4766: remove apply and restore defaults buttons

ref #4766: sortindex updater integration in admin menu

Merge branch 'hotfix/4.4.1' into develop

Merge branch 'hotfix/4.4.1'

Updated version in pom / project files to taxeditor version : 4.4.1 and cdmlib version : 4.4.1

Merge branch 'release/4.4.0' into develop

Merge branch 'release/4.4.0'

Updated version in pom / project files to taxeditor version : 4.5.0-SNAPSHOT and cdmlib version : 4.5.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 4.4.0 and cdmlib version : 4.4.0

fix #6218: avoid NPE when remove text from label field

fix #5971 fix NPE for not existing preference

cleanup

ref #6199 Move "open in editor" option to the bottom

add missing files

avoid NPE when reusing taxonname for taxon creation