Cherian Mathew [Tue, 15 Sep 2015 15:37:43 +0000 (17:37 +0200)]
Merge branch 'develop' into remoting-4.0
Cherian Mathew [Tue, 15 Sep 2015 15:07:27 +0000 (17:07 +0200)]
#5252 Add remove method to manually remove root derivate
Cherian Mathew [Tue, 15 Sep 2015 14:45:00 +0000 (16:45 +0200)]
Add demo servers to server list
Patrick Plitzner [Tue, 15 Sep 2015 12:48:51 +0000 (14:48 +0200)]
Add missing i18n properties to build path
Cherian Mathew [Tue, 15 Sep 2015 11:47:55 +0000 (13:47 +0200)]
Update test version numbers
Cherian Mathew [Tue, 15 Sep 2015 11:07:08 +0000 (13:07 +0200)]
Correct webapp war name change
Cherian Mathew [Tue, 15 Sep 2015 10:11:19 +0000 (12:11 +0200)]
Merge branch 'develop' into remoting-4.0
Conflicts:
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
Patrick Plitzner [Tue, 15 Sep 2015 09:16:09 +0000 (11:16 +0200)]
Fix initialization problems for preferences and editor input
Cherian Mathew [Tue, 15 Sep 2015 08:55:36 +0000 (10:55 +0200)]
Merge branch 'develop' into remoting-4.0
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
Patrick Plitzner [Tue, 15 Sep 2015 08:52:47 +0000 (10:52 +0200)]
Add preference for opening a newly created specimen in specimen editor
Patrick Plitzner [Mon, 14 Sep 2015 14:28:12 +0000 (16:28 +0200)]
Open a newly created specimen in specimen editor
jenkins [Mon, 14 Sep 2015 16:02:45 +0000 (18:02 +0200)]
updating poms for 3.10.0-SNAPSHOT development
jenkins [Mon, 14 Sep 2015 16:01:56 +0000 (18:01 +0200)]
Revert project versions to 3.9.0-SNAPSHOT
jenkins [Mon, 14 Sep 2015 16:00:56 +0000 (18:00 +0200)]
Updated version in pom / project files to taxeditor version : 3.10.0-SNAPSHOT and cdmlib version : 3.10.0-SNAPSHOT
Cherian Mathew [Mon, 14 Sep 2015 16:00:32 +0000 (18:00 +0200)]
re-initialise group object in input constructor
Cherian Mathew [Mon, 14 Sep 2015 15:01:36 +0000 (17:01 +0200)]
#5202 Added alphabetical sort for cdm instances list
Cherian Mathew [Mon, 14 Sep 2015 14:37:41 +0000 (16:37 +0200)]
Merge branch 'develop' into remoting-4.0
Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java
Cherian Mathew [Mon, 14 Sep 2015 14:21:43 +0000 (16:21 +0200)]
#5242, #5223 Improve performance of derivate loading and editing
Patrick Plitzner [Mon, 14 Sep 2015 12:50:49 +0000 (14:50 +0200)]
Use wizard to create new specimen
Patrick Plitzner [Mon, 14 Sep 2015 12:38:35 +0000 (14:38 +0200)]
Trim code
Patrick Plitzner [Mon, 14 Sep 2015 09:13:55 +0000 (11:13 +0200)]
Keep media view and factual data view enabled when no significant
selection occurs (#5195)
Patrick Plitzner [Mon, 14 Sep 2015 09:04:43 +0000 (11:04 +0200)]
Trim code
Cherian Mathew [Fri, 11 Sep 2015 15:36:20 +0000 (17:36 +0200)]
#5223 Replace service methods with similar entity calls
Cherian Mathew [Fri, 11 Sep 2015 13:29:12 +0000 (15:29 +0200)]
Fix incorrect merge
Cherian Mathew [Fri, 11 Sep 2015 12:42:00 +0000 (14:42 +0200)]
Fix incorrect merge
Cherian Mathew [Fri, 11 Sep 2015 08:36:18 +0000 (10:36 +0200)]
Correct version
Cherian Mathew [Fri, 11 Sep 2015 08:35:02 +0000 (10:35 +0200)]
Correct version
Cherian Mathew [Thu, 10 Sep 2015 19:37:50 +0000 (21:37 +0200)]
Correct osgi version
Cherian Mathew [Thu, 10 Sep 2015 16:48:34 +0000 (18:48 +0200)]
Update snapshot version
Cherian Mathew [Thu, 10 Sep 2015 16:25:04 +0000 (18:25 +0200)]
#5237 Add changes from stand alone handler
Cherian Mathew [Thu, 10 Sep 2015 15:58:23 +0000 (17:58 +0200)]
Merge branch 'develop' into remoting-4.0
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
Cherian Mathew [Thu, 10 Sep 2015 15:42:26 +0000 (17:42 +0200)]
Merge branch 'develop' into remoting-4.0
Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
jenkins [Thu, 10 Sep 2015 15:00:12 +0000 (17:00 +0200)]
updating poms for 3.9.0-SNAPSHOT development
jenkins [Thu, 10 Sep 2015 14:59:06 +0000 (16:59 +0200)]
Revert project versions to 3.8.0-SNAPSHOT
jenkins [Thu, 10 Sep 2015 14:57:18 +0000 (16:57 +0200)]
Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT
Andreas Kohlbecker [Thu, 10 Sep 2015 14:22:50 +0000 (16:22 +0200)]
Revert "Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT"
This reverts commit
7ed2ce1e9eca6a9dd72c740e72efdcd6ef1135c9.
Andreas Kohlbecker [Thu, 10 Sep 2015 14:22:34 +0000 (16:22 +0200)]
Revert "Revert project versions to 3.8.0-SNAPSHOT"
This reverts commit
e8268306693f047beef36ce53524adc00946cf74.
jenkins [Thu, 10 Sep 2015 13:54:03 +0000 (15:54 +0200)]
Revert project versions to 3.8.0-SNAPSHOT
jenkins [Thu, 10 Sep 2015 13:53:04 +0000 (15:53 +0200)]
Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT
Cherian Mathew [Thu, 10 Sep 2015 12:05:32 +0000 (14:05 +0200)]
#5234 Add correct updated objects to change event
Cherian Mathew [Thu, 10 Sep 2015 09:26:43 +0000 (11:26 +0200)]
#5233 Correct login / password persistence
Cherian Mathew [Thu, 10 Sep 2015 08:59:57 +0000 (10:59 +0200)]
Disable persisting login preferences when connecting to dev server
Cherian Mathew [Thu, 10 Sep 2015 08:42:27 +0000 (10:42 +0200)]
Add initModel call to constructor since it requires the type to be set beforehand
Cherian Mathew [Wed, 9 Sep 2015 15:47:02 +0000 (17:47 +0200)]
#5225 Replace saveOrUpdate with merge for new entity wizards
Patrick Plitzner [Wed, 9 Sep 2015 14:01:48 +0000 (16:01 +0200)]
Moved "Original Name" field to subclass (#5133)
Patrick Plitzner [Wed, 9 Sep 2015 13:32:54 +0000 (15:32 +0200)]
Trim code
Patrick Plitzner [Wed, 9 Sep 2015 13:17:00 +0000 (15:17 +0200)]
Disable media view for taxon bulk editor with no selection (#5162)
Patrick Plitzner [Wed, 9 Sep 2015 12:42:21 +0000 (14:42 +0200)]
Fixed potnetial NPE
Cherian Mathew [Wed, 9 Sep 2015 12:16:56 +0000 (14:16 +0200)]
#5228 Remove unnecessary model init on refresh
Cherian Mathew [Wed, 9 Sep 2015 11:53:08 +0000 (13:53 +0200)]
Cleanup unused code
Patrick Plitzner [Wed, 9 Sep 2015 11:43:52 +0000 (13:43 +0200)]
Optimize Code #5103
Patrick Plitzner [Wed, 9 Sep 2015 11:22:41 +0000 (13:22 +0200)]
I18n for derivative module
Patrick Plitzner [Wed, 9 Sep 2015 09:57:35 +0000 (11:57 +0200)]
I18n for Specimen Editor
Patrick Plitzner [Wed, 9 Sep 2015 09:57:12 +0000 (11:57 +0200)]
Replace URL with URI in exception message
Cherian Mathew [Wed, 9 Sep 2015 11:18:03 +0000 (13:18 +0200)]
Add new service call
Cherian Mathew [Wed, 9 Sep 2015 11:15:31 +0000 (13:15 +0200)]
#5224 Using new cdmlib call for changing synonym to accepted taxon
Patrick Plitzner [Wed, 9 Sep 2015 09:07:53 +0000 (11:07 +0200)]
Correct german translation (#5062, #5199)
Cherian Mathew [Tue, 8 Sep 2015 18:49:12 +0000 (20:49 +0200)]
Merge branch 'develop' into remoting-4.0
Conflicts:
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/TransientOccurenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
Cherian Mathew [Tue, 8 Sep 2015 17:08:37 +0000 (19:08 +0200)]
Add unimplemented methods
Cherian Mathew [Tue, 8 Sep 2015 15:55:24 +0000 (17:55 +0200)]
#5213 Use method to move descriptions using uuids
Cherian Mathew [Tue, 8 Sep 2015 15:54:33 +0000 (17:54 +0200)]
Add annotation service to config
Patrick Plitzner [Tue, 8 Sep 2015 13:34:15 +0000 (15:34 +0200)]
Trim code
Cherian Mathew [Tue, 8 Sep 2015 12:03:24 +0000 (14:03 +0200)]
#5214 Fix initialization of remoting session
Cherian Mathew [Mon, 7 Sep 2015 16:35:15 +0000 (18:35 +0200)]
Replace saveOrUpdate with merge
Cherian Mathew [Mon, 7 Sep 2015 15:39:01 +0000 (17:39 +0200)]
Ignore test server ping tests
Cherian Mathew [Mon, 7 Sep 2015 15:17:25 +0000 (17:17 +0200)]
Ignore edit test server ping test
Cherian Mathew [Mon, 7 Sep 2015 15:05:08 +0000 (17:05 +0200)]
Ignore unauthenticated user test for now
Cherian Mathew [Mon, 7 Sep 2015 13:29:56 +0000 (15:29 +0200)]
#5052 Integrate remoting in granted authorites editor
Cherian Mathew [Mon, 7 Sep 2015 13:29:20 +0000 (15:29 +0200)]
Disable login preferences in case of dev server
Cherian Mathew [Mon, 7 Sep 2015 13:28:57 +0000 (15:28 +0200)]
Add test for unathenticated user
Patrick Plitzner [Mon, 20 Jul 2015 18:16:59 +0000 (20:16 +0200)]
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
Patrick Plitzner [Mon, 7 Sep 2015 11:19:47 +0000 (13:19 +0200)]
Close conversation when closing DerivateSearchView
Patrick Plitzner [Mon, 7 Sep 2015 11:15:21 +0000 (13:15 +0200)]
Fix NPE for advanced media view
Cherian Mathew [Mon, 7 Sep 2015 10:26:16 +0000 (12:26 +0200)]
Enable test for taxon nodes deletion
Cherian Mathew [Mon, 7 Sep 2015 10:25:48 +0000 (12:25 +0200)]
Check if updated objects are null
Cherian Mathew [Mon, 7 Sep 2015 10:25:22 +0000 (12:25 +0200)]
Set read timeout for services to infinite
Cherian Mathew [Mon, 7 Sep 2015 08:58:08 +0000 (10:58 +0200)]
Replace spring application context loading with programmatic loading
Cherian Mathew [Fri, 4 Sep 2015 09:42:17 +0000 (11:42 +0200)]
Correct test to use uuids
Cherian Mathew [Fri, 4 Sep 2015 08:37:38 +0000 (10:37 +0200)]
Fix new occurrence / sequence move method calls
Cherian Mathew [Fri, 4 Sep 2015 08:33:25 +0000 (10:33 +0200)]
Correct transient service method
Cherian Mathew [Thu, 3 Sep 2015 17:07:32 +0000 (19:07 +0200)]
#5187 Use new move methods with uuids as args
Cherian Mathew [Thu, 3 Sep 2015 16:31:02 +0000 (18:31 +0200)]
Update operation for move taxon nodes
Cherian Mathew [Thu, 3 Sep 2015 15:54:37 +0000 (17:54 +0200)]
Add unimplemented methods
Cherian Mathew [Thu, 3 Sep 2015 15:42:47 +0000 (17:42 +0200)]
Correct merge
Cherian Mathew [Thu, 3 Sep 2015 15:11:32 +0000 (17:11 +0200)]
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
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/handler/DeleteHandler.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/MoveTaxonHandler.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
eu.etaxonomy.taxeditor.store/plugin.xml
Cherian Mathew [Thu, 3 Sep 2015 13:37:47 +0000 (15:37 +0200)]
#5188 Add special for deleting sequence
Cherian Mathew [Thu, 3 Sep 2015 08:17:43 +0000 (10:17 +0200)]
#5186 Fix erros in sequence merge and creating new specimen
U-BGBM\k.luther [Thu, 3 Sep 2015 10:49:21 +0000 (12:49 +0200)]
minor
U-BGBM\k.luther [Thu, 3 Sep 2015 10:35:48 +0000 (12:35 +0200)]
moving taxonnode with drag & drop as predecessor fixed
Cherian Mathew [Thu, 3 Sep 2015 10:09:39 +0000 (12:09 +0200)]
#5138 Add test for normal Person load case
U-BGBM\k.luther [Thu, 3 Sep 2015 09:57:59 +0000 (11:57 +0200)]
change preferences page for taxonnode sort
Andreas Kohlbecker [Thu, 3 Sep 2015 05:57:04 +0000 (07:57 +0200)]
adapting transient service implementation to changes in cdmlib
- deprecated method removed
U-BGBM\k.luther [Wed, 2 Sep 2015 12:54:03 +0000 (14:54 +0200)]
fixing #5150
U-BGBM\k.luther [Wed, 2 Sep 2015 11:49:31 +0000 (13:49 +0200)]
error handling in deleteHandler/operation of navigator
U-BGBM\k.luther [Wed, 2 Sep 2015 10:27:13 +0000 (12:27 +0200)]
better messaging when convert person to team does not work
U-BGBM\k.luther [Wed, 2 Sep 2015 09:34:32 +0000 (11:34 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
U-BGBM\k.luther [Wed, 2 Sep 2015 09:33:31 +0000 (11:33 +0200)]
moving more than one taxon node, merge of team and person, reusing name for new taxon
Patrick Plitzner [Wed, 2 Sep 2015 09:29:02 +0000 (11:29 +0200)]
Add space to message
Cherian Mathew [Wed, 2 Sep 2015 09:03:19 +0000 (11:03 +0200)]
#5181 Fix incorrect load of CdmServiceCacher when connecting via Datasource view
Cherian Mathew [Tue, 1 Sep 2015 15:45:47 +0000 (17:45 +0200)]
Ignoring test until #5138 is fixed
BGBM BDI Projects / taxeditor.git / log