Patrick Plitzner [Wed, 1 Jul 2015 07:15:39 +0000 (09:15 +0200)]
Add missing transient method
Patrick Plitzner [Wed, 1 Jul 2015 07:23:39 +0000 (09:23 +0200)]
Map preparation materials to derivation event description
Patrick Plitzner [Tue, 30 Jun 2015 11:47:51 +0000 (13:47 +0200)]
Make background of icon transparent
Patrick Plitzner [Mon, 29 Jun 2015 14:01:34 +0000 (16:01 +0200)]
Add icon for switching to advanced media view
Cherian Mathew [Mon, 29 Jun 2015 12:52:58 +0000 (14:52 +0200)]
Update transient services with new delete method
Patrick Plitzner [Mon, 29 Jun 2015 12:26:07 +0000 (14:26 +0200)]
Show abbreviated title cache for authors and refernce in taxon details
view
Patrick Plitzner [Wed, 24 Jun 2015 17:55:55 +0000 (19:55 +0200)]
Show URI parsing exceptions below URI text field (fixes #5055, #5003, #4587)
Patrick Plitzner [Wed, 24 Jun 2015 18:58:19 +0000 (20:58 +0200)]
Avoid duplication of edited team member (#4997)
Patrick Plitzner [Wed, 24 Jun 2015 19:39:38 +0000 (21:39 +0200)]
Add no marker without a markerType (#4588)
Patrick Plitzner [Mon, 29 Jun 2015 11:41:37 +0000 (13:41 +0200)]
Add ticket number to TODO
Patrick Plitzner [Mon, 29 Jun 2015 10:15:24 +0000 (12:15 +0200)]
Refresh view after media view has been switched
Patrick Plitzner [Mon, 29 Jun 2015 10:01:12 +0000 (12:01 +0200)]
Add MediaViewSwitch to media collection elements
Refactored code to use a static method that creates the IAction object.
This can be added by the GUI element itself.
Patrick Plitzner [Mon, 29 Jun 2015 05:04:53 +0000 (07:04 +0200)]
Add button for advanced media view to media attached to desccriptions
Patrick Plitzner [Sat, 27 Jun 2015 12:16:14 +0000 (14:16 +0200)]
Remove duplicate code for advanced media view (#4862)
Refactored code and added interface and abstract class to avoid
duplicate code.
Patrick Plitzner [Sat, 27 Jun 2015 12:13:59 +0000 (14:13 +0200)]
Remove comments
Patrick Plitzner [Wed, 24 Jun 2015 19:40:05 +0000 (21:40 +0200)]
Remove comments
Patrick Plitzner [Wed, 24 Jun 2015 12:18:47 +0000 (14:18 +0200)]
Fix typo
Cherian Mathew [Fri, 26 Jun 2015 15:49:01 +0000 (17:49 +0200)]
#5036 Add missing command for polytomous key delete
Cherian Mathew [Thu, 25 Jun 2015 15:21:07 +0000 (17:21 +0200)]
Fix remoting code compilation errors
Patrick Plitzner [Wed, 24 Jun 2015 12:19:58 +0000 (14:19 +0200)]
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
Patrick Plitzner [Wed, 24 Jun 2015 12:19:43 +0000 (14:19 +0200)]
Empty text fields return empty string and not null
k.luther [Wed, 24 Jun 2015 11:08:18 +0000 (13:08 +0200)]
Revert "index on develop:
6992bef Rename NonViralName authorteams to authorship #4968"
This reverts commit
32cded397931ad359f7818fdfb91a113a074342e.
Andreas Müller [Tue, 23 Jun 2015 16:34:38 +0000 (18:34 +0200)]
Rename NonViralName authorteams to authorship #4968
Cherian Mathew [Tue, 23 Jun 2015 16:22:30 +0000 (18:22 +0200)]
Update cdmlib version to 3.6.3-SNAPSHOT
Cherian Mathew [Tue, 23 Jun 2015 12:45:38 +0000 (14:45 +0200)]
Delete renamed file
Cherian Mathew [Tue, 23 Jun 2015 11:01:02 +0000 (13:01 +0200)]
Fix issues with merge conflicts
Cherian Mathew [Tue, 23 Jun 2015 08:09:36 +0000 (10:09 +0200)]
Fixes from Katja for commit issue
Andreas Müller [Mon, 22 Jun 2015 14:35:17 +0000 (16:35 +0200)]
Fix problem with non persisted taxon titleCache change: #5018
Patrick Plitzner [Mon, 22 Jun 2015 13:50:09 +0000 (15:50 +0200)]
adapt service call to model change
Patrick Plitzner [Mon, 22 Jun 2015 13:49:50 +0000 (15:49 +0200)]
adapt transient service methods to cdmlib changes
Patrick Plitzner [Mon, 22 Jun 2015 12:38:25 +0000 (14:38 +0200)]
- update parent scroll form on property change (fixes #4881)
Patrick Plitzner [Mon, 22 Jun 2015 06:56:23 +0000 (08:56 +0200)]
- removed initial expand of sections
Patrick Plitzner [Mon, 22 Jun 2015 06:50:16 +0000 (08:50 +0200)]
- fixed potential NPE
Patrick Plitzner [Mon, 22 Jun 2015 05:54:33 +0000 (07:54 +0200)]
- fixed potential NPE
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
Patrick Plitzner [Wed, 17 Jun 2015 15:27:48 +0000 (17:27 +0200)]
- split off "Preparation/Preservation section" from dna sample general
section
Cherian Mathew [Mon, 22 Jun 2015 09:31:26 +0000 (11:31 +0200)]
fixed conflicts from last commit
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
Katja Luther [Thu, 18 Jun 2015 13:15:42 +0000 (15:15 +0200)]
change delete argument to UUID
Andreas Müller [Fri, 19 Jun 2015 13:15:04 +0000 (15:15 +0200)]
add empty test folder
Andreas Müller [Thu, 18 Jun 2015 13:22:24 +0000 (15:22 +0200)]
Merge remote-tracking branch 'origin/develop' into develop
Andreas Müller [Thu, 18 Jun 2015 13:04:56 +0000 (15:04 +0200)]
minor
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
Cherian Mathew [Tue, 16 Jun 2015 11:53:53 +0000 (13:53 +0200)]
fixing for compatibility with merged cdmlib
Patrick Plitzner [Mon, 15 Jun 2015 14:11:56 +0000 (16:11 +0200)]
- added transient service methods
Andreas Müller [Mon, 15 Jun 2015 13:23:54 +0000 (15:23 +0200)]
add empty folder
Patrick Plitzner [Mon, 15 Jun 2015 13:08:22 +0000 (15:08 +0200)]
- fixed order of team members #4936
Patrick Plitzner [Mon, 15 Jun 2015 12:31:29 +0000 (14:31 +0200)]
- fixed NPE (#4937)
Patrick Plitzner [Mon, 15 Jun 2015 10:46:37 +0000 (12:46 +0200)]
- removed inBetween target for Derivative Editor (fixes #4966)
Patrick Plitzner [Mon, 15 Jun 2015 07:56:34 +0000 (09:56 +0200)]
- removed test folder
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
pplitzner [Mon, 15 Jun 2015 07:46:19 +0000 (09:46 +0200)]
- removed test folder from classpatch
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
Cherian Mathew [Mon, 8 Jun 2015 11:00:15 +0000 (13:00 +0200)]
fixed manifest versions
Cherian Mathew [Mon, 8 Jun 2015 10:22:13 +0000 (12:22 +0200)]
new .gitignore file
Cherian Mathew [Mon, 8 Jun 2015 10:20:28 +0000 (12:20 +0200)]
removed test source from classpath
Cherian Mathew [Mon, 8 Jun 2015 10:13:56 +0000 (12:13 +0200)]
fixed update to snapshot
Cherian Mathew [Mon, 8 Jun 2015 08:26:47 +0000 (10:26 +0200)]
corrected cdmlib version to snapshot
Cherian Mathew [Fri, 5 Jun 2015 16:16:58 +0000 (18:16 +0200)]
Updating develop poms back to pre merge state
Cherian Mathew [Fri, 5 Jun 2015 16:16:57 +0000 (18:16 +0200)]
Merge branch 'master' into develop
Cherian Mathew [Fri, 5 Jun 2015 16:16:57 +0000 (18:16 +0200)]
Updating develop poms to hotfix version to avoid merge conflicts
Cherian Mathew [Fri, 5 Jun 2015 16:16:56 +0000 (18:16 +0200)]
Merge branch 'hotfix/3.6.1'
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
Cherian Mathew [Fri, 5 Jun 2015 16:15:54 +0000 (18:15 +0200)]
version updates for 3.6.1
Cherian Mathew [Fri, 5 Jun 2015 15:55:12 +0000 (17:55 +0200)]
updating poms for branch '3.6.1' with snapshot versions
Cherian Mathew [Fri, 5 Jun 2015 15:53:49 +0000 (17:53 +0200)]
fixing classpath config
Cherian Mathew [Fri, 5 Jun 2015 15:51:50 +0000 (17:51 +0200)]
fixing classpath config
Cherian Mathew [Fri, 5 Jun 2015 14:42:11 +0000 (16:42 +0200)]
Release 3.6.0 merge
Cherian Mathew [Fri, 5 Jun 2015 14:31:17 +0000 (16:31 +0200)]
merged jgitfow plugin
Cherian Mathew [Fri, 5 Jun 2015 14:12:48 +0000 (16:12 +0200)]
merged for gitflow plugin
Cherian Mathew [Fri, 5 Jun 2015 14:07:00 +0000 (16:07 +0200)]
added jgitflow plugin
Patric Plitzner [Thu, 4 Jun 2015 16:43:56 +0000 (16:43 +0000)]
- updating versions due to release
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
edit-jenkins [Thu, 4 Jun 2015 13:49:43 +0000 (13:49 +0000)]
Updated version in config files to 3.6.1-SNAPSHOT
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
edit-jenkins [Thu, 4 Jun 2015 12:58:53 +0000 (12:58 +0000)]
Updated version in config files to 3.6.0
Patric Plitzner [Thu, 4 Jun 2015 11:23:45 +0000 (11:23 +0000)]
- 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
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)
Patric Plitzner [Thu, 4 Jun 2015 10:52:43 +0000 (10:52 +0000)]
- code conventions
Patric Plitzner [Thu, 4 Jun 2015 10:50:56 +0000 (10:50 +0000)]
- code conventions
Katja Luther [Thu, 4 Jun 2015 09:39:48 +0000 (09:39 +0000)]
minor
Katja Luther [Thu, 4 Jun 2015 09:09:52 +0000 (09:09 +0000)]
add checkbox for additional team members
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
Katja Luther [Wed, 3 Jun 2015 13:19:59 +0000 (13:19 +0000)]
delete taxonnode if taxon is used somewhere else fixed
Katja Luther [Wed, 3 Jun 2015 07:55:09 +0000 (07:55 +0000)]
#4725
Katja Luther [Tue, 2 Jun 2015 12:51:38 +0000 (12:51 +0000)]
minor
Katja Luther [Tue, 2 Jun 2015 09:43:50 +0000 (09:43 +0000)]
fix for #3998
Patric Plitzner [Mon, 1 Jun 2015 08:05:33 +0000 (08:05 +0000)]
- fixed compile error and possible NPE #4810
Cherian Mathew [Fri, 29 May 2015 16:33:14 +0000 (18:33 +0200)]
MANIFEST.MF : added apache commons exception package for use in messaging utils
MessagingUtils : updated to add all causes in the child statuses
Cherian Mathew [Fri, 29 May 2015 14:21:50 +0000 (16:21 +0200)]
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor
Cherian Mathew [Fri, 29 May 2015 14:16:34 +0000 (16:16 +0200)]
DefinedTermDropAdapter : added selection of source objects after drop and disabled insert feedback for non OrderedTermBase objects
DefinedTermEditor : added custom sorter for OrderedTermBase (descending)
MoveDefinedTermOperation : added possibility to move term when cursor is in the insert part of the list
Katja Luther [Thu, 28 May 2015 12:08:37 +0000 (12:08 +0000)]
new session for every search in bulk editor
Andreas M��ller [Thu, 28 May 2015 11:58:16 +0000 (11:58 +0000)]
Improve error message
Cherian Mathew [Thu, 28 May 2015 11:14:15 +0000 (13:14 +0200)]
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor
Cherian Mathew [Thu, 28 May 2015 11:13:24 +0000 (13:13 +0200)]
replaced simple editor-datasource compatibility check with version comparison check
Katja Luther [Thu, 28 May 2015 09:09:42 +0000 (09:09 +0000)]
fixing the disabling of the ToggleableTextElement when the titlecache is protected.
Andreas M��ller [Thu, 28 May 2015 08:28:59 +0000 (08:28 +0000)]
fix potential NPE
Andreas M��ller [Wed, 27 May 2015 16:18:28 +0000 (16:18 +0000)]
cleanup
Andreas M��ller [Wed, 27 May 2015 16:10:04 +0000 (16:10 +0000)]
minor