taxeditor.git
6 years agoMerge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Cherian Mathew [Wed, 24 Jun 2015 07:40:31 +0000 (09:40 +0200)]
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties

6 years agoEnable tests again
Cherian Mathew [Wed, 24 Jun 2015 07:26:41 +0000 (09:26 +0200)]
Enable tests again

6 years ago#4074 : Fix initialisation, use and disposal of mocke session owner
Cherian Mathew [Wed, 24 Jun 2015 07:06:11 +0000 (09:06 +0200)]
#4074 : Fix initialisation, use and disposal of mocke session owner

6 years agoRename NonViralName authorteams to authorship #4968
Andreas Müller [Tue, 23 Jun 2015 16:34:38 +0000 (18:34 +0200)]
Rename NonViralName authorteams to authorship #4968

6 years agoUpdate cdmlib version to 3.6.3-SNAPSHOT
Cherian Mathew [Tue, 23 Jun 2015 16:22:30 +0000 (18:22 +0200)]
Update cdmlib version to 3.6.3-SNAPSHOT

6 years agoFix initialisation of mock session owner
Cherian Mathew [Tue, 23 Jun 2015 16:13:15 +0000 (18:13 +0200)]
Fix initialisation of mock session owner

6 years agoMerge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Cherian Mathew [Tue, 23 Jun 2015 13:06:40 +0000 (15:06 +0200)]
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeComparator.java

6 years agoDelete renamed file
Cherian Mathew [Tue, 23 Jun 2015 12:45:38 +0000 (14:45 +0200)]
Delete renamed file

6 years agoFix remaining conflict
Cherian Mathew [Tue, 23 Jun 2015 11:18:06 +0000 (13:18 +0200)]
Fix remaining conflict

6 years agoMerge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Cherian Mathew [Tue, 23 Jun 2015 11:15:53 +0000 (13:15 +0200)]
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java

6 years agoFix issues with merge conflicts
Cherian Mathew [Tue, 23 Jun 2015 11:01:02 +0000 (13:01 +0200)]
Fix issues with merge conflicts

6 years ago#5007 : Rename move taxon node handler
Cherian Mathew [Tue, 23 Jun 2015 08:28:00 +0000 (10:28 +0200)]
#5007 : Rename move taxon node handler

6 years agoFixes from Katja for commit issue
Cherian Mathew [Tue, 23 Jun 2015 08:09:36 +0000 (10:09 +0200)]
Fixes from Katja for commit issue

6 years ago#5007 : Integrated remoting handler / operations for taxon navigator ui
Cherian Mathew [Tue, 23 Jun 2015 07:31:24 +0000 (09:31 +0200)]
#5007 : Integrated remoting handler / operations for taxon navigator ui

6 years ago#5007 : Add remoting handler / operations for the taxon navigator
Cherian Mathew [Mon, 22 Jun 2015 14:58:55 +0000 (16:58 +0200)]
#5007 : Add remoting handler / operations for the taxon navigator

6 years agoFix problem with non persisted taxon titleCache change: #5018
Andreas Müller [Mon, 22 Jun 2015 14:35:17 +0000 (16:35 +0200)]
Fix problem with non persisted taxon titleCache change: #5018

6 years agoadapt service call to model change
Patrick Plitzner [Mon, 22 Jun 2015 13:50:09 +0000 (15:50 +0200)]
adapt service call to model change

6 years agoadapt transient service methods to cdmlib changes
Patrick Plitzner [Mon, 22 Jun 2015 13:49:50 +0000 (15:49 +0200)]
adapt transient service methods to cdmlib changes

6 years ago - update parent scroll form on property change (fixes #4881)
Patrick Plitzner [Mon, 22 Jun 2015 12:38:25 +0000 (14:38 +0200)]
 - update parent scroll form on property change (fixes #4881)

6 years ago - removed initial expand of sections
Patrick Plitzner [Mon, 22 Jun 2015 06:56:23 +0000 (08:56 +0200)]
 - removed initial expand of sections

6 years ago - fixed potential NPE
Patrick Plitzner [Mon, 22 Jun 2015 06:50:16 +0000 (08:50 +0200)]
 - fixed potential NPE

6 years ago - fixed potential NPE
Patrick Plitzner [Mon, 22 Jun 2015 05:54:33 +0000 (07:54 +0200)]
 - fixed potential NPE

6 years ago - changed type of "Materials & Methods" to text instead of DefinedTerm
Patrick Plitzner [Wed, 17 Jun 2015 15:35:46 +0000 (17:35 +0200)]
 - changed type of "Materials & Methods" to text instead of DefinedTerm
 - fixed label

6 years ago - split off "Preparation/Preservation section" from dna sample general
Patrick Plitzner [Wed, 17 Jun 2015 15:27:48 +0000 (17:27 +0200)]
 - split off "Preparation/Preservation section" from dna sample general
section

6 years agoMerge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Cherian Mathew [Mon, 22 Jun 2015 10:51:55 +0000 (12:51 +0200)]
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
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

6 years agofixed conflicts from last commit
Cherian Mathew [Mon, 22 Jun 2015 09:31:26 +0000 (11:31 +0200)]
fixed conflicts from last commit

6 years agoall delete methods need an Uuid as argument
Katja Luther [Thu, 18 Jun 2015 13:28:35 +0000 (15:28 +0200)]
all delete methods need an Uuid as argument

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
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/TransientReferenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java

6 years agochange delete argument to UUID
Katja Luther [Thu, 18 Jun 2015 13:15:42 +0000 (15:15 +0200)]
change delete argument to UUID

6 years agoadd empty test folder
Andreas Müller [Fri, 19 Jun 2015 13:15:04 +0000 (15:15 +0200)]
add empty test folder

6 years agoTaxonNavigator : added refresh of navigator on data change
Cherian Mathew [Fri, 19 Jun 2015 13:20:14 +0000 (15:20 +0200)]
TaxonNavigator : added refresh of navigator on data change
TaxonNavigatorLabels : new interface with label strings used by taxon navigator handlers
RemotingChangeAcceptedTaxonToSynonymHandler : using TaxonNavigatorLabels
RemotingMoveFactualDataHandler : remoting version of move factual data handler
RemotingMoveFactualDataOperation : remoting version of move factual data operation
RemotingMoveTaxonHandler : remoting version of move taxon handler
RemotingMoveTaxonOperation : remoting version of move taxon operation
RemotingChangeAcceptedTaxonToSynonymOperation : replaced constructor input cdm entities to their uuids
RemotingCdmHandler : updated to handle other status severities and to handle warning status in post operation
RemotingCdmUpdateOperation : updated for warning status
TaxonNavigatorTest : added move taxon and move factual data tests

6 years agoICdmDataChangeService, CdmUIDataChangeService, CdmDataChangeService : added new data...
Cherian Mathew [Fri, 19 Jun 2015 08:31:18 +0000 (10:31 +0200)]
ICdmDataChangeService, CdmUIDataChangeService, CdmDataChangeService : added new data change service with different services for the ui and non-ui states
CdmApplicationState, CdmStore : added data change service to app state
CdmChangeEvent, ICdmChangeListener : added change listener and even to fire in case of data changes
ICdmEntitySessionEnabled : extends new change service interface
ICdmEntitySession, CdmEntitySession : removed data change un/registration since this is now handled by the new data change service
BaseRemotingTest, MockCdmEntitySession, *Editor, *ViewPart, *Navigator : refactoring with new change listener
RemotingCdmHandler, RemotingCdmOperation, RemotingCdmUpdateOperation : added new handler / operation architecture base classes
AbstractUtility : added method for running async operation with callback to handler
RemotingChangeAcceptedTaxonToSynonymHandler,RemotingChangeAcceptedTaxonToSynonymOperation : first implementations of new handler / operation architecture
plugin.xml : added standalone and remoting handlers for ChangeAcceptedTaxonToSynonym
*Test : adapted for new handler / operation and change service

6 years agoRemotingCdmUpdateOperation : corrected exception handling
Cherian Mathew [Wed, 17 Jun 2015 16:24:02 +0000 (18:24 +0200)]
RemotingCdmUpdateOperation : corrected exception handling
RemotingChangeAcceptedTaxonToSynonymOperation : new remoting operation class
server.properties : server properties for test

6 years agorebase from remoting-4.0 branch
Cherian Mathew [Fri, 19 Jun 2015 08:42:09 +0000 (10:42 +0200)]
rebase from remoting-4.0 branch

6 years agoplugin.xml : updated plugin for new remoting handlers
Cherian Mathew [Tue, 16 Jun 2015 11:43:56 +0000 (13:43 +0200)]
plugin.xml : updated plugin for new remoting handlers
RemotingCdmHandler, RemotingCdmOperation, RemotingCdmUpdateOperation : new handler / operation architecture
RemotingChangeAcceptedTaxonToSynonymHandler : using new remoting handler design
CdmStorePropertyTester : added isRemoting test

6 years agoMerge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Cherian Mathew [Thu, 18 Jun 2015 13:33:34 +0000 (15:33 +0200)]
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

6 years agocorrected pom merge
Cherian Mathew [Thu, 18 Jun 2015 13:24:27 +0000 (15:24 +0200)]
corrected pom merge

6 years agoMerge remote-tracking branch 'origin/develop' into develop
Andreas Müller [Thu, 18 Jun 2015 13:22:24 +0000 (15:22 +0200)]
Merge remote-tracking branch 'origin/develop' into develop

6 years agoMerge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Cherian Mathew [Thu, 18 Jun 2015 13:17:06 +0000 (15:17 +0200)]
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/.gitignore
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
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/TransientReferenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
eu.etaxonomy.taxeditor.test/.classpath

6 years agominor
Andreas Müller [Thu, 18 Jun 2015 13:04:56 +0000 (15:04 +0200)]
minor

6 years agosetting root logger setting to WARN
Cherian Mathew [Thu, 18 Jun 2015 12:29:22 +0000 (14:29 +0200)]
setting root logger setting to WARN

6 years agoremoved programmatic log level setting
Cherian Mathew [Thu, 18 Jun 2015 12:08:37 +0000 (14:08 +0200)]
removed programmatic log level setting

6 years agocorrected remote source to use initialzed cdm server
Cherian Mathew [Thu, 18 Jun 2015 11:55:34 +0000 (13:55 +0200)]
corrected remote source to use initialzed cdm server

6 years agosetting root loffer level to warn
Cherian Mathew [Thu, 18 Jun 2015 10:58:11 +0000 (12:58 +0200)]
setting root loffer level to warn

6 years agoCdmRemoteSourceBase : using user service for db checks
Cherian Mathew [Thu, 18 Jun 2015 09:28:20 +0000 (11:28 +0200)]
CdmRemoteSourceBase : using user service for db checks
httpInvokerServiceClients.xml : updated database service config
HttpInvokerServicesTest : added polytomous key service ping
server.properties : added back server properties file

6 years agoCdmApplicationState:New class to handle application state
Cherian Mathew [Thu, 18 Jun 2015 07:45:39 +0000 (09:45 +0200)]
CdmApplicationState:New class to handle application state
CdmStore, BaseRemotingTest : using new application state class
TaxonNavigatorTest : ignoring test for now
TaxonNavigatorTest : increased max memory for jetty

6 years agoignoring bin folder
Cherian Mathew [Wed, 17 Jun 2015 16:27:35 +0000 (18:27 +0200)]
ignoring bin folder

6 years agoMerge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
Patrick Plitzner [Tue, 16 Jun 2015 12:04:22 +0000 (14:04 +0200)]
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop

6 years agofixing for compatibility with merged cdmlib
Cherian Mathew [Tue, 16 Jun 2015 11:53:53 +0000 (13:53 +0200)]
fixing for compatibility with merged cdmlib

6 years agoremoving properties file from repo
Cherian Mathew [Tue, 16 Jun 2015 08:24:03 +0000 (10:24 +0200)]
removing properties file from repo

6 years agoeu.etaxonomy.taxeditor.cdmlib/.classpath,MANIFEST.MF : removed cdm-server jar from...
Cherian Mathew [Tue, 16 Jun 2015 08:18:03 +0000 (10:18 +0200)]
eu.etaxonomy.taxeditor.cdmlib/.classpath,MANIFEST.MF : removed cdm-server jar from classpath
OperationTestBase, TaxonNameEditorTest,  : refactoring
MockConversationEnabled : class to mock interface IConversationEnabled
TaxonNavigatorTest (.xml) : added test + data
cdmTest.*.db : latest test db

6 years agoremoved reference to cdm-server
Cherian Mathew [Mon, 15 Jun 2015 14:21:12 +0000 (16:21 +0200)]
removed reference to cdm-server

6 years ago - added transient service methods
Patrick Plitzner [Mon, 15 Jun 2015 14:11:56 +0000 (16:11 +0200)]
 - added transient service methods

6 years agoadd empty folder
Andreas Müller [Mon, 15 Jun 2015 13:23:54 +0000 (15:23 +0200)]
add empty folder

6 years ago - fixed order of team members #4936
Patrick Plitzner [Mon, 15 Jun 2015 13:08:22 +0000 (15:08 +0200)]
 - fixed order of team members #4936

6 years ago - fixed NPE (#4937)
Patrick Plitzner [Mon, 15 Jun 2015 12:31:29 +0000 (14:31 +0200)]
 - fixed NPE (#4937)

6 years ago - removed inBetween target for Derivative Editor (fixes #4966)
Patrick Plitzner [Mon, 15 Jun 2015 10:46:37 +0000 (12:46 +0200)]
 - removed inBetween target for Derivative Editor (fixes #4966)

6 years ago - removed test folder
Patrick Plitzner [Mon, 15 Jun 2015 07:56:34 +0000 (09:56 +0200)]
 - removed test folder

6 years agoMerge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
Patrick Plitzner [Mon, 15 Jun 2015 07:49:29 +0000 (09:49 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop

6 years ago - removed test folder from classpatch
pplitzner [Mon, 15 Jun 2015 07:46:19 +0000 (09:46 +0200)]
 - removed test folder from classpatch

6 years agofix umlaute in key menus and add gitignore for rcp.target
Andreas Müller [Fri, 12 Jun 2015 15:37:21 +0000 (17:37 +0200)]
fix umlaute in key menus and add gitignore for rcp.target

6 years agoBaseRemotingTest, RemotingSessionAwareTest : made abstract since there are not runnab...
Cherian Mathew [Fri, 12 Jun 2015 13:01:34 +0000 (15:01 +0200)]
BaseRemotingTest, RemotingSessionAwareTest : made abstract since there are not runnable tests
CdmEntitySessionManagerTest (.xml) : fixed test data

6 years agoRemotingSessionAwareTest : added new class which handles pre-config of test classes...
Cherian Mathew [Fri, 12 Jun 2015 12:29:20 +0000 (14:29 +0200)]
RemotingSessionAwareTest : added new class which handles pre-config of test classes which require a session
*Test.java : set super class to RemotingSessionAwareTest
*.xml : removed DefinedTermBase entites from datasets so that the terms are not deleted
ServiceInterceptorTest : correction

6 years agofixed issues with resource loading for maven int tests
Cherian Mathew [Thu, 11 Jun 2015 15:50:02 +0000 (17:50 +0200)]
fixed issues with resource loading for maven int tests

6 years agocorrected merge to latest snapshot version
Cherian Mathew [Thu, 11 Jun 2015 08:50:35 +0000 (10:50 +0200)]
corrected merge to latest snapshot version
updated hibernate config file and test db
setup testing framework with jetty and maven

6 years agofixed classpath issues and issues from last merge
Cherian Mathew [Tue, 9 Jun 2015 07:32:37 +0000 (09:32 +0200)]
fixed classpath issues and issues from last merge

6 years agofixed manifest versions
Cherian Mathew [Mon, 8 Jun 2015 11:00:15 +0000 (13:00 +0200)]
fixed manifest versions

6 years agonew .gitignore file
Cherian Mathew [Mon, 8 Jun 2015 10:22:13 +0000 (12:22 +0200)]
new .gitignore file

6 years agoremoved test source from classpath
Cherian Mathew [Mon, 8 Jun 2015 10:20:28 +0000 (12:20 +0200)]
removed test source from classpath

6 years agofixed update to snapshot
Cherian Mathew [Mon, 8 Jun 2015 10:13:56 +0000 (12:13 +0200)]
fixed update to snapshot

6 years agocorrected cdmlib version to snapshot
Cherian Mathew [Mon, 8 Jun 2015 08:26:47 +0000 (10:26 +0200)]
corrected cdmlib version to snapshot

6 years agoUpdating develop poms back to pre merge state
Cherian Mathew [Fri, 5 Jun 2015 16:16:58 +0000 (18:16 +0200)]
Updating develop poms back to pre merge state

6 years agoMerge branch 'master' into develop
Cherian Mathew [Fri, 5 Jun 2015 16:16:57 +0000 (18:16 +0200)]
Merge branch 'master' into develop

6 years agoUpdating develop poms to hotfix version to avoid merge conflicts
Cherian Mathew [Fri, 5 Jun 2015 16:16:57 +0000 (18:16 +0200)]
Updating develop poms to hotfix version to avoid merge conflicts

6 years agoMerge branch 'hotfix/3.6.1'
Cherian Mathew [Fri, 5 Jun 2015 16:16:56 +0000 (18:16 +0200)]
Merge branch 'hotfix/3.6.1'

6 years agoupdating poms for branch'hotfix/3.6.1' with non-snapshot versions
Cherian Mathew [Fri, 5 Jun 2015 16:16:54 +0000 (18:16 +0200)]
updating poms for branch'hotfix/3.6.1' with non-snapshot versions

6 years agoversion updates for 3.6.1
Cherian Mathew [Fri, 5 Jun 2015 16:15:54 +0000 (18:15 +0200)]
version updates for 3.6.1

6 years agoupdating poms for branch '3.6.1' with snapshot versions
Cherian Mathew [Fri, 5 Jun 2015 15:55:12 +0000 (17:55 +0200)]
updating poms for branch '3.6.1' with snapshot versions

6 years agofixing classpath config
Cherian Mathew [Fri, 5 Jun 2015 15:53:49 +0000 (17:53 +0200)]
fixing classpath config

6 years agofixing classpath config
Cherian Mathew [Fri, 5 Jun 2015 15:51:50 +0000 (17:51 +0200)]
fixing classpath config

6 years agoRelease 3.6.0 merge root/tags/taxeditor/3.6.0 3.6.0
Cherian Mathew [Fri, 5 Jun 2015 14:42:11 +0000 (16:42 +0200)]
Release 3.6.0 merge

6 years agomerged jgitfow plugin
Cherian Mathew [Fri, 5 Jun 2015 14:31:17 +0000 (16:31 +0200)]
merged jgitfow plugin

6 years agomerged for gitflow plugin
Cherian Mathew [Fri, 5 Jun 2015 14:12:48 +0000 (16:12 +0200)]
merged for gitflow plugin

6 years agoadded jgitflow plugin
Cherian Mathew [Fri, 5 Jun 2015 14:07:00 +0000 (16:07 +0200)]
added jgitflow plugin

6 years agoMerge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Cherian Mathew [Fri, 5 Jun 2015 11:23:02 +0000 (13:23 +0200)]
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
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/DeleteOperation.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/ChangeAcceptedTaxonToSynonymOperation.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java
eu.etaxonomy.taxeditor.store/plugin.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java

6 years ago - updating versions due to release
Patric Plitzner [Thu, 4 Jun 2015 16:43:56 +0000 (16:43 +0000)]
 - updating versions due to release

6 years agoupdated to snapshot version
Cherian Mathew [Thu, 4 Jun 2015 13:55:14 +0000 (15:55 +0200)]
updated to snapshot version

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

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

6 years agoUpdated version in config files to 3.6.1-SNAPSHOT attic/trunk/taxeditor/24113
edit-jenkins [Thu, 4 Jun 2015 13:49:43 +0000 (13:49 +0000)]
Updated version in config files to 3.6.1-SNAPSHOT

6 years agoMerge branch 'move-to-luna' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop
Cherian Mathew [Thu, 4 Jun 2015 13:30:07 +0000 (15:30 +0200)]
Merge branch 'move-to-luna' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop

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

6 years agoUpdated version in config files to 3.6.0
edit-jenkins [Thu, 4 Jun 2015 12:58:53 +0000 (12:58 +0000)]
Updated version in config files to 3.6.0

6 years ago - added wizard page listener to react on ENTER key #4853
Patric Plitzner [Thu, 4 Jun 2015 11:23:45 +0000 (11:23 +0000)]
 - added wizard page listener to react on ENTER key #4853

6 years ago - added wizard page listener to react on ENTER key #4853
Patric Plitzner [Thu, 4 Jun 2015 10:57:39 +0000 (10:57 +0000)]
 - added wizard page listener to react on ENTER key #4853

6 years ago - added context menu entry for editing classifications
Patric Plitzner [Thu, 4 Jun 2015 10:54:32 +0000 (10:54 +0000)]
 - added context menu entry for editing classifications
 - used generic extension point for cdmViewer in navigation project (#4865)

6 years ago - code conventions
Patric Plitzner [Thu, 4 Jun 2015 10:52:43 +0000 (10:52 +0000)]
 - code conventions

6 years ago - code conventions
Patric Plitzner [Thu, 4 Jun 2015 10:50:56 +0000 (10:50 +0000)]
 - code conventions

6 years agominor
Katja Luther [Thu, 4 Jun 2015 09:39:48 +0000 (09:39 +0000)]
minor

6 years agoadd checkbox for additional team members
Katja Luther [Thu, 4 Jun 2015 09:09:52 +0000 (09:09 +0000)]
add checkbox for additional team members

6 years agochange synonym to accepted taxon message when taxon could not be deleted
Katja Luther [Wed, 3 Jun 2015 13:22:24 +0000 (13:22 +0000)]
change synonym to accepted taxon message when taxon could not be deleted

6 years agodelete taxonnode if taxon is used somewhere else fixed
Katja Luther [Wed, 3 Jun 2015 13:19:59 +0000 (13:19 +0000)]
delete taxonnode if taxon is used somewhere else fixed

6 years agoremoved unused config and added comments
Cherian Mathew [Wed, 3 Jun 2015 12:50:15 +0000 (14:50 +0200)]
removed unused config and added comments

6 years agoreset swtbot dependencies and set all swtbot tests to ignore for the moment
Cherian Mathew [Wed, 3 Jun 2015 12:38:20 +0000 (14:38 +0200)]
reset swtbot dependencies and set all swtbot tests to ignore for the moment