#5228 Remove unnecessary model init on refresh
Disable login preferences in case of dev server
Merge branch 'develop' into remoting-4.0
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.editor/plugin.xml eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java...
fixing #5150
Check for disposed widget
Add entity type to CdmChangeEvent and fixes #5139
#4073 Initial implementation of local cdm-server
Conflicts: eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java...
#5130 Extend import wizards to import data via remoting and Add tests for the same
#5029 Add dev remote source quick connect
#5209 Implement auto selection of last successfully connected server / instance
#5029 Add functionality for login to remember credentials, reconnect and switch user
#5209 Add version ui elements to advanced view, Make port text field editable for localhost servers
#5029 Implement oneclick login for remoting
add the possibility to configure the deletion of taxon nodes
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Conflicts: .gitattributes eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java...
moving UuidAndTitleCache from model to persistence (changes in Editor). #4799
Merge branch 'move-to-luna' into remoting-4.0
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.cdmlib/build.properties eu.etaxonomy.taxeditor.cdmlib/pom.xml eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml...
added id to uuidAndTitleCache fixes in TaxEditor #4799
add dialog for the natural order preference
merge from trunk
NewTaxonNodeWizard : replaced saveOrUpdate with merge for remoting AbstractPersistentPostOperation : added ICdmEntitySessionEnabled to constructor RemotingLoginDialog : added functionality to directly connect to local dev eclipse cdmserver if vm arg is present
ApplicationUtil : Added 'Remoting' to title CdmTransientEntityCacher : corrected recursive call for delete functionality RemotingLoginDialog : Added refresh functionality PolytomousKeyTest : updated test data and added tests for delete functionality
editorApplicationContext : reverted stand-alone app context conf RemotingLoginDialog : updated dialog with server fetch
CdmServerInstanceInfo, RemotingLoginDialog, ShowRemotingLoginWindowHandler : functionality for remoting login moved classes to appropriate locations. merged from trunk.
refactored default language selection methods.
Added Default Language Selection for the TaxonomicEditor to fix #4358
Moved all logging and dialog functionality to the new class MessagingUtils. Refactoring code to adapt to above change. Added new custom error dialog - CdmErrorDialog Added runtime exception handling to the ApplicationWorkbenchAdvisor by adding a custom status handler
remove deprecated method
fixing #4116 (ClassCastException when selecting Euro+Med top level area in DistributionElement details view)
solving #4013 (GrantedAuthority: Humane label of TaxonNode authorities)
merge-update of trunk and disabling GUI-Control separation
fix ClassCast for Teams
added conversationholder.commit fix to AbstractFilteredCdmResourceSelectionDialog and comments for this fix (with ticket number) for all files
Fix duplicated named areas vocabularies in dialog (see also #3843)
change voc uuid handling
remove use of TermService.findByEnum
rename FieldObservation -> FieldUnit #3566
rename field observation in NewFieldObservationWizard.java and rename the class #3566
rename NewFieldObservationWizard.java and label #3566
merge-update from trunk
merged trunk into branch
merged model adaptions to cdmlib 3.2.4 from campanula branch
merged/implemented cdm3.3 model adaptations
SpecimenOrObservationTypeSelectionDialog : new dialog which allows user to choose from known SpecimenOrObservationTypes AbstractFilteredCdmResourceSelectionDialog: added check to make sure that wizard does return a non-null entity
AbstractFilteredCdmEnumSelectionDialog : new abstract class for a filtered selection dialog on IEnumTerm objects OriginalSourceTypeSelectionDialog : first concrete implementation of AbstractFilteredCdmEnumSelectionDialog for OriginalSourceTypeSelectionDialog
updates for 3.3 model changes. Phase two commit, which contains method changes / updates
Aligning Editor with 3.3 model changes. First phase commit which updates only the classes. Branch not compilable at the moment.
solved #2990 (implement missing parts of Groups admin details view)
GrantedAuthoritySelectionDialog implemented for #2990 (implement missing parts of Groups admin details view)
merging in latest changes from trunk, up to r15854 (editor starts without issues)
Refactoring of selection elements. Additional minor refactoring. Fixed a bug with Translation Editor (#2752)
Fixes #2681
refactoring of package names for consistency