Project

General

Profile

Statistics
| Branch: | Tag: | Revision:

# Date Author Comment
04abef69 10/26/2015 06:23 PM Cherian Mathew

#5349 Add getEditGeoService method

1da6f4ff 10/21/2015 04:58 PM Cherian Mathew

#5256 Add missing recursive load for MergeResult lists, Add setting of dirty flag for factual data in Buld Editor

d875880c 10/13/2015 05:39 PM Cherian Mathew

Fix setting of key statement

cc712487 10/12/2015 04:09 PM Cherian Mathew

#5320 Fix whitespace problem

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

7bc01856 10/08/2015 06:18 PM Cherian Mathew

Add test for editor / server cdmlib version check

d4d342a1 10/08/2015 05:19 PM Cherian Mathew

#5302 Add cdm version and services version check

ce18bb89 10/08/2015 03:13 PM Cherian Mathew

#5309, #5310 Add load method to retrieve user entity after create and password change

37d7ce64 10/08/2015 12:48 PM Cherian Mathew

Add load capability for MergeResult objects

6c95dd3d 10/08/2015 12:48 PM Cherian Mathew

Update root entity merge calls to use new merge method.

e68d8e76 10/06/2015 09:16 AM U-BGBM\k.luther

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

369ac904 10/06/2015 09:16 AM U-BGBM\k.luther

improve messaging for deleteResult

4fbac559 10/05/2015 03:05 PM Cherian Mathew

Add check for remoting before setting new entity listener

cf412a22 10/02/2015 06:59 PM Cherian Mathew

#5282 Integrate remoting in referencing objects view

ec23f5f4 10/02/2015 04:52 PM Cherian Mathew

#5301 Fix null session issues, Add remoting session for feature tree editor

1ec52766 10/02/2015 01:38 PM Cherian Mathew

Change null session to singleton with no owner

fce7d237 10/02/2015 10:59 AM Cherian Mathew

Add remoting checks for merge, Move to merge call which returns updated transient object

c27ecf00 10/01/2015 03:14 PM Cherian Mathew

#5299 Handle session caching of new entities

9e671498 09/23/2015 12:26 PM Cherian Mathew

Remove profile for clean goals to delete cdmlib jars

28f75e33 09/22/2015 06:44 PM Cherian Mathew

Merge branch 'remoting-4.0' into develop

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/CreateFieldUnitHandler.java

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

Fix merge

c106c48b 09/16/2015 07:51 PM Cherian Mathew

Fix versions

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

a63b22b4 09/16/2015 07:06 PM Cherian Mathew

Set second demo server ip

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

fc75c0d7 09/16/2015 03:54 PM Cherian Mathew

Fix for cdmlib version numbers

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

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

46d814ce 09/15/2015 04:45 PM Cherian Mathew

Add demo servers to server list

9d170601 09/15/2015 01:07 PM Cherian Mathew

Correct webapp war name change

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

242020c0 09/14/2015 06:00 PM Cherian Mathew

re-initialise group object in input constructor

f62928e4 09/14/2015 05:01 PM Cherian Mathew

#5202 Added alphabetical sort for cdm instances list

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

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

67cad510 09/08/2015 05:54 PM Cherian Mathew

Add annotation service to config

bde20ac8 09/07/2015 12:25 PM Cherian Mathew

Check if updated objects are null

c237492d 09/07/2015 12:25 PM Cherian Mathew

Set read timeout for services to infinite

390328ab 09/07/2015 10:58 AM Cherian Mathew

Replace spring application context loading with programmatic loading

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

f4f5cd63 09/02/2015 11:03 AM Cherian Mathew

#5181 Fix incorrect load of CdmServiceCacher when connecting via Datasource view

b4d31af3 08/27/2015 04:12 PM Cherian Mathew

#5161 Initialize listeners on cdm entities before put in cache

c69c2dcd 08/24/2015 02:33 PM Cherian Mathew

Add entity type to CdmChangeEvent and fixes #5139

15a62a24 08/24/2015 11:58 AM Cherian Mathew

#4073 Initial implementation of local cdm-server

43527305 08/06/2015 04:01 PM Cherian Mathew

#5130 Extend import wizards to import data via remoting and Add tests for the same

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

#5129 Extend export ui for remoting

068cf826 07/30/2015 03:06 PM Cherian Mathew

#5122 Implement Null Entity Session and integrate it in required preference pages

1b626d51 07/30/2015 10:58 AM Cherian Mathew

#5029 Add functionality for login to remember credentials, reconnect and switch user

9d1baebb 07/28/2015 03:33 PM Cherian Mathew

#5209 Add version ui elements to advanced view, Make port text field editable for localhost servers

19c39bf4 07/28/2015 02:15 PM Cherian Mathew

#5029 Implement oneclick login for remoting

9e775b38 07/24/2015 03:33 PM Cherian Mathew

Fix URI Syntax error for new serialised model map

65e3bf45 07/23/2015 02:45 PM Cherian Mathew

Add access to service cacher

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

ea537ede 07/22/2015 03:10 PM Cherian Mathew

Fix Polytomous Key duplicate entry issue

9bc47800 07/22/2015 09:39 AM Cherian Mathew

Add remoting operation / handlers for key list editor

9e7acfac 07/21/2015 01:52 PM Cherian Mathew

Revert change for proxy since it breaks the name editor

3713d82e 07/21/2015 12:45 PM Cherian Mathew

Remove duplicate webapp war

54108154 07/21/2015 12:06 PM Cherian Mathew

#5098 : Fix issue with authentication when using search bar

52c57094 07/20/2015 07:04 PM Cherian Mathew

Fix duplicate entity issue with newly created cdm entities

c93b5f35 07/20/2015 03:37 PM Cherian Mathew

Use new find method with update

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

eec49400 07/17/2015 03:05 PM Cherian Mathew

#5010 : Initial commit to fix duplicate entry issue when creating new key node

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

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

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