Project

General

Profile

Download (11.1 KB) Statistics
| Branch: | Tag: | Revision:

# Date Author Comment
63892e70 10/26/2016 10:04 AM Patrick Plitzner

Add spring oauth2 dependency

88505483 10/12/2016 03:12 PM Andreas Kohlbecker

removing p6spy dependencies

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

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

8c80b1ba 02/03/2016 04:21 PM Andreas Müller

Upgrade lucene version in TaxEditor

57f201e1 02/03/2016 02:47 PM Patrick Plitzner

Remove spring security remoting jar

f4b987d2 01/20/2016 05:42 PM Patrick Plitzner

Add spring-security-remoting jar

243d8716 01/20/2016 05:35 PM Patrick Plitzner

Update build.properties

8df68afd 01/20/2016 05:23 PM Patrick Plitzner

Update dependencies

f5dee554 01/19/2016 08:35 AM Andreas Kohlbecker

updating spring-security-remoting to 4.0.3.RELEASE

797cfc85 01/06/2016 11:53 PM Patrick Plitzner

Added missing libraries and adjusted classpath (still unstable)

d0c15b1e 01/06/2016 05:02 PM Patrick Plitzner

Updated dependencies for taxeditor (still unstable)

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

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

fbedcb23 09/16/2015 09:24 PM Cherian Mathew

Fix merge

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

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

d7cab35d 09/15/2015 08:35 PM Cherian Mathew

Correct versions

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

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

253716a1 09/11/2015 03:29 PM Cherian Mathew

Fix incorrect merge

c70f9111 09/11/2015 02:42 PM Cherian Mathew

Fix incorrect merge

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

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.

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

aa05eb6f 07/23/2015 02:09 PM Cherian Mathew

Correct serialised cdm map location

5a49a28f 07/23/2015 01:54 PM Cherian Mathew

#4932 Remove autowired members, Use serliaised cdm model map

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

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

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

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

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

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

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

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

bb3317c0 06/26/2015 03:11 PM Cherian Mathew

Add log4j extras to apply expression filters

19a8bfe7 06/24/2015 09:40 AM 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/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties

8b7b09a5 06/23/2015 06:22 PM Cherian Mathew

Update cdmlib version to 3.6.3-SNAPSHOT

608f7100 06/11/2015 10:50 AM Cherian Mathew

corrected merge to latest snapshot version
updated hibernate config file and test db
setup testing framework with jetty and maven

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

fixed update to snapshot

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

version updates for 3.6.1

491389ea 06/05/2015 05:53 PM Cherian Mathew

fixing classpath config

1925ef97 06/05/2015 05:51 PM Cherian Mathew

fixing classpath config

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

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

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

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

1cd65199 05/20/2015 04:05 PM Cherian Mathew

.classpath, MANIFEST.MF, build.properties, pom.xml : added cdm-server jar to lib dir and project classpath
/lib : added ignore for cdm-server jar
CacheLoader : reverted update of cached entity field
cdmlib-remote-webapp.war : updated to latest version

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

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

2afa3e78 03/20/2015 02:38 AM Andreas Müller

3.4.1->3.5.0 in MANIFEST

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

5c6184af 02/02/2015 04:18 PM Cherian Mathew

merge from trunk

79c42b3f 01/28/2015 02:26 PM Cherian Mathew

merge from trunk

26ca06a7 01/27/2015 01:56 PM Patrick Plitzner
  • adder swagger annotations to build path
48a32bd3 01/20/2015 12:20 PM Cherian Mathew

merge from trunk

0393a168 12/15/2014 06:15 PM edit-jenkins

Updated version in config files to 3.4.1-SNAPSHOT

52a70f7b 12/15/2014 05:37 PM edit-jenkins

Updated version in config files to 3.4.0

07012f35 12/15/2014 11:25 AM Andreas Müller

upgrade poi to 3.10-FINAL and add ooxml functionality

80de230c 12/10/2014 06:01 PM Cherian Mathew

updated manifest for deleted test dir
removed unnecessary commit root entity methods in session and session manager

2e4de8d1 12/09/2014 06:18 PM Alexander Oppermann

last fix for revision number of classpath

fd6cdafb 11/25/2014 01:56 PM Alexander Oppermann

changed classpath to 3.5.0

ea90e3a1 10/14/2014 01:53 PM Patrick Plitzner

merge-update from trunk

cdf522d1 10/14/2014 01:51 PM Katja Luther
5411897d 10/14/2014 09:09 AM Patrick Plitzner
  • removed merge conflict text
c365ebc7 10/13/2014 02:56 PM Patrick Plitzner

merge-update from trunk

74c62afe 10/13/2014 02:50 PM Katja Luther
ed6e20d7 09/04/2014 05:32 PM edit-jenkins

Updated version in config files to 3.3.8-SNAPSHOT

14f96448 09/04/2014 05:06 PM edit-jenkins

Updated version in config files to 3.3.7

80168e3c 07/08/2014 03:34 PM edit-jenkins

Updated version in config files to 3.3.7-SNAPSHOT

43c9550c 07/08/2014 03:20 PM edit-jenkins

Updated version in config files to 3.3.6

d8db3409 07/01/2014 03:30 PM Patrick Plitzner
  • increased cdmlib version number
35968f76 06/25/2014 07:24 PM Cherian Mathew

updating ehcache to 2.6.9

eca44d67 05/30/2014 11:12 AM edit-jenkins

Updated version in config files to 3.3.6-SNAPSHOT

652b7ec4 05/30/2014 11:02 AM edit-jenkins

Updated version in config files to 3.3.5

5463839b 05/14/2014 01:22 PM edit-jenkins

Updated version in config files to 3.3.5-SNAPSHOT

eb72474d 05/14/2014 01:16 PM edit-jenkins

Updated version in config files to 3.3.4

9b2181b1 04/16/2014 05:26 PM edit-jenkins

Updated version in config files to 3.3.4-SNAPSHOT

89fe0b43 04/16/2014 05:21 PM edit-jenkins

Updated version in config files to 3.3.3