Cherian Mathew [Wed, 30 Sep 2015 10:49:08 +0000 (12:49 +0200)]
Add check to ensure merge in editors is performed only in remoting
Cherian Mathew [Tue, 29 Sep 2015 08:34:15 +0000 (10:34 +0200)]
#5291 Disable data change event firing in case of remoting
U-BGBM\k.luther [Mon, 28 Sep 2015 07:58:44 +0000 (09:58 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
U-BGBM\k.luther [Mon, 28 Sep 2015 07:57:44 +0000 (09:57 +0200)]
minor
Cherian Mathew [Thu, 24 Sep 2015 09:58:01 +0000 (11:58 +0200)]
Add missing properties file for tests
Cherian Mathew [Thu, 24 Sep 2015 09:03:40 +0000 (11:03 +0200)]
#5247 Fix duplicate entity issue for new entities by using the new merge service method which returns the input transient object
Cherian Mathew [Mon, 21 Sep 2015 09:41:03 +0000 (11:41 +0200)]
#5247 Use updated entities
Cherian Mathew [Mon, 21 Sep 2015 09:39:42 +0000 (11:39 +0200)]
#5250 Initial attempt at property paths
U-BGBM\k.luther [Wed, 23 Sep 2015 12:29:31 +0000 (14:29 +0200)]
merge with local branch
U-BGBM\k.luther [Wed, 23 Sep 2015 11:21:17 +0000 (13:21 +0200)]
fix delete of taxon which is in two classifications and has children
Cherian Mathew [Wed, 23 Sep 2015 10:26:26 +0000 (12:26 +0200)]
Remove profile for clean goals to delete cdmlib jars
Cherian Mathew [Tue, 22 Sep 2015 16:44:14 +0000 (18:44 +0200)]
Merge branch 'remoting-4.0' into develop
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/CreateFieldUnitHandler.java
Patrick Plitzner [Mon, 21 Sep 2015 15:56:03 +0000 (17:56 +0200)]
Sort classifications in dropdown of taxon node selection dialog (#5184)
Patrick Plitzner [Mon, 21 Sep 2015 15:50:25 +0000 (17:50 +0200)]
Pre-select current classification for taxon node selection dialog
(#3462)
Patrick Plitzner [Mon, 21 Sep 2015 15:49:11 +0000 (17:49 +0200)]
Delete unused method
Patrick Plitzner [Mon, 21 Sep 2015 15:14:03 +0000 (17:14 +0200)]
Trim code
Patrick Plitzner [Mon, 21 Sep 2015 15:06:37 +0000 (17:06 +0200)]
Expand polytomous key section #3461
Patrick Plitzner [Mon, 21 Sep 2015 15:04:15 +0000 (17:04 +0200)]
Trim code
Patrick Plitzner [Mon, 21 Sep 2015 14:57:26 +0000 (16:57 +0200)]
Add geoscopes and taxonomic scope as subsection to polytomous key detail
element
Patrick Plitzner [Tue, 22 Sep 2015 06:13:48 +0000 (08:13 +0200)]
Add selection listener to media detail element to allow showing
supplemental data (#3367)
Patrick Plitzner [Tue, 22 Sep 2015 06:10:50 +0000 (08:10 +0200)]
Fix media view selection
Patrick Plitzner [Mon, 21 Sep 2015 13:02:39 +0000 (15:02 +0200)]
Generalized UriWithLabelElement to use super class
Patrick Plitzner [Mon, 21 Sep 2015 12:40:22 +0000 (14:40 +0200)]
Add Lsid text field to taxonname details view
- added generic abstract class for URI text fields
Patrick Plitzner [Mon, 21 Sep 2015 07:57:58 +0000 (09:57 +0200)]
Disable menu "New..." meun entries when no connection available (#4901)
Patrick Plitzner [Mon, 21 Sep 2015 07:44:30 +0000 (09:44 +0200)]
Disable media view when synonym selected (#5195)
Patrick Plitzner [Mon, 21 Sep 2015 07:30:33 +0000 (09:30 +0200)]
I18n for specimen editor (#5155)
Cherian Mathew [Wed, 16 Sep 2015 19:24:25 +0000 (21:24 +0200)]
Fix merge
Cherian Mathew [Wed, 16 Sep 2015 17:51:11 +0000 (19:51 +0200)]
Fix versions
Cherian Mathew [Wed, 16 Sep 2015 17:42:52 +0000 (19:42 +0200)]
Fix versions
Cherian Mathew [Wed, 16 Sep 2015 17:19:25 +0000 (19:19 +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
eu.etaxonomy.taxeditor.cdmlib/pom.xml
Cherian Mathew [Wed, 16 Sep 2015 17:14:52 +0000 (19:14 +0200)]
Fix versions
Cherian Mathew [Wed, 16 Sep 2015 17:06:35 +0000 (19:06 +0200)]
Set second demo server ip
jenkins [Wed, 16 Sep 2015 16:28:06 +0000 (18:28 +0200)]
Revert project versions to 3.11.0-SNAPSHOT
jenkins [Wed, 16 Sep 2015 16:27:11 +0000 (18:27 +0200)]
Updated version in pom / project files to taxeditor version : 3.12.0-SNAPSHOT and cdmlib version : 3.12.0-SNAPSHOT
Cherian Mathew [Wed, 16 Sep 2015 13:54:01 +0000 (15:54 +0200)]
Fix for cdmlib version numbers
Patrick Plitzner [Wed, 16 Sep 2015 13:22:51 +0000 (15:22 +0200)]
Fix label consistency #5133
Patrick Plitzner [Tue, 15 Sep 2015 14:03:30 +0000 (16:03 +0200)]
Add i18n to binary build path
Cherian Mathew [Wed, 16 Sep 2015 13:01:54 +0000 (15:01 +0200)]
Cache the default feature tree
Cherian Mathew [Wed, 16 Sep 2015 12:59:59 +0000 (14:59 +0200)]
#5259 initialising default ranks
Cherian Mathew [Tue, 15 Sep 2015 19:01:23 +0000 (21:01 +0200)]
Update test versions
Cherian Mathew [Tue, 15 Sep 2015 18:38:52 +0000 (20:38 +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 [Tue, 15 Sep 2015 18:35:49 +0000 (20:35 +0200)]
Correct versions
Cherian Mathew [Tue, 15 Sep 2015 16:52:20 +0000 (18:52 +0200)]
Add null check for session
Cherian Mathew [Tue, 15 Sep 2015 16:44:52 +0000 (18:44 +0200)]
#5250 Add property paths to speed up search
jenkins [Tue, 15 Sep 2015 16:23:11 +0000 (18:23 +0200)]
updating poms for 3.11.0-SNAPSHOT development
Cherian Mathew [Tue, 15 Sep 2015 16:23:02 +0000 (18:23 +0200)]
#5228 Add wait cursor when loading data
jenkins [Tue, 15 Sep 2015 16:22:25 +0000 (18:22 +0200)]
Revert project versions to 3.10.0-SNAPSHOT
jenkins [Tue, 15 Sep 2015 16:21:30 +0000 (18:21 +0200)]
Updated version in pom / project files to taxeditor version : 3.11.0-SNAPSHOT and cdmlib version : 3.11.0-SNAPSHOT
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
jenkins [Fri, 11 Sep 2015 12:15:00 +0000 (14:15 +0200)]
Merge branch 'release/3.8.0'
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/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature.platform/pom.xml
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.feature/pom.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.help/pom.xml
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/pom.xml
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/pom.xml
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/pom.xml
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
eu.etaxonomy.taxeditor/pom.xml
pom.xml
jenkins [Fri, 11 Sep 2015 11:45:00 +0000 (13:45 +0200)]
Revert osgi versions
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
jenkins [Thu, 10 Sep 2015 15:59:57 +0000 (17:59 +0200)]
updating poms for branch'release/3.8.0' with non-snapshot versions
jenkins [Thu, 10 Sep 2015 15:58:39 +0000 (17:58 +0200)]
Revert project versions to 3.8.0-SNAPSHOT
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
jenkins [Thu, 10 Sep 2015 15:57:30 +0000 (17:57 +0200)]
Updated version in pom / project files to taxeditor version : 3.8.0 and cdmlib version : 3.8.0
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:01:25 +0000 (17:01 +0200)]
Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
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 15:00:11 +0000 (17:00 +0200)]
updating poms for 3.8.0 branch with snapshot versions
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)
BGBM BDI Projects / taxeditor.git / log