Project

General

Profile

Statistics
| Branch: | Tag: | Revision:

# Date Author Comment
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

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

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

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

Update root entity merge calls to use new merge method.

8336cf65 10/07/2015 02:13 PM Katja Luther

improve messaging for deleteresults

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

improve messaging for deleteResult

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

#5282 Integrate remoting in referencing objects view

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

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

2a56c01d 09/28/2015 09:57 AM U-BGBM\k.luther

minor

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

c9f13bde 09/14/2015 04:21 PM Cherian Mathew

#5242, #5223 Improve performance of derivate loading and editing

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

2f590a3e 09/09/2015 01:53 PM Cherian Mathew

Cleanup unused code

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

36b5f7a3 09/02/2015 12:27 PM U-BGBM\k.luther

better messaging when convert person to team does not work

95ee1b51 09/02/2015 11:33 AM U-BGBM\k.luther

moving more than one taxon node, merge of team and person, reusing name for new taxon

76fe3732 08/27/2015 04:12 PM Cherian Mathew

#5161 Fix problem of new entity not refreshed

01effd90 08/27/2015 01:01 PM U-BGBM\k.luther

fix #5171

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

02679036 08/26/2015 08:15 AM Patrick Plitzner

Disable MediaView for bulk editor (#5162)

  • bulk editor does only activate media view when showing taxa
  • code trimming
0bb254ee 08/25/2015 01:28 PM Cherian Mathew

#5160 Use new merge method with ids as arguments

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java

3a8e076a 08/25/2015 01:09 PM Cherian Mathew

#5160 Use new merge method with ids as arguments

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

caddd4f3 08/24/2015 10:39 AM Patrick Plitzner

Trim code

3c258b8a 08/24/2015 10:39 AM Patrick Plitzner

Remove comments

1dc79a5e 08/13/2015 01:20 PM Katja Luther

fix delete polytomouskeynode and improve merge in bulk editor

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

be976ace 07/17/2015 11:53 AM jenkins

updating poms for branch'release/3.7.0' with non-snapshot versions

d4d1f350 07/17/2015 11:52 AM jenkins

Revert project versions to 3.7.0-SNAPSHOT

f95e215b 07/17/2015 11:51 AM jenkins

Updated version in pom / project files to taxeditor version : 3.7.0 and cdmlib version : 3.7.0

385fa280 07/17/2015 11:50 AM jenkins

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

d21d6eec 07/17/2015 11:47 AM jenkins

Revert project versions to 3.7.0-SNAPSHOT

6a39e02b 07/16/2015 06:20 PM Cherian Mathew

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

09f08a00 07/16/2015 05:54 PM Katja Luther

changes for #4908

5b999d8f 07/16/2015 02:11 PM Katja Luther

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

e984ad30 07/16/2015 01:50 PM Katja Luther

changes for #4908

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

8686ea00 07/10/2015 12:42 PM Cherian Mathew

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java

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

Fix merge commit

8c8ead8a 07/10/2015 11:23 AM Cherian Mathew

Update ICdmEntitySessionEnabled to no longer extend ICdmChangeListener

d37eb206 07/08/2015 08:31 PM Patrick Plitzner

Make cell text in ReferencingObjectsView selectable

7197e862 07/08/2015 08:27 PM Patrick Plitzner

Remove comments

3c4d1aba 07/02/2015 11:21 AM Cherian Mathew

Make editor compatible with latest cdmlib service layer updates

233a8fe2 07/02/2015 11:01 AM Cherian Mathew

#5012 Adding remoting session and updating save methods for Bulk Editor

Replace properties file with xml file

#5012 updates for making Bulk Editor remoting capable

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

562118a0 06/22/2015 11:30 AM Katja Luther

all delete methods need an Uuid as argument

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java...

6a0c3c1d 06/22/2015 10:52 AM Katja Luther

change delete argument to UUID

ae7e2680 06/19/2015 10:43 AM Cherian Mathew

ICdmDataChangeService, CdmUIDataChangeService, CdmDataChangeService : added new data change service with different services for the ui and non-ui states
CdmApplicationState, CdmStore : added data change service to app state
CdmChangeEvent, ICdmChangeListener : added change listener and even to fire in case of data changes...

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

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

cfd56be9 05/28/2015 02:08 PM Katja Luther

new session for every search in bulk editor

50a7c607 05/27/2015 06:10 PM Andreas Müller

minor

a4f5eec1 05/27/2015 05:52 PM Andreas Müller

Renaming menu labels for new team and person