Project

General

Profile

Download (20.6 KB) 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

a862b815 11/18/2016 03:45 PM Ben Stöver

Missing files from last commit added.

96387738 11/11/2016 01:43 PM Andreas Müller

Revert "update model for cdm cache in TaxEditor" classpath changes

This partly reverts commit cfb2c8db2bd6905fd8b5805915556b87af14984f.

cfb2c8db 11/11/2016 01:41 PM Andreas Müller

update model for cdm cache in TaxEditor

63892e70 10/26/2016 10:04 AM Patrick Plitzner

Add spring oauth2 dependency

2a495461 10/20/2016 03:20 PM Patrick Plitzner

Removed p6spy from classpath

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

1103732d 07/18/2016 01:52 PM Katja Luther

minor

b0629834 07/08/2016 09:42 AM Katja Luther

remove accidentally comitted source information

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

a41769e5 05/24/2016 02:57 PM Katja Luther

minor

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

1eed34e4 02/11/2016 11:27 AM Andreas Kohlbecker

classpath updates

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

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

Update dependencies

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

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

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

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

1baeb336 09/04/2015 10:33 AM Cherian Mathew

Correct transient service method

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

31d3e34d 09/03/2015 11:57 AM U-BGBM\k.luther

change preferences page for taxonnode sort

26d19e4f 08/04/2015 06:34 PM Cherian Mathew

#5129 Extend export ui for remoting

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

a9f32ef0 07/15/2015 05:56 PM jenkins

Merge branch 'release/3.7.0'

Conflicts:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF...

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

71aeb5d9 07/10/2015 12:06 PM Cherian Mathew

Fix merge commit

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)

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

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

e70b1617 06/16/2015 10:18 AM Cherian Mathew

eu.etaxonomy.taxeditor.cdmlib/.classpath,MANIFEST.MF : removed cdm-server jar from classpath
OperationTestBase, TaxonNameEditorTest, : refactoring
MockConversationEnabled : class to mock interface IConversationEnabled
TaxonNavigatorTest (.xml) : added test + data...

66710185 06/15/2015 09:46 AM pplitzner
  • removed test folder from classpatch
c5485129 06/09/2015 09:32 AM Cherian Mathew

fixed classpath issues and issues from last merge

902d7875 06/09/2015 09:22 AM Cherian Mathew

changed output dir to classes

7b2caa7b 06/08/2015 12:20 PM Cherian Mathew

removed test source from classpath

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

fixed update to snapshot

b5e6cf2c 06/05/2015 07:02 PM Cherian Mathew

fixed manifest problems

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

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

6548ea8a 05/26/2015 06:18 PM Cherian Mathew
  • corrected recursive autowiring
  • changed application context loading to be more performant
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...

64993970 05/21/2015 06:51 PM Cherian Mathew

removed test dir as source dir

e1f2a065 05/20/2015 07:16 PM Cherian Mathew

dependency changes to move to e4

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

e3259fb3 04/14/2015 01:52 PM Katja Luther
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

2553a8f7 03/24/2015 11:08 AM Patrick Plitzner
  • committed updated classpath
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

31dd5bcf 01/23/2015 02:34 PM Patrick Plitzner
  • updated classpath
48a32bd3 01/20/2015 12:20 PM Cherian Mathew

merge from trunk