EDIT

Disable MediaView for bulk editor (#5162)

• bulk editor does only activate media view when showing taxa
• code trimming

Move property tester to editor plugin

Replace deprecated method

Merge branch 'develop' into LibrAlign

#5160 Use new merge method with ids as arguments

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java

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

fix #5153

fix #5153

Externalize Strings

Merge develop into branch

Change order of controls

Use web icon for URL button

Create constant for default column number in detail sections

Split up control creation of TextWithLabelElement

• this fixes layout problems when inserting a separate button for opening links

Trim code

Remove equal width from columns

Test implementation of Copy action added to AlignmentEditor.

Externalize strings

Warn user that URL will not be saved in bold and red (#5065, #5141)

Add OS and java info to MessagingUtils stacktrace

Change order parameters in DetailsView for sources (#5133)

Support UUID search in bulk editors (#5103)

Trim code

Remove comments

Handle ampersand correctly in section titles (#5142)

Fix application ID

#4717 Correct java exec called for macosx

#4717 Correct macosx dir structure

#4717 Correct macosx java path

#4717 Correct dir relative path to java exec for mac osx

#4717 Correct dir for changing permissions

#4717 Add seperate product file for jre bundle

fix for #5114

fix #5153

Merge branch 'develop' into LibrAlign

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

small changes for ideas for better drag and drop in taxonnavigator

white spaces

Correct config for molecular plugin

changes for move descriptions and description elements

minor

Remove comments

Rename Derivative View to Derivative Editor

Minor changes.

Fixed NPE when loading single reads without attached pherogram.

test commit

Added missing molecular plugin projects

white space changes

Renamed branch

minor

minor

fix jenkins

fix jenkins

fix #2480

minor

fix delete polytomouskeynode and improve merge in bulk editor

Revert last change

Fix dependencies for LibrALign

• added swt packages to imported packages

Depenedency management

• added javax.swing and org.eclipse swt to dependencies

Remove unused folder

some layout changes

Fix compile error in FeaturDistributionDetailElement

#5061 Add force refresh of p2 repositories before checking for updates

Add button to open URLs in external browser (#5062)

Rename aggregator to lib

Add lib folder to dependency plugin

Add missing properties file

Integrate molecular plugins

Merge branch 'LibrAlign' into develop

Enhance handling of simple and advanced media view

• Buffer URI string in case of parsing errors
• disable toggling when media conists of more than one representation or part

Change color when error occurs

Disable Termeditor menu if CdmStore is disconnected

Add missing null check

Remove cdmViewer extension usage

Add @Override

Set Visibility according to CdmStore connection

Generalize cdmViewer extension point

Refactored parameters to be based on commands.

Fixed NPE when saving an alignment with a read without attached pherogram.

Enhance handling of simple and advanced media view

• Buffer URI string in case of parsing errors
• disable toggling when media conists of more than one representation or part

Change color when error occurs

Disable Termeditor menu if CdmStore is disconnected

Add missing null check

Remove cdmViewer extension usage

Add @Override

Set Visibility according to CdmStore connection

Generalize cdmViewer extension point

Refactored parameters to be based on commands.

merge-update from trunk

Add unimplemented methods to transient service

Updated version due to trunk merge

merge-update from trunk

Update transient service to be compatible with cdmlib service

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

Updating develop poms back to pre merge state

Merge branch 'master' into develop

updating develop poms to master versions to avoid merge conflicts

Merge branch 'release/3.7.0'

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

Revert project versions to 3.7.0-SNAPSHOT

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

Correct for develop reset