Project

General

Profile

Statistics
| Branch: | Tag: | Revision:

taxeditor/eu.etaxonomy.taxeditor.application @ dd7f77fb

# Date Author Comment
dd7f77fb 10/05/2015 11:29 AM Patrick Plitzner

Disable menu items when not connected to CDM store (#4901)
a52450e2 09/16/2015 07:42 PM Cherian Mathew

Fix versions
999d37c4 09/16/2015 07:19 PM Cherian Mathew

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
944a3fc3 09/16/2015 06:28 PM jenkins

Revert project versions to 3.11.0-SNAPSHOT
a22860ff 09/16/2015 06:27 PM jenkins

Updated version in pom / project files to taxeditor version : 3.12.0-SNAPSHOT and cdmlib version : 3.12.0-SNAPSHOT
ec3a353f 09/15/2015 08:38 PM Cherian Mathew

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
d78805f8 09/15/2015 06:23 PM jenkins

updating poms for 3.11.0-SNAPSHOT development
6fc9689e 09/15/2015 06:22 PM jenkins

Revert project versions to 3.10.0-SNAPSHOT
995aa2c5 09/15/2015 06:21 PM jenkins

Updated version in pom / project files to taxeditor version : 3.11.0-SNAPSHOT and cdmlib version : 3.11.0-SNAPSHOT
e3bcf994 09/15/2015 10:55 AM Cherian Mathew

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
1b8d0e4d 09/14/2015 06:02 PM jenkins

updating poms for 3.10.0-SNAPSHOT development
8c9356dc 09/14/2015 06:01 PM jenkins

Revert project versions to 3.9.0-SNAPSHOT
129e2ea3 09/14/2015 06:00 PM jenkins

Updated version in pom / project files to taxeditor version : 3.10.0-SNAPSHOT and cdmlib version : 3.10.0-SNAPSHOT
667025a5 09/14/2015 04:37 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java
18358a52 09/10/2015 05:58 PM Cherian Mathew

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
f27dd202 09/10/2015 05:00 PM jenkins

updating poms for 3.9.0-SNAPSHOT development
d14cdfb8 09/10/2015 04:59 PM jenkins

Revert project versions to 3.8.0-SNAPSHOT
4991d5fa 09/10/2015 04:57 PM jenkins

Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT
627fcabe 09/10/2015 04:22 PM Andreas Kohlbecker

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.
69040a4b 09/10/2015 04:22 PM Andreas Kohlbecker

Revert "Revert project versions to 3.8.0-SNAPSHOT"

This reverts commit e8268306693f047beef36ce53524adc00946cf74.
e8268306 09/10/2015 03:54 PM jenkins

Revert project versions to 3.8.0-SNAPSHOT
7ed2ce1e 09/10/2015 03:53 PM jenkins

Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT
025f3eb9 09/03/2015 06:31 PM Cherian Mathew

Update operation for move taxon nodes
d637e4ba 09/03/2015 05:11 PM Cherian Mathew

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...
317a1bcb 08/26/2015 11:03 AM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
7d7c5562 08/24/2015 11:34 AM Cherian Mathew

Merge branch 'develop' into remoting-4.0

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...
4219586b 08/24/2015 10:35 AM Patrick Plitzner

Fix application ID
40243bd5 08/18/2015 01:47 PM Cherian Mathew

Correct config for molecular plugin
ac23ea9b 07/30/2015 12:47 PM Cherian Mathew

#5029 Add login info to application title bar
1b626d51 07/30/2015 10:58 AM Cherian Mathew

#5029 Add functionality for login to remember credentials, reconnect and switch user
0d2d1f78 07/23/2015 03:30 PM Cherian Mathew

#5061 Add force refresh of p2 repositories before checking for updates
6cf98995 07/20/2015 11:00 AM Cherian Mathew

Correct issues from last merge
ad69c198 07/17/2015 06:07 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF...
9c0b77f7 07/17/2015 12:07 PM jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
8a1dc5ff 07/17/2015 12:06 PM jenkins

Updating develop poms back to pre merge state
ae8eab5f 07/16/2015 11:36 AM jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
d2c2fbfc 07/16/2015 11:35 AM jenkins

Updating develop poms back to pre merge state
16cd938f 07/15/2015 05:32 PM jenkins

updating poms for branch'release/3.7.0' with non-snapshot versions
58da2b7c 07/15/2015 05:31 PM jenkins

Revert project versions to 3.7.0-SNAPSHOT
c5685107 07/15/2015 05:30 PM jenkins

Updated version in pom / project files to taxeditor version : 3.7.0 and cdmlib version : 3.7.0
a3dc6527 07/15/2015 05:21 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
f63c8f53 07/15/2015 05:03 PM jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
35f1bdd2 07/15/2015 05:02 PM jenkins

updating poms for 3.8.0-SNAPSHOT development
cc43d828 07/15/2015 05:00 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
34377444 07/15/2015 04:52 PM jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
b7b91be9 07/15/2015 04:51 PM jenkins

updating poms for 3.8.0-SNAPSHOT development
2eeb388f 07/15/2015 04:50 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
4e1119d7 07/15/2015 04:03 PM Jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
29a6d25a 07/15/2015 04:01 PM jenkins

updating poms for 3.8.0-SNAPSHOT development
3dbbe399 07/15/2015 03:56 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
1927728a 07/15/2015 03:49 PM jenkins

updating poms for 3.8.0-SNAPSHOT development
de0ecbd7 07/15/2015 03:47 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
95d60366 07/15/2015 03:31 PM jenkins

updating poms for 3.8.0-SNAPSHOT development
880412d5 07/15/2015 03:29 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
5cf2562b 07/15/2015 03:17 PM jenkins

updating poms for 3.8.0-SNAPSHOT development
63b69f9e 07/15/2015 02:14 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
ac1f29b5 07/10/2015 04:47 PM Cherian Mathew

Add method to sessionOwner objects to fine tune performance using property paths
71aeb5d9 07/10/2015 12:06 PM Cherian Mathew

Fix merge commit
85cfbf6f 07/03/2015 12:09 PM Cherian Mathew

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/TaxonEditorInput.java
bb1997d0 07/03/2015 11:44 AM Cherian Mathew

#5054 Integrate remoting session in Term Editor

This commit also fixes a loading bug in the CdmServiceCacher, adds a test for creating term vocabulary and adapts to the change in the save call (#5056)
c36e67ab 06/22/2015 12:51 PM Cherian Mathew

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...
44993ce4 06/22/2015 10:32 AM Andreas Müller

add empty test folder
dde2b107 06/18/2015 03:17 PM Cherian Mathew

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...
122836c3 06/15/2015 03:47 PM Andreas Müller

add empty folder
70f4317c 06/15/2015 09:56 AM Patrick Plitzner
  • removed test folder
c5485129 06/09/2015 09:32 AM Cherian Mathew

fixed classpath issues and issues from last merge
efedd195 06/08/2015 01:00 PM Cherian Mathew

fixed manifest versions
e8458b29 06/05/2015 06:16 PM Cherian Mathew

Updating develop poms back to pre merge state
0c924c07 06/05/2015 06:16 PM Cherian Mathew

updating poms for branch'hotfix/3.6.1' with non-snapshot versions
dba3d0c2 06/05/2015 05:55 PM Cherian Mathew

updating poms for branch '3.6.1' with snapshot versions
5b9d4ad5 06/05/2015 04:42 PM Cherian Mathew

Release 3.6.0 merge
43c0aada 06/05/2015 01:23 PM Cherian Mathew

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...
208b2a3b 06/04/2015 06:43 PM Patrick Plitzner
  • updating versions due to release
02176688 06/04/2015 03:49 PM edit-jenkins

Updated version in config files to 3.6.1-SNAPSHOT
ebd5e5e5 06/04/2015 02:58 PM edit-jenkins

Updated version in config files to 3.6.0
872d7328 05/29/2015 04:16 PM Cherian Mathew

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
4b94c9cf 05/22/2015 10:54 AM Cherian Mathew

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...
e1f2a065 05/20/2015 07:16 PM Cherian Mathew

dependency changes to move to e4
b0e037f6 05/06/2015 02:49 PM Patrick Plitzner
  • changed "derivate" to "derivatives"
4a5e7739 05/04/2015 04:13 PM Andreas Müller

revert message handling for ApplicationWorkbencAdvisor #4657
9b10f34c 05/04/2015 02:43 PM edit-jenkins

Updated version in config files to 3.5.2-SNAPSHOT
dec40d07 05/04/2015 02:38 PM edit-jenkins

Updated version in config files to 3.5.1
c59e1cf1 04/28/2015 12:56 PM Katja Luther

widget is disposed exception ticket (#4657)
0c8754c0 04/22/2015 06:28 PM Andreas Müller

fixing i18n problem in build.properties
c5e35ea3 04/22/2015 05:00 PM Andreas Müller

Some changes on TaxEditor i18n: #4553
d64bebb3 04/22/2015 03:02 PM Andreas Müller

fix NPE in messaging handling #4816
e3259fb3 04/14/2015 01:52 PM Katja Luther
2d6df6fe 03/27/2015 11:13 AM Cherian Mathew

eu.etaxonomy.taxeditor.product.with.jre : removed since the jre bundling is done on jenkins
ApplicationUtil : added UTC to beta version string
eu.etaxonomy.taxeditor.cdmlib/pom.xml : fixes problem with clean validate - ticket #4733
6dcccd22 03/25/2015 01:47 PM edit-jenkins

Updated version in config files to 3.5.1-SNAPSHOT
688085e0 03/25/2015 01:40 PM edit-jenkins

Updated version in config files to 3.5.0
e2c6bb15 03/23/2015 01:15 PM Patrick Plitzner
  • reverted r22854
db42120d 03/20/2015 01:09 AM Andreas Müller

update Manifest from 3.4.1 -> 3.5.0
08576422 03/20/2015 12:58 AM Andreas Müller

update taxeditor version from 3.4.1 to 3.5.0
a8e762da 03/19/2015 04:36 PM Cherian Mathew

wrong target revision in the last commit
b19a1b74 03/19/2015 04:25 PM Cherian Mathew

reverting back wrongly committed files
68fe5da5 03/19/2015 04:16 PM Cherian Mathew

Updated version in config files to 3.4.1-SNAPSHOT
91759c63 03/19/2015 04:11 PM Cherian Mathew

Updated version in config files to 3.4.0
bb534368 03/02/2015 10:06 AM Cherian Mathew

merge from trunk
18a11b70 02/23/2015 09:50 AM Katja Luther

#4657
a41953a2 02/03/2015 10:49 AM Cherian Mathew

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