Add missing files to ignore on merge conflict
[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib /
2015-10-09 Cherian MathewUpdated version in pom / project files to taxeditor...
2015-10-08 Cherian MathewAdd test for editor / server cdmlib version check
2015-10-08 Cherian Mathew#5302 Add cdm version and services version check
2015-10-08 Cherian Mathew#5309, #5310 Add load method to retrieve user entity...
2015-10-08 Katja LutherMerge branch 'develop' of https://dev.e-taxonomy.eu...
2015-10-08 Cherian MathewAdd load capability for MergeResult objects
2015-10-08 Cherian MathewUpdate root entity merge calls to use new merge method.
2015-10-06 Katja Luthermerge branches
2015-10-06 U-BGBM\k.luthermerge branches
2015-10-06 U-BGBM\k.luthermerge
2015-10-06 U-BGBM\k.lutherMerge branch 'develop' of https://dev.e-taxonomy.eu...
2015-10-06 U-BGBM\k.lutherimprove messaging for deleteResult
2015-10-05 Cherian MathewAdd check for remoting before setting new entity listener
2015-10-02 Cherian Mathew#5282 Integrate remoting in referencing objects view
2015-10-02 Cherian Mathew#5301 Fix null session issues, Add remoting session...
2015-10-02 Cherian MathewChange null session to singleton with no owner
2015-10-02 Cherian MathewAdd remoting checks for merge, Move to merge call which...
2015-10-01 Cherian Mathew#5299 Handle session caching of new entities
2015-09-23 U-BGBM\k.luthermerge with local branch
2015-09-23 Cherian MathewRemove profile for clean goals to delete cdmlib jars
2015-09-22 Cherian MathewMerge branch 'remoting-4.0' into develop
2015-09-16 Cherian MathewFix merge remoting-4.0 root/branches/taxeditor/remoting-4.0
2015-09-16 Cherian MathewFix versions
2015-09-16 Cherian MathewFix versions
2015-09-16 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-16 Cherian MathewFix versions
2015-09-16 Cherian MathewSet second demo server ip
2015-09-16 jenkinsRevert project versions to 3.11.0-SNAPSHOT
2015-09-16 jenkinsUpdated version in pom / project files to taxeditor...
2015-09-16 Cherian MathewFix for cdmlib version numbers
2015-09-15 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-15 Cherian MathewCorrect versions
2015-09-15 jenkinsupdating poms for 3.11.0-SNAPSHOT development
2015-09-15 jenkinsRevert project versions to 3.10.0-SNAPSHOT
2015-09-15 jenkinsUpdated version in pom / project files to taxeditor...
2015-09-15 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-15 Cherian MathewAdd demo servers to server list
2015-09-15 Cherian MathewCorrect webapp war name change
2015-09-15 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-15 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-14 jenkinsupdating poms for 3.10.0-SNAPSHOT development
2015-09-14 jenkinsRevert project versions to 3.9.0-SNAPSHOT
2015-09-14 jenkinsUpdated version in pom / project files to taxeditor...
2015-09-14 Cherian Mathewre-initialise group object in input constructor root/tags/taxeditor/remoting-3.9.0 remoting-3.9.0
2015-09-14 Cherian Mathew#5202 Added alphabetical sort for cdm instances list
2015-09-14 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-11 Cherian MathewFix incorrect merge
2015-09-11 Cherian MathewFix incorrect merge
2015-09-10 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-10 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-10 jenkinsupdating poms for 3.9.0-SNAPSHOT development
2015-09-10 jenkinsRevert project versions to 3.8.0-SNAPSHOT
2015-09-10 jenkinsUpdated version in pom / project files to taxeditor...
2015-09-10 Andreas KohlbeckerRevert "Updated version in pom / project files to taxed...
2015-09-10 Andreas KohlbeckerRevert "Revert project versions to 3.8.0-SNAPSHOT"
2015-09-10 jenkinsRevert project versions to 3.8.0-SNAPSHOT
2015-09-10 jenkinsUpdated version in pom / project files to taxeditor...
2015-09-08 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-08 Cherian MathewAdd annotation service to config
2015-09-07 Cherian MathewCheck if updated objects are null
2015-09-07 Cherian MathewSet read timeout for services to infinite
2015-09-07 Cherian MathewReplace spring application context loading with program...
2015-09-04 Cherian MathewCorrect transient service method
2015-09-03 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-09-03 U-BGBM\k.lutherchange preferences page for taxonnode sort
2015-09-02 Cherian Mathew#5181 Fix incorrect load of CdmServiceCacher when conne...
2015-09-01 Cherian MathewMerge remote-tracking branch 'origin' into remoting-4.0
2015-08-27 Cherian Mathew#5161 Initialize listeners on cdm entities before put...
2015-08-26 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-08-24 Cherian MathewAdd entity type to CdmChangeEvent and fixes #5139
2015-08-24 Cherian Mathew#4073 Initial implementation of local cdm-server
2015-08-24 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-08-18 jenkinsMerge branch 'hotfix/3.7.1' root/tags/taxeditor/3.7.1 3.7.1
2015-08-18 jenkinsupdating poms for branch'hotfix/3.7.1' with non-snapsho...
2015-08-18 jenkinsRevert project versions to 3.7.1-SNAPSHOT
2015-08-18 jenkinsUpdated version in pom / project files to taxeditor...
2015-08-18 jenkinsUpdated version in pom / project files to taxeditor...
2015-08-18 jenkinsupdating poms for 3.7.1 branch with snapshot versions
2015-08-06 Cherian Mathew#5130 Extend import wizards to import data via remoting...
2015-08-04 Cherian Mathew#5129 Extend export ui for remoting
2015-07-30 Cherian Mathew#5122 Implement Null Entity Session and integrate it...
2015-07-30 Cherian Mathew#5029 Add functionality for login to remember credentia...
2015-07-28 Cherian Mathew#5209 Add version ui elements to advanced view, Make...
2015-07-28 Cherian Mathew#5029 Implement oneclick login for remoting
2015-07-24 Cherian MathewFix URI Syntax error for new serialised model map
2015-07-23 Cherian MathewAdd access to service cacher
2015-07-23 Cherian MathewCorrect serialised cdm map location
2015-07-23 Cherian Mathew#4932 Remove autowired members, Use serliaised cdm...
2015-07-22 Cherian MathewFix Polytomous Key duplicate entry issue
2015-07-22 Cherian MathewAdd remoting operation / handlers for key list editor
2015-07-21 Cherian MathewRevert change for proxy since it breaks the name editor
2015-07-21 Patrick PlitznerMerge branch 'LibrAlign' into develop
2015-07-21 Cherian MathewRemove duplicate webapp war
2015-07-21 Cherian Mathew#5098 : Fix issue with authentication when using search bar
2015-07-20 Cherian MathewFix duplicate entity issue with newly created cdm entities
2015-07-20 Cherian MathewUse new find method with update
2015-07-20 Patric Plitznermerge-update from trunk
2015-07-20 Patric Plitznermerge-update from trunk
2015-07-17 Cherian MathewMerge branch 'develop' into remoting-4.0
2015-07-17 Cherian Mathew#5010 : Initial commit to fix duplicate entry issue...
next