This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit c22cec5955c5bf07c3962ad6ad333e776c72ff36 Merge: c9c713b f5ec58a Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 30 12:31:03 2014 +0100 fixes #6367 .../entities/EchoBaseUserPersistenceContext.java | 1 + .../EchoBaseUserTopiaPersistenceContext.java | 8 ++ .../internalDb/MigrationCallBackForVersion.java | 14 +++ .../workingDb/MigrationCallBackForVersion.java | 39 +++++++++ .../workingDb/MigrationCallBackForVersion2_2.java | 3 +- .../MigrationCallBackForVersion2_5_1.java | 9 +- .../workingDb/MigrationCallBackForVersion2_6.java | 5 +- .../MigrationCallBackForVersion2_6_1.java | 5 +- .../MigrationCallBackForVersion2_7_2.java | 13 ++- .../2.5.1-0-postgis-structure.sql} | 0 .../2.5.1-1-postgis-view.sql} | 0 .../2.6-0-postgis-view.sql} | 0 .../2.6.1-0-postgis-structure.sql} | 0 .../2.7.2-0-postgis-view.sql} | 0 .../workingDb/h2/2.7.2-1-add-importFile-entity.sql | 3 + .../workingDb/pg/2.7.2-1-add-importFile-entity.sql | 3 + echobase-domain/src/main/xmi/echobase.zargo | Bin 89097 -> 89705 bytes .../services/service/UserDbPersistenceService.java | 67 ++++++++++++++- .../importdata/AbstractImportDataService.java | 51 ++++++++--- .../ui/actions/workingDb/DownloadImportFile.java | 95 +++++++++++++++++++++ .../ui/actions/workingDb/GetImportLogDetail.java | 9 ++ .../src/main/resources/config/struts-workingDb.xml | 12 +++ .../resources/i18n/echobase-ui_en_GB.properties | 2 + .../resources/i18n/echobase-ui_fr_FR.properties | 2 + .../webapp/WEB-INF/jsp/workingDb/dashboard.jsp | 53 ++++++++++-- echobase-ui/src/main/webapp/js/test.js | 65 -------------- pom.xml | 9 ++ 27 files changed, 362 insertions(+), 106 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.