Project

General

Profile

Statistics
| Branch: | Tag: | Revision:

# Date Author Comment
1c69b0d0 01/13/2017 03:33 PM Patrick Plitzner

Merge branch 'develop' into LibrAlign

a25a0a15 12/05/2016 03:50 PM jenkins

Updated version in pom / project files to taxeditor version : 4.5.0-SNAPSHOT and cdmlib version : 4.5.0-SNAPSHOT

c80496ea 10/26/2016 05:31 PM Ben Stöver

Merge branch 'LibrAlign' of https://dev.e-taxonomy.eu/git/taxeditor into LibrAlign

Conflicts:

eu.etaxonomy.taxeditor.molecular.lib/.classpath

eu.etaxonomy.taxeditor/rcp.target

c37c8506 10/22/2016 02:36 PM Ben Stöver

Plugin molecular.lib refactored to use direct project dependencies. This should not be merged into trunk, since this is only for development state. (Currently the trunk is anyway already using different Maven dependencies.)
Adjustments to recent changes in JPhyloIO.

60b7d5b5 09/23/2016 03:15 PM jenkins

Updated version in pom / project files to taxeditor version : 4.4.0-SNAPSHOT and cdmlib version : 4.4.0-SNAPSHOT

7f861412 07/13/2016 12:28 PM Patrick Plitzner

Fix repository location for target platform

3c928d6e 07/06/2016 03:42 PM jenkins

Updated version in pom / project files to taxeditor version : 4.3.0-SNAPSHOT and cdmlib version : 4.3.0-SNAPSHOT

2939ccbf 05/31/2016 02:29 PM jenkins

Updated version in pom / project files to taxeditor version : 4.2.0-SNAPSHOT and cdmlib version : 4.2.0-SNAPSHOT

62611fe9 05/02/2016 03:14 PM jenkins

Updated version in pom / project files to taxeditor version : 4.1.0-SNAPSHOT and cdmlib version : 4.1.0-SNAPSHOT

bdbc7359 03/02/2016 02:12 PM Andreas Kohlbecker

Updated version in pom / project files to taxeditor version : 4.0.0-SNAPSHOT and cdmlib version : 4.0.0-SNAPSHOT

0e9fc7a2 12/18/2015 01:29 PM jenkins

Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT

74cf0246 12/03/2015 11:36 AM Cherian Mathew

Fix product version for jre product definition

21ce1d0d 11/24/2015 05:29 PM Cherian Mathew

Revert update handler to earlier version

f04ebb2b 11/16/2015 02:35 PM Cherian Mathew

Update eclipse compile / runtime to JavaSE-1.7

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

45741193 10/09/2015 02:29 PM Cherian Mathew

Revert "Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT"

This reverts commit 9524fa3910c8335a6cbcb656f9aacaca01a3f5ca.

9524fa39 10/09/2015 02:07 PM Cherian Mathew

Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT

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

64a4022f 09/16/2015 07:14 PM Cherian Mathew

Fix versions

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

993c5743 09/11/2015 10:36 AM Cherian Mathew

Correct version

dbe1e57d 09/11/2015 10:35 AM Cherian Mathew

Correct version

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

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...

4bef5400 08/26/2015 01:23 PM Patrick Plitzner

Add PDE runtime environment to target platform (provides Plug-In Spy)

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...

2a0f3d06 08/21/2015 10:15 AM Cherian Mathew

#4717 Correct java exec called for macosx

47def4dd 08/20/2015 06:59 PM Cherian Mathew

#4717 Correct macosx java path

5fce47c0 08/20/2015 06:27 PM Cherian Mathew

#4717 Correct dir relative path to java exec for mac osx

07598008 08/20/2015 05:48 PM Cherian Mathew

#4717 Add seperate product file for jre bundle

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

6215c3a6 07/15/2015 03:49 PM Jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.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

044b193c 07/15/2015 03:31 PM Jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.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

dc7c101f 07/15/2015 03:17 PM Jenkins

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.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

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...

6f838c04 06/12/2015 05:37 PM Andreas Müller

fix umlaute in key menus and add gitignore for rcp.target

9ee1c500 06/08/2015 12:13 PM Cherian Mathew

fixed update to snapshot

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

e51599a4 06/05/2015 06:15 PM Cherian Mathew

version updates for 3.6.1

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
5f02ad3e 06/04/2015 03:55 PM Cherian Mathew

updated to snapshot version

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

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

02176688 06/04/2015 03:49 PM edit-jenkins

Updated version in config files to 3.6.1-SNAPSHOT

afd232b8 06/04/2015 03:30 PM Cherian Mathew

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

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

ebd5e5e5 06/04/2015 02:58 PM edit-jenkins

Updated version in config files to 3.6.0

93b0eb6b 06/03/2015 01:56 PM Cherian Mathew

eu.etaxonomy.taxeditor.cdmlib/.classpath, eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF, eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF : moved test jars to test project
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF : added packages required by test project to exported package list...

a41fa7f7 05/21/2015 01:50 PM Cherian Mathew

MANIFEST.MF, feature.xml : removed dependency on specific versions
rcp.target : added vm arguments

cd488e9d 05/21/2015 11:59 AM Cherian Mathew

corrected target definition

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

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

51a98eee 03/24/2015 06:13 PM Cherian Mathew

correcting default values for bundle without jre

ea2426f6 03/24/2015 05:59 PM Cherian Mathew

reverted all changes using maven to setup jre bundle . will do this in a bash script on jenkins instead.

52eafbd7 03/24/2015 02:13 PM Cherian Mathew

added cleanup tasks after bundle jre

0c737257 03/23/2015 06:15 PM Cherian Mathew

eu.etaxonomy.taxeditor/pom.xml, eu.etaxonomy.taxeditor.product.with.jre/wo.jre : configuration for product bundled with jre
eu.etaxonomy.taxeditor.feature/pom.xml, build.properties.with.jre/wo.jre : configuration for jre dir symlinks and root dir properties...