From d472bd1f7b3a84405c85ac140c531dcac5da23ba Mon Sep 17 00:00:00 2001 From: Jarrett Jordaan Date: Mon, 26 Oct 2009 11:11:39 +0200 Subject: [PATCH] Revert "Merge Conflicts" --- setup/migrate/config/config.xml | 0 setup/migrate/index.php | 0 setup/migrate/migrateUtil.php | 0 setup/migrate/migrateWizard.php | 2 +- setup/migrate/migrater.php | 0 setup/migrate/session.php | 0 setup/migrate/step.php | 0 setup/migrate/stepAction.php | 0 setup/migrate/steps/migrateComplete.php | 0 setup/migrate/steps/migrateDatabase.php | 0 setup/migrate/steps/migrateErrors.php | 0 setup/migrate/steps/migrateInstallation.php | 0 setup/migrate/steps/migrateServices.php | 0 setup/migrate/templates/complete.tpl | 0 setup/migrate/templates/database.tpl | 0 setup/migrate/templates/error.tpl | 0 setup/migrate/templates/errors.tpl | 0 setup/migrate/templates/installation.tpl | 0 setup/migrate/templates/installation_confirm.tpl | 0 setup/migrate/templates/services.tpl | 0 setup/migrate/templates/wizard.tpl | 0 setup/upgrade/config/config.xml | 0 setup/upgrade/index.php | 0 setup/upgrade/step.php | 0 setup/upgrade/stepAction.php | 0 setup/upgrade/steps/upgradeBackup.php | 0 setup/upgrade/steps/upgradeComplete.php | 0 setup/upgrade/steps/upgradeDatabase.php | 0 setup/upgrade/steps/upgradeErrors.php | 0 setup/upgrade/steps/upgradeInstallation.php | 0 setup/upgrade/steps/upgradeRestore.php | 0 setup/upgrade/steps/upgradeWelcome.php | 0 setup/upgrade/templates/backup.tpl | 0 setup/upgrade/templates/complete.tpl | 2 +- setup/upgrade/templates/database.tpl | 0 setup/upgrade/templates/error.tpl | 0 setup/upgrade/templates/errors.tpl | 0 setup/upgrade/templates/installation.tpl | 0 setup/upgrade/templates/loading.tpl | 0 setup/upgrade/templates/progress.tpl | 0 setup/upgrade/templates/restore.tpl | 0 setup/upgrade/templates/welcome.tpl | 0 setup/upgrade/templates/wizard.tpl | 0 setup/upgrade/upgrade | 0 setup/upgrade/upgrade.lock | 0 setup/upgrade/upgradeSession.php | 0 setup/upgrade/upgradeUtil.php | 0 setup/upgrade/upgradeWizard.php | 0 setup/upgrade/upgradedbUtil.php | 0 setup/upgrade/upgrader.php | 0 setup/wizard/batches/lucene_install.bat | 0 setup/wizard/batches/lucene_start.bat | 0 setup/wizard/batches/lucene_uninstall.bat | 0 setup/wizard/batches/scheduler_install.bat | 0 setup/wizard/batches/scheduler_start.bat | 0 setup/wizard/batches/scheduler_uninstall.bat | 0 setup/wizard/config/config.xml | 0 setup/wizard/config/databases.xml | 0 setup/wizard/dbUtil.php | 0 setup/wizard/dbUtilities.php | 0 setup/wizard/index.php | 0 setup/wizard/ini.php | 0 setup/wizard/iniUtilities.php | 0 setup/wizard/install.lock | 0 setup/wizard/installUtil.php | 0 setup/wizard/installWizard.php | 2 +- setup/wizard/installer.php | 0 setup/wizard/lib/helpers/htmlHelper.php | 0 setup/wizard/lib/services/service.php | 0 setup/wizard/lib/services/unixAgent.php | 0 setup/wizard/lib/services/unixLucene.php | 0 setup/wizard/lib/services/unixOpenOffice.php | 0 setup/wizard/lib/services/unixScheduler.php | 0 setup/wizard/lib/services/unixService.php | 0 setup/wizard/lib/services/windowsAgent.php | 0 setup/wizard/lib/services/windowsLucene.php | 0 setup/wizard/lib/services/windowsOpenOffice.php | 0 setup/wizard/lib/services/windowsScheduler.php | 0 setup/wizard/lib/services/windowsService.php | 0 setup/wizard/lib/system/config-path-mock | 0 setup/wizard/lib/system/config-path-mock-windows | 0 setup/wizard/lib/system/executeCommand.class | Bin 950 -> 0 bytes setup/wizard/lib/system/executeCommand.java | 0 setup/wizard/lib/system/javaVersion.class | Bin 1257 -> 0 bytes setup/wizard/lib/system/javaVersion.java | 0 setup/wizard/lib/system/openOffice.class | Bin 1120 -> 0 bytes setup/wizard/lib/system/openOffice.java | 0 setup/wizard/lib/system/perms.sh | 0 setup/wizard/lib/system/phpinfo.php | 0 setup/wizard/lib/system/soffice.php | 0 setup/wizard/lib/system/systemCheck.php | 0 setup/wizard/lib/validation/luceneValidation.php | 0 setup/wizard/lib/validation/openofficeValidation.php | 0 setup/wizard/lib/validation/schedulerValidation.php | 0 setup/wizard/lib/validation/serviceValidation.php | 0 setup/wizard/path.php | 0 setup/wizard/resources/css/ie6.css | 0 setup/wizard/resources/css/migrate.css | 0 setup/wizard/resources/css/wizard.css | 2 +- setup/wizard/resources/graphics/active.png | Bin 1275 -> 0 bytes setup/wizard/resources/graphics/background.gif | Bin 914 -> 0 bytes setup/wizard/resources/graphics/big-ok.png | Bin 3217 -> 0 bytes setup/wizard/resources/graphics/cross.png | Bin 846 -> 0 bytes setup/wizard/resources/graphics/cross_orange.png | Bin 1465 -> 0 bytes setup/wizard/resources/graphics/dame/dot.png | Bin 3302 -> 0 bytes setup/wizard/resources/graphics/dame/finish.png | Bin 7393 -> 0 bytes setup/wizard/resources/graphics/dame/gradiant.gif | Bin 2162 -> 0 bytes setup/wizard/resources/graphics/dame/installer-header_logo.png | Bin 2916 -> 0 bytes setup/wizard/resources/graphics/dame/installer_head.png | Bin 2849 -> 0 bytes setup/wizard/resources/graphics/dame/kt_gradient.jpg | Bin 13542 -> 0 bytes setup/wizard/resources/graphics/dame/loginbg.png | Bin 769 -> 0 bytes setup/wizard/resources/graphics/dame/navbar.png | Bin 1609 -> 0 bytes setup/wizard/resources/graphics/dame/powered-by-kt.png | Bin 7515 -> 0 bytes setup/wizard/resources/graphics/dame/tick1.png | Bin 3513 -> 0 bytes setup/wizard/resources/graphics/dame/tick2.png | Bin 3487 -> 0 bytes setup/wizard/resources/graphics/dropbox.png | Bin 186054 -> 0 bytes setup/wizard/resources/graphics/dropbox_old.png | Bin 13891 -> 0 bytes setup/wizard/resources/graphics/footer.png | Bin 1065 -> 0 bytes setup/wizard/resources/graphics/gradient.png | Bin 1859 -> 0 bytes setup/wizard/resources/graphics/img_fatlogo.jpg | Bin 16019 -> 0 bytes setup/wizard/resources/graphics/inactive.png | Bin 1226 -> 0 bytes setup/wizard/resources/graphics/indicator.png | Bin 1247 -> 0 bytes setup/wizard/resources/graphics/kt_browse.png | Bin 34912 -> 0 bytes setup/wizard/resources/graphics/left.png | Bin 403 -> 0 bytes setup/wizard/resources/graphics/loading.gif | Bin 1849 -> 0 bytes setup/wizard/resources/graphics/logo.png | Bin 1389 -> 0 bytes setup/wizard/resources/graphics/powered-by-kt.png | Bin 8469 -> 0 bytes setup/wizard/resources/graphics/question.gif | Bin 1051 -> 0 bytes setup/wizard/resources/graphics/tick.png | Bin 917 -> 0 bytes setup/wizard/resources/graphics/tree.jpg | Bin 2250 -> 0 bytes setup/wizard/resources/js/form.js | 0 setup/wizard/resources/js/jquery.blockUI.js | 0 setup/wizard/resources/js/jquery.form.js | 0 setup/wizard/resources/js/jquery.hotkeys.js | 0 setup/wizard/resources/js/jquery.js | 0 setup/wizard/resources/js/wizard.js | 0 setup/wizard/resources/license/license.txt | 0 setup/wizard/session.php | 0 setup/wizard/step.php | 0 setup/wizard/stepAction.php | 0 setup/wizard/steps/complete.php | 0 setup/wizard/steps/configuration.php | 0 setup/wizard/steps/database.php | 0 setup/wizard/steps/dependencies.php | 0 setup/wizard/steps/errors.php | 0 setup/wizard/steps/install.php | 0 setup/wizard/steps/installtype.php | 0 setup/wizard/steps/license.php | 0 setup/wizard/steps/registration.php | 0 setup/wizard/steps/services.php | 0 setup/wizard/steps/welcome.php | 0 setup/wizard/template.php | 0 setup/wizard/templates/complete.tpl | 2 +- setup/wizard/templates/configuration.tpl | 0 setup/wizard/templates/configuration_confirm.tpl | 0 setup/wizard/templates/database.tpl | 0 setup/wizard/templates/database_confirm.tpl | 0 setup/wizard/templates/dependencies.tpl | 0 setup/wizard/templates/error.tpl | 0 setup/wizard/templates/errors.tpl | 0 setup/wizard/templates/install.tpl | 0 setup/wizard/templates/installtype.tpl | 0 setup/wizard/templates/license.tpl | 0 setup/wizard/templates/registration.tpl | 0 setup/wizard/templates/registration_confirm.tpl | 0 setup/wizard/templates/services.tpl | 0 setup/wizard/templates/sidemenu.tpl | 0 setup/wizard/templates/welcome.tpl | 0 setup/wizard/templates/wizard.tpl | 0 169 files changed, 5 insertions(+), 5 deletions(-) mode change 100755 => 100644 setup/migrate/config/config.xml mode change 100755 => 100644 setup/migrate/index.php mode change 100755 => 100644 setup/migrate/migrateUtil.php mode change 100755 => 100644 setup/migrate/migrateWizard.php mode change 100755 => 100644 setup/migrate/migrater.php mode change 100755 => 100644 setup/migrate/session.php mode change 100755 => 100644 setup/migrate/step.php mode change 100755 => 100644 setup/migrate/stepAction.php mode change 100755 => 100644 setup/migrate/steps/migrateComplete.php mode change 100755 => 100644 setup/migrate/steps/migrateDatabase.php mode change 100755 => 100644 setup/migrate/steps/migrateErrors.php mode change 100755 => 100644 setup/migrate/steps/migrateInstallation.php mode change 100755 => 100644 setup/migrate/steps/migrateServices.php mode change 100755 => 100644 setup/migrate/templates/complete.tpl mode change 100755 => 100644 setup/migrate/templates/database.tpl mode change 100755 => 100644 setup/migrate/templates/error.tpl mode change 100755 => 100644 setup/migrate/templates/errors.tpl mode change 100755 => 100644 setup/migrate/templates/installation.tpl mode change 100755 => 100644 setup/migrate/templates/installation_confirm.tpl mode change 100755 => 100644 setup/migrate/templates/services.tpl mode change 100755 => 100644 setup/migrate/templates/wizard.tpl mode change 100755 => 100644 setup/upgrade/config/config.xml mode change 100755 => 100644 setup/upgrade/index.php mode change 100755 => 100644 setup/upgrade/step.php mode change 100755 => 100644 setup/upgrade/stepAction.php mode change 100755 => 100644 setup/upgrade/steps/upgradeBackup.php mode change 100755 => 100644 setup/upgrade/steps/upgradeComplete.php mode change 100755 => 100644 setup/upgrade/steps/upgradeDatabase.php mode change 100755 => 100644 setup/upgrade/steps/upgradeErrors.php mode change 100755 => 100644 setup/upgrade/steps/upgradeInstallation.php mode change 100755 => 100644 setup/upgrade/steps/upgradeRestore.php mode change 100755 => 100644 setup/upgrade/steps/upgradeWelcome.php mode change 100755 => 100644 setup/upgrade/templates/backup.tpl mode change 100755 => 100644 setup/upgrade/templates/complete.tpl mode change 100755 => 100644 setup/upgrade/templates/database.tpl mode change 100755 => 100644 setup/upgrade/templates/error.tpl mode change 100755 => 100644 setup/upgrade/templates/errors.tpl mode change 100755 => 100644 setup/upgrade/templates/installation.tpl mode change 100755 => 100644 setup/upgrade/templates/loading.tpl mode change 100755 => 100644 setup/upgrade/templates/progress.tpl mode change 100755 => 100644 setup/upgrade/templates/restore.tpl mode change 100755 => 100644 setup/upgrade/templates/welcome.tpl mode change 100755 => 100644 setup/upgrade/templates/wizard.tpl mode change 100755 => 100644 setup/upgrade/upgrade mode change 100755 => 100644 setup/upgrade/upgrade.lock mode change 100755 => 100644 setup/upgrade/upgradeSession.php mode change 100755 => 100644 setup/upgrade/upgradeUtil.php mode change 100755 => 100644 setup/upgrade/upgradeWizard.php mode change 100755 => 100644 setup/upgrade/upgradedbUtil.php mode change 100755 => 100644 setup/upgrade/upgrader.php mode change 100755 => 100644 setup/wizard/batches/lucene_install.bat mode change 100755 => 100644 setup/wizard/batches/lucene_start.bat mode change 100755 => 100644 setup/wizard/batches/lucene_uninstall.bat mode change 100755 => 100644 setup/wizard/batches/scheduler_install.bat mode change 100755 => 100644 setup/wizard/batches/scheduler_start.bat mode change 100755 => 100644 setup/wizard/batches/scheduler_uninstall.bat mode change 100755 => 100644 setup/wizard/config/config.xml mode change 100755 => 100644 setup/wizard/config/databases.xml mode change 100755 => 100644 setup/wizard/dbUtil.php mode change 100755 => 100644 setup/wizard/dbUtilities.php mode change 100755 => 100644 setup/wizard/index.php mode change 100755 => 100644 setup/wizard/ini.php mode change 100755 => 100644 setup/wizard/iniUtilities.php delete mode 100644 setup/wizard/install.lock mode change 100755 => 100644 setup/wizard/installUtil.php mode change 100755 => 100644 setup/wizard/installWizard.php mode change 100755 => 100644 setup/wizard/installer.php mode change 100755 => 100644 setup/wizard/lib/helpers/htmlHelper.php mode change 100755 => 100644 setup/wizard/lib/services/service.php mode change 100755 => 100644 setup/wizard/lib/services/unixAgent.php mode change 100755 => 100644 setup/wizard/lib/services/unixLucene.php mode change 100755 => 100644 setup/wizard/lib/services/unixOpenOffice.php mode change 100755 => 100644 setup/wizard/lib/services/unixScheduler.php mode change 100755 => 100644 setup/wizard/lib/services/unixService.php mode change 100755 => 100644 setup/wizard/lib/services/windowsAgent.php mode change 100755 => 100644 setup/wizard/lib/services/windowsLucene.php mode change 100755 => 100644 setup/wizard/lib/services/windowsOpenOffice.php mode change 100755 => 100644 setup/wizard/lib/services/windowsScheduler.php mode change 100755 => 100644 setup/wizard/lib/services/windowsService.php mode change 100755 => 100644 setup/wizard/lib/system/config-path-mock mode change 100755 => 100644 setup/wizard/lib/system/config-path-mock-windows mode change 100755 => 100644 setup/wizard/lib/system/executeCommand.class mode change 100755 => 100644 setup/wizard/lib/system/executeCommand.java mode change 100755 => 100644 setup/wizard/lib/system/javaVersion.class mode change 100755 => 100644 setup/wizard/lib/system/javaVersion.java mode change 100755 => 100644 setup/wizard/lib/system/openOffice.class mode change 100755 => 100644 setup/wizard/lib/system/openOffice.java mode change 100755 => 100644 setup/wizard/lib/system/perms.sh mode change 100755 => 100644 setup/wizard/lib/system/phpinfo.php mode change 100755 => 100644 setup/wizard/lib/system/soffice.php mode change 100755 => 100644 setup/wizard/lib/system/systemCheck.php mode change 100755 => 100644 setup/wizard/lib/validation/luceneValidation.php mode change 100755 => 100644 setup/wizard/lib/validation/openofficeValidation.php mode change 100755 => 100644 setup/wizard/lib/validation/schedulerValidation.php mode change 100755 => 100644 setup/wizard/lib/validation/serviceValidation.php mode change 100755 => 100644 setup/wizard/path.php mode change 100755 => 100644 setup/wizard/resources/css/ie6.css mode change 100755 => 100644 setup/wizard/resources/css/migrate.css mode change 100755 => 100644 setup/wizard/resources/css/wizard.css mode change 100755 => 100644 setup/wizard/resources/graphics/active.png mode change 100755 => 100644 setup/wizard/resources/graphics/background.gif mode change 100755 => 100644 setup/wizard/resources/graphics/big-ok.png mode change 100755 => 100644 setup/wizard/resources/graphics/cross.png mode change 100755 => 100644 setup/wizard/resources/graphics/cross_orange.png mode change 100755 => 100644 setup/wizard/resources/graphics/dame/dot.png mode change 100755 => 100644 setup/wizard/resources/graphics/dame/finish.png mode change 100755 => 100644 setup/wizard/resources/graphics/dame/gradiant.gif mode change 100755 => 100644 setup/wizard/resources/graphics/dame/installer-header_logo.png mode change 100755 => 100644 setup/wizard/resources/graphics/dame/installer_head.png mode change 100755 => 100644 setup/wizard/resources/graphics/dame/kt_gradient.jpg mode change 100755 => 100644 setup/wizard/resources/graphics/dame/loginbg.png mode change 100755 => 100644 setup/wizard/resources/graphics/dame/navbar.png mode change 100755 => 100644 setup/wizard/resources/graphics/dame/powered-by-kt.png mode change 100755 => 100644 setup/wizard/resources/graphics/dame/tick1.png mode change 100755 => 100644 setup/wizard/resources/graphics/dame/tick2.png mode change 100755 => 100644 setup/wizard/resources/graphics/dropbox.png mode change 100755 => 100644 setup/wizard/resources/graphics/dropbox_old.png mode change 100755 => 100644 setup/wizard/resources/graphics/footer.png mode change 100755 => 100644 setup/wizard/resources/graphics/gradient.png mode change 100755 => 100644 setup/wizard/resources/graphics/img_fatlogo.jpg mode change 100755 => 100644 setup/wizard/resources/graphics/inactive.png mode change 100755 => 100644 setup/wizard/resources/graphics/indicator.png mode change 100755 => 100644 setup/wizard/resources/graphics/kt_browse.png mode change 100755 => 100644 setup/wizard/resources/graphics/left.png mode change 100755 => 100644 setup/wizard/resources/graphics/loading.gif mode change 100755 => 100644 setup/wizard/resources/graphics/logo.png mode change 100755 => 100644 setup/wizard/resources/graphics/powered-by-kt.png mode change 100755 => 100644 setup/wizard/resources/graphics/question.gif mode change 100755 => 100644 setup/wizard/resources/graphics/tick.png mode change 100755 => 100644 setup/wizard/resources/graphics/tree.jpg mode change 100755 => 100644 setup/wizard/resources/js/form.js mode change 100755 => 100644 setup/wizard/resources/js/jquery.blockUI.js mode change 100755 => 100644 setup/wizard/resources/js/jquery.form.js mode change 100755 => 100644 setup/wizard/resources/js/jquery.hotkeys.js mode change 100755 => 100644 setup/wizard/resources/js/jquery.js mode change 100755 => 100644 setup/wizard/resources/js/wizard.js mode change 100755 => 100644 setup/wizard/resources/license/license.txt mode change 100755 => 100644 setup/wizard/session.php mode change 100755 => 100644 setup/wizard/step.php mode change 100755 => 100644 setup/wizard/stepAction.php mode change 100755 => 100644 setup/wizard/steps/complete.php mode change 100755 => 100644 setup/wizard/steps/configuration.php mode change 100755 => 100644 setup/wizard/steps/database.php mode change 100755 => 100644 setup/wizard/steps/dependencies.php mode change 100755 => 100644 setup/wizard/steps/errors.php mode change 100755 => 100644 setup/wizard/steps/install.php mode change 100755 => 100644 setup/wizard/steps/installtype.php mode change 100755 => 100644 setup/wizard/steps/license.php mode change 100755 => 100644 setup/wizard/steps/registration.php mode change 100755 => 100644 setup/wizard/steps/services.php mode change 100755 => 100644 setup/wizard/steps/welcome.php mode change 100755 => 100644 setup/wizard/template.php mode change 100755 => 100644 setup/wizard/templates/complete.tpl mode change 100755 => 100644 setup/wizard/templates/configuration.tpl mode change 100755 => 100644 setup/wizard/templates/configuration_confirm.tpl mode change 100755 => 100644 setup/wizard/templates/database.tpl mode change 100755 => 100644 setup/wizard/templates/database_confirm.tpl mode change 100755 => 100644 setup/wizard/templates/dependencies.tpl mode change 100755 => 100644 setup/wizard/templates/error.tpl mode change 100755 => 100644 setup/wizard/templates/errors.tpl mode change 100755 => 100644 setup/wizard/templates/install.tpl mode change 100755 => 100644 setup/wizard/templates/installtype.tpl mode change 100755 => 100644 setup/wizard/templates/license.tpl mode change 100755 => 100644 setup/wizard/templates/registration.tpl mode change 100755 => 100644 setup/wizard/templates/registration_confirm.tpl mode change 100755 => 100644 setup/wizard/templates/services.tpl mode change 100755 => 100644 setup/wizard/templates/sidemenu.tpl mode change 100755 => 100644 setup/wizard/templates/welcome.tpl mode change 100755 => 100644 setup/wizard/templates/wizard.tpl diff --git a/setup/migrate/config/config.xml b/setup/migrate/config/config.xml old mode 100755 new mode 100644 index d394269..d394269 --- a/setup/migrate/config/config.xml +++ b/setup/migrate/config/config.xml diff --git a/setup/migrate/index.php b/setup/migrate/index.php old mode 100755 new mode 100644 index 3f80899..3f80899 --- a/setup/migrate/index.php +++ b/setup/migrate/index.php diff --git a/setup/migrate/migrateUtil.php b/setup/migrate/migrateUtil.php old mode 100755 new mode 100644 index 28fd474..28fd474 --- a/setup/migrate/migrateUtil.php +++ b/setup/migrate/migrateUtil.php diff --git a/setup/migrate/migrateWizard.php b/setup/migrate/migrateWizard.php old mode 100755 new mode 100644 index 0bb58d0..0b099e7 --- a/setup/migrate/migrateWizard.php +++ b/setup/migrate/migrateWizard.php @@ -261,7 +261,7 @@ class MigrateWizard { } } else { // TODO: Die gracefully - $this->util->error("System has been migrated Goto Login"); + $this->util->error("System has been migrated Goto Login"); } } } diff --git a/setup/migrate/migrater.php b/setup/migrate/migrater.php old mode 100755 new mode 100644 index 249fa36..249fa36 --- a/setup/migrate/migrater.php +++ b/setup/migrate/migrater.php diff --git a/setup/migrate/session.php b/setup/migrate/session.php old mode 100755 new mode 100644 index 35e7a7a..35e7a7a --- a/setup/migrate/session.php +++ b/setup/migrate/session.php diff --git a/setup/migrate/step.php b/setup/migrate/step.php old mode 100755 new mode 100644 index 897b710..897b710 --- a/setup/migrate/step.php +++ b/setup/migrate/step.php diff --git a/setup/migrate/stepAction.php b/setup/migrate/stepAction.php old mode 100755 new mode 100644 index 30724ed..30724ed --- a/setup/migrate/stepAction.php +++ b/setup/migrate/stepAction.php diff --git a/setup/migrate/steps/migrateComplete.php b/setup/migrate/steps/migrateComplete.php old mode 100755 new mode 100644 index 3cc332c..3cc332c --- a/setup/migrate/steps/migrateComplete.php +++ b/setup/migrate/steps/migrateComplete.php diff --git a/setup/migrate/steps/migrateDatabase.php b/setup/migrate/steps/migrateDatabase.php old mode 100755 new mode 100644 index 26fb90b..26fb90b --- a/setup/migrate/steps/migrateDatabase.php +++ b/setup/migrate/steps/migrateDatabase.php diff --git a/setup/migrate/steps/migrateErrors.php b/setup/migrate/steps/migrateErrors.php old mode 100755 new mode 100644 index bdd8687..bdd8687 --- a/setup/migrate/steps/migrateErrors.php +++ b/setup/migrate/steps/migrateErrors.php diff --git a/setup/migrate/steps/migrateInstallation.php b/setup/migrate/steps/migrateInstallation.php old mode 100755 new mode 100644 index 07230bb..07230bb --- a/setup/migrate/steps/migrateInstallation.php +++ b/setup/migrate/steps/migrateInstallation.php diff --git a/setup/migrate/steps/migrateServices.php b/setup/migrate/steps/migrateServices.php old mode 100755 new mode 100644 index b0bc18e..b0bc18e --- a/setup/migrate/steps/migrateServices.php +++ b/setup/migrate/steps/migrateServices.php diff --git a/setup/migrate/templates/complete.tpl b/setup/migrate/templates/complete.tpl old mode 100755 new mode 100644 index 838049c..838049c --- a/setup/migrate/templates/complete.tpl +++ b/setup/migrate/templates/complete.tpl diff --git a/setup/migrate/templates/database.tpl b/setup/migrate/templates/database.tpl old mode 100755 new mode 100644 index d0624a6..d0624a6 --- a/setup/migrate/templates/database.tpl +++ b/setup/migrate/templates/database.tpl diff --git a/setup/migrate/templates/error.tpl b/setup/migrate/templates/error.tpl old mode 100755 new mode 100644 index 5a93982..5a93982 --- a/setup/migrate/templates/error.tpl +++ b/setup/migrate/templates/error.tpl diff --git a/setup/migrate/templates/errors.tpl b/setup/migrate/templates/errors.tpl old mode 100755 new mode 100644 index f48f1df..f48f1df --- a/setup/migrate/templates/errors.tpl +++ b/setup/migrate/templates/errors.tpl diff --git a/setup/migrate/templates/installation.tpl b/setup/migrate/templates/installation.tpl old mode 100755 new mode 100644 index f8efbb4..f8efbb4 --- a/setup/migrate/templates/installation.tpl +++ b/setup/migrate/templates/installation.tpl diff --git a/setup/migrate/templates/installation_confirm.tpl b/setup/migrate/templates/installation_confirm.tpl old mode 100755 new mode 100644 index 76b4a49..76b4a49 --- a/setup/migrate/templates/installation_confirm.tpl +++ b/setup/migrate/templates/installation_confirm.tpl diff --git a/setup/migrate/templates/services.tpl b/setup/migrate/templates/services.tpl old mode 100755 new mode 100644 index d991aff..d991aff --- a/setup/migrate/templates/services.tpl +++ b/setup/migrate/templates/services.tpl diff --git a/setup/migrate/templates/wizard.tpl b/setup/migrate/templates/wizard.tpl old mode 100755 new mode 100644 index b39cde5..b39cde5 --- a/setup/migrate/templates/wizard.tpl +++ b/setup/migrate/templates/wizard.tpl diff --git a/setup/upgrade/config/config.xml b/setup/upgrade/config/config.xml old mode 100755 new mode 100644 index 7acf4a2..7acf4a2 --- a/setup/upgrade/config/config.xml +++ b/setup/upgrade/config/config.xml diff --git a/setup/upgrade/index.php b/setup/upgrade/index.php old mode 100755 new mode 100644 index dd5677f..dd5677f --- a/setup/upgrade/index.php +++ b/setup/upgrade/index.php diff --git a/setup/upgrade/step.php b/setup/upgrade/step.php old mode 100755 new mode 100644 index 49890fd..49890fd --- a/setup/upgrade/step.php +++ b/setup/upgrade/step.php diff --git a/setup/upgrade/stepAction.php b/setup/upgrade/stepAction.php old mode 100755 new mode 100644 index 438df77..438df77 --- a/setup/upgrade/stepAction.php +++ b/setup/upgrade/stepAction.php diff --git a/setup/upgrade/steps/upgradeBackup.php b/setup/upgrade/steps/upgradeBackup.php old mode 100755 new mode 100644 index 6977416..6977416 --- a/setup/upgrade/steps/upgradeBackup.php +++ b/setup/upgrade/steps/upgradeBackup.php diff --git a/setup/upgrade/steps/upgradeComplete.php b/setup/upgrade/steps/upgradeComplete.php old mode 100755 new mode 100644 index 7e8a08a..7e8a08a --- a/setup/upgrade/steps/upgradeComplete.php +++ b/setup/upgrade/steps/upgradeComplete.php diff --git a/setup/upgrade/steps/upgradeDatabase.php b/setup/upgrade/steps/upgradeDatabase.php old mode 100755 new mode 100644 index f58f571..f58f571 --- a/setup/upgrade/steps/upgradeDatabase.php +++ b/setup/upgrade/steps/upgradeDatabase.php diff --git a/setup/upgrade/steps/upgradeErrors.php b/setup/upgrade/steps/upgradeErrors.php old mode 100755 new mode 100644 index ac6db1c..ac6db1c --- a/setup/upgrade/steps/upgradeErrors.php +++ b/setup/upgrade/steps/upgradeErrors.php diff --git a/setup/upgrade/steps/upgradeInstallation.php b/setup/upgrade/steps/upgradeInstallation.php old mode 100755 new mode 100644 index 7a3d1e4..7a3d1e4 --- a/setup/upgrade/steps/upgradeInstallation.php +++ b/setup/upgrade/steps/upgradeInstallation.php diff --git a/setup/upgrade/steps/upgradeRestore.php b/setup/upgrade/steps/upgradeRestore.php old mode 100755 new mode 100644 index 270978f..270978f --- a/setup/upgrade/steps/upgradeRestore.php +++ b/setup/upgrade/steps/upgradeRestore.php diff --git a/setup/upgrade/steps/upgradeWelcome.php b/setup/upgrade/steps/upgradeWelcome.php old mode 100755 new mode 100644 index 0082985..0082985 --- a/setup/upgrade/steps/upgradeWelcome.php +++ b/setup/upgrade/steps/upgradeWelcome.php diff --git a/setup/upgrade/templates/backup.tpl b/setup/upgrade/templates/backup.tpl old mode 100755 new mode 100644 index b1aeea7..b1aeea7 --- a/setup/upgrade/templates/backup.tpl +++ b/setup/upgrade/templates/backup.tpl diff --git a/setup/upgrade/templates/complete.tpl b/setup/upgrade/templates/complete.tpl old mode 100755 new mode 100644 index 6d7f1fa..52eb513 --- a/setup/upgrade/templates/complete.tpl +++ b/setup/upgrade/templates/complete.tpl @@ -9,5 +9,5 @@ Your database has been upgraded to systemVersion; ?> - Goto Login + Goto Login \ No newline at end of file diff --git a/setup/upgrade/templates/database.tpl b/setup/upgrade/templates/database.tpl old mode 100755 new mode 100644 index 46b3aec..46b3aec --- a/setup/upgrade/templates/database.tpl +++ b/setup/upgrade/templates/database.tpl diff --git a/setup/upgrade/templates/error.tpl b/setup/upgrade/templates/error.tpl old mode 100755 new mode 100644 index 5102838..5102838 --- a/setup/upgrade/templates/error.tpl +++ b/setup/upgrade/templates/error.tpl diff --git a/setup/upgrade/templates/errors.tpl b/setup/upgrade/templates/errors.tpl old mode 100755 new mode 100644 index 19dd15d..19dd15d --- a/setup/upgrade/templates/errors.tpl +++ b/setup/upgrade/templates/errors.tpl diff --git a/setup/upgrade/templates/installation.tpl b/setup/upgrade/templates/installation.tpl old mode 100755 new mode 100644 index b51f7a1..b51f7a1 --- a/setup/upgrade/templates/installation.tpl +++ b/setup/upgrade/templates/installation.tpl diff --git a/setup/upgrade/templates/loading.tpl b/setup/upgrade/templates/loading.tpl old mode 100755 new mode 100644 index 35f4f9d..35f4f9d --- a/setup/upgrade/templates/loading.tpl +++ b/setup/upgrade/templates/loading.tpl diff --git a/setup/upgrade/templates/progress.tpl b/setup/upgrade/templates/progress.tpl old mode 100755 new mode 100644 index adc2bf5..adc2bf5 --- a/setup/upgrade/templates/progress.tpl +++ b/setup/upgrade/templates/progress.tpl diff --git a/setup/upgrade/templates/restore.tpl b/setup/upgrade/templates/restore.tpl old mode 100755 new mode 100644 index 8c23929..8c23929 --- a/setup/upgrade/templates/restore.tpl +++ b/setup/upgrade/templates/restore.tpl diff --git a/setup/upgrade/templates/welcome.tpl b/setup/upgrade/templates/welcome.tpl old mode 100755 new mode 100644 index 406578d..406578d --- a/setup/upgrade/templates/welcome.tpl +++ b/setup/upgrade/templates/welcome.tpl diff --git a/setup/upgrade/templates/wizard.tpl b/setup/upgrade/templates/wizard.tpl old mode 100755 new mode 100644 index 823d3e7..823d3e7 --- a/setup/upgrade/templates/wizard.tpl +++ b/setup/upgrade/templates/wizard.tpl diff --git a/setup/upgrade/upgrade b/setup/upgrade/upgrade old mode 100755 new mode 100644 index e69de29..e69de29 --- a/setup/upgrade/upgrade +++ b/setup/upgrade/upgrade diff --git a/setup/upgrade/upgrade.lock b/setup/upgrade/upgrade.lock old mode 100755 new mode 100644 index e69de29..e69de29 --- a/setup/upgrade/upgrade.lock +++ b/setup/upgrade/upgrade.lock diff --git a/setup/upgrade/upgradeSession.php b/setup/upgrade/upgradeSession.php old mode 100755 new mode 100644 index 019fded..019fded --- a/setup/upgrade/upgradeSession.php +++ b/setup/upgrade/upgradeSession.php diff --git a/setup/upgrade/upgradeUtil.php b/setup/upgrade/upgradeUtil.php old mode 100755 new mode 100644 index 3bc2ea5..3bc2ea5 --- a/setup/upgrade/upgradeUtil.php +++ b/setup/upgrade/upgradeUtil.php diff --git a/setup/upgrade/upgradeWizard.php b/setup/upgrade/upgradeWizard.php old mode 100755 new mode 100644 index fa2b6b3..fa2b6b3 --- a/setup/upgrade/upgradeWizard.php +++ b/setup/upgrade/upgradeWizard.php diff --git a/setup/upgrade/upgradedbUtil.php b/setup/upgrade/upgradedbUtil.php old mode 100755 new mode 100644 index f032782..f032782 --- a/setup/upgrade/upgradedbUtil.php +++ b/setup/upgrade/upgradedbUtil.php diff --git a/setup/upgrade/upgrader.php b/setup/upgrade/upgrader.php old mode 100755 new mode 100644 index 30dedf9..30dedf9 --- a/setup/upgrade/upgrader.php +++ b/setup/upgrade/upgrader.php diff --git a/setup/wizard/batches/lucene_install.bat b/setup/wizard/batches/lucene_install.bat old mode 100755 new mode 100644 index 2d8216b..2d8216b --- a/setup/wizard/batches/lucene_install.bat +++ b/setup/wizard/batches/lucene_install.bat diff --git a/setup/wizard/batches/lucene_start.bat b/setup/wizard/batches/lucene_start.bat old mode 100755 new mode 100644 index 3cc5343..3cc5343 --- a/setup/wizard/batches/lucene_start.bat +++ b/setup/wizard/batches/lucene_start.bat diff --git a/setup/wizard/batches/lucene_uninstall.bat b/setup/wizard/batches/lucene_uninstall.bat old mode 100755 new mode 100644 index 028e796..028e796 --- a/setup/wizard/batches/lucene_uninstall.bat +++ b/setup/wizard/batches/lucene_uninstall.bat diff --git a/setup/wizard/batches/scheduler_install.bat b/setup/wizard/batches/scheduler_install.bat old mode 100755 new mode 100644 index e69de29..e69de29 --- a/setup/wizard/batches/scheduler_install.bat +++ b/setup/wizard/batches/scheduler_install.bat diff --git a/setup/wizard/batches/scheduler_start.bat b/setup/wizard/batches/scheduler_start.bat old mode 100755 new mode 100644 index fed9906..fed9906 --- a/setup/wizard/batches/scheduler_start.bat +++ b/setup/wizard/batches/scheduler_start.bat diff --git a/setup/wizard/batches/scheduler_uninstall.bat b/setup/wizard/batches/scheduler_uninstall.bat old mode 100755 new mode 100644 index 1058327..1058327 --- a/setup/wizard/batches/scheduler_uninstall.bat +++ b/setup/wizard/batches/scheduler_uninstall.bat diff --git a/setup/wizard/config/config.xml b/setup/wizard/config/config.xml old mode 100755 new mode 100644 index 8a2ac31..8a2ac31 --- a/setup/wizard/config/config.xml +++ b/setup/wizard/config/config.xml diff --git a/setup/wizard/config/databases.xml b/setup/wizard/config/databases.xml old mode 100755 new mode 100644 index 24a818b..24a818b --- a/setup/wizard/config/databases.xml +++ b/setup/wizard/config/databases.xml diff --git a/setup/wizard/dbUtil.php b/setup/wizard/dbUtil.php old mode 100755 new mode 100644 index 55c3ed7..55c3ed7 --- a/setup/wizard/dbUtil.php +++ b/setup/wizard/dbUtil.php diff --git a/setup/wizard/dbUtilities.php b/setup/wizard/dbUtilities.php old mode 100755 new mode 100644 index ff3af9f..ff3af9f --- a/setup/wizard/dbUtilities.php +++ b/setup/wizard/dbUtilities.php diff --git a/setup/wizard/index.php b/setup/wizard/index.php old mode 100755 new mode 100644 index f771d84..f771d84 --- a/setup/wizard/index.php +++ b/setup/wizard/index.php diff --git a/setup/wizard/ini.php b/setup/wizard/ini.php old mode 100755 new mode 100644 index 3a41f0c..3a41f0c --- a/setup/wizard/ini.php +++ b/setup/wizard/ini.php diff --git a/setup/wizard/iniUtilities.php b/setup/wizard/iniUtilities.php old mode 100755 new mode 100644 index b036724..b036724 --- a/setup/wizard/iniUtilities.php +++ b/setup/wizard/iniUtilities.php diff --git a/setup/wizard/install.lock b/setup/wizard/install.lock deleted file mode 100644 index e69de29..0000000 --- a/setup/wizard/install.lock +++ /dev/null diff --git a/setup/wizard/installUtil.php b/setup/wizard/installUtil.php old mode 100755 new mode 100644 index 25452f5..25452f5 --- a/setup/wizard/installUtil.php +++ b/setup/wizard/installUtil.php diff --git a/setup/wizard/installWizard.php b/setup/wizard/installWizard.php old mode 100755 new mode 100644 index a090336..72adbf1 --- a/setup/wizard/installWizard.php +++ b/setup/wizard/installWizard.php @@ -296,7 +296,7 @@ class InstallWizard { } } else { // TODO: Die gracefully - $this->util->error("System has been installed Goto Login"); + $this->util->error("System has been installed Goto Login"); } } } diff --git a/setup/wizard/installer.php b/setup/wizard/installer.php old mode 100755 new mode 100644 index e3ae105..e3ae105 --- a/setup/wizard/installer.php +++ b/setup/wizard/installer.php diff --git a/setup/wizard/lib/helpers/htmlHelper.php b/setup/wizard/lib/helpers/htmlHelper.php old mode 100755 new mode 100644 index 50150b5..50150b5 --- a/setup/wizard/lib/helpers/htmlHelper.php +++ b/setup/wizard/lib/helpers/htmlHelper.php diff --git a/setup/wizard/lib/services/service.php b/setup/wizard/lib/services/service.php old mode 100755 new mode 100644 index cb02daa..cb02daa --- a/setup/wizard/lib/services/service.php +++ b/setup/wizard/lib/services/service.php diff --git a/setup/wizard/lib/services/unixAgent.php b/setup/wizard/lib/services/unixAgent.php old mode 100755 new mode 100644 index 0089a05..0089a05 --- a/setup/wizard/lib/services/unixAgent.php +++ b/setup/wizard/lib/services/unixAgent.php diff --git a/setup/wizard/lib/services/unixLucene.php b/setup/wizard/lib/services/unixLucene.php old mode 100755 new mode 100644 index ff574e1..ff574e1 --- a/setup/wizard/lib/services/unixLucene.php +++ b/setup/wizard/lib/services/unixLucene.php diff --git a/setup/wizard/lib/services/unixOpenOffice.php b/setup/wizard/lib/services/unixOpenOffice.php old mode 100755 new mode 100644 index b4b9d1d..b4b9d1d --- a/setup/wizard/lib/services/unixOpenOffice.php +++ b/setup/wizard/lib/services/unixOpenOffice.php diff --git a/setup/wizard/lib/services/unixScheduler.php b/setup/wizard/lib/services/unixScheduler.php old mode 100755 new mode 100644 index aae16f3..aae16f3 --- a/setup/wizard/lib/services/unixScheduler.php +++ b/setup/wizard/lib/services/unixScheduler.php diff --git a/setup/wizard/lib/services/unixService.php b/setup/wizard/lib/services/unixService.php old mode 100755 new mode 100644 index 8e42ed2..8e42ed2 --- a/setup/wizard/lib/services/unixService.php +++ b/setup/wizard/lib/services/unixService.php diff --git a/setup/wizard/lib/services/windowsAgent.php b/setup/wizard/lib/services/windowsAgent.php old mode 100755 new mode 100644 index cb4e60b..cb4e60b --- a/setup/wizard/lib/services/windowsAgent.php +++ b/setup/wizard/lib/services/windowsAgent.php diff --git a/setup/wizard/lib/services/windowsLucene.php b/setup/wizard/lib/services/windowsLucene.php old mode 100755 new mode 100644 index ff7a231..ff7a231 --- a/setup/wizard/lib/services/windowsLucene.php +++ b/setup/wizard/lib/services/windowsLucene.php diff --git a/setup/wizard/lib/services/windowsOpenOffice.php b/setup/wizard/lib/services/windowsOpenOffice.php old mode 100755 new mode 100644 index 4722c65..4722c65 --- a/setup/wizard/lib/services/windowsOpenOffice.php +++ b/setup/wizard/lib/services/windowsOpenOffice.php diff --git a/setup/wizard/lib/services/windowsScheduler.php b/setup/wizard/lib/services/windowsScheduler.php old mode 100755 new mode 100644 index e6d8a95..e6d8a95 --- a/setup/wizard/lib/services/windowsScheduler.php +++ b/setup/wizard/lib/services/windowsScheduler.php diff --git a/setup/wizard/lib/services/windowsService.php b/setup/wizard/lib/services/windowsService.php old mode 100755 new mode 100644 index 41e48bd..41e48bd --- a/setup/wizard/lib/services/windowsService.php +++ b/setup/wizard/lib/services/windowsService.php diff --git a/setup/wizard/lib/system/config-path-mock b/setup/wizard/lib/system/config-path-mock old mode 100755 new mode 100644 index 8fb204f..8fb204f --- a/setup/wizard/lib/system/config-path-mock +++ b/setup/wizard/lib/system/config-path-mock diff --git a/setup/wizard/lib/system/config-path-mock-windows b/setup/wizard/lib/system/config-path-mock-windows old mode 100755 new mode 100644 index 4018110..4018110 --- a/setup/wizard/lib/system/config-path-mock-windows +++ b/setup/wizard/lib/system/config-path-mock-windows diff --git a/setup/wizard/lib/system/executeCommand.class b/setup/wizard/lib/system/executeCommand.class old mode 100755 new mode 100644 index f5876ff..f5876ff Binary files a/setup/wizard/lib/system/executeCommand.class and b/setup/wizard/lib/system/executeCommand.class differ diff --git a/setup/wizard/lib/system/executeCommand.java b/setup/wizard/lib/system/executeCommand.java old mode 100755 new mode 100644 index d9b8adb..d9b8adb --- a/setup/wizard/lib/system/executeCommand.java +++ b/setup/wizard/lib/system/executeCommand.java diff --git a/setup/wizard/lib/system/javaVersion.class b/setup/wizard/lib/system/javaVersion.class old mode 100755 new mode 100644 index c10bfab..c10bfab Binary files a/setup/wizard/lib/system/javaVersion.class and b/setup/wizard/lib/system/javaVersion.class differ diff --git a/setup/wizard/lib/system/javaVersion.java b/setup/wizard/lib/system/javaVersion.java old mode 100755 new mode 100644 index 83e1dc4..83e1dc4 --- a/setup/wizard/lib/system/javaVersion.java +++ b/setup/wizard/lib/system/javaVersion.java diff --git a/setup/wizard/lib/system/openOffice.class b/setup/wizard/lib/system/openOffice.class old mode 100755 new mode 100644 index e8bcf22..e8bcf22 Binary files a/setup/wizard/lib/system/openOffice.class and b/setup/wizard/lib/system/openOffice.class differ diff --git a/setup/wizard/lib/system/openOffice.java b/setup/wizard/lib/system/openOffice.java old mode 100755 new mode 100644 index 04bd38c..04bd38c --- a/setup/wizard/lib/system/openOffice.java +++ b/setup/wizard/lib/system/openOffice.java diff --git a/setup/wizard/lib/system/perms.sh b/setup/wizard/lib/system/perms.sh old mode 100755 new mode 100644 index 9d0cb7c..9d0cb7c --- a/setup/wizard/lib/system/perms.sh +++ b/setup/wizard/lib/system/perms.sh diff --git a/setup/wizard/lib/system/phpinfo.php b/setup/wizard/lib/system/phpinfo.php old mode 100755 new mode 100644 index ccddb96..ccddb96 --- a/setup/wizard/lib/system/phpinfo.php +++ b/setup/wizard/lib/system/phpinfo.php diff --git a/setup/wizard/lib/system/soffice.php b/setup/wizard/lib/system/soffice.php old mode 100755 new mode 100644 index 593d803..593d803 --- a/setup/wizard/lib/system/soffice.php +++ b/setup/wizard/lib/system/soffice.php diff --git a/setup/wizard/lib/system/systemCheck.php b/setup/wizard/lib/system/systemCheck.php old mode 100755 new mode 100644 index 3e6fd4f..3e6fd4f --- a/setup/wizard/lib/system/systemCheck.php +++ b/setup/wizard/lib/system/systemCheck.php diff --git a/setup/wizard/lib/validation/luceneValidation.php b/setup/wizard/lib/validation/luceneValidation.php old mode 100755 new mode 100644 index 34cb82a..34cb82a --- a/setup/wizard/lib/validation/luceneValidation.php +++ b/setup/wizard/lib/validation/luceneValidation.php diff --git a/setup/wizard/lib/validation/openofficeValidation.php b/setup/wizard/lib/validation/openofficeValidation.php old mode 100755 new mode 100644 index f2d1b2b..f2d1b2b --- a/setup/wizard/lib/validation/openofficeValidation.php +++ b/setup/wizard/lib/validation/openofficeValidation.php diff --git a/setup/wizard/lib/validation/schedulerValidation.php b/setup/wizard/lib/validation/schedulerValidation.php old mode 100755 new mode 100644 index b39b9ad..b39b9ad --- a/setup/wizard/lib/validation/schedulerValidation.php +++ b/setup/wizard/lib/validation/schedulerValidation.php diff --git a/setup/wizard/lib/validation/serviceValidation.php b/setup/wizard/lib/validation/serviceValidation.php old mode 100755 new mode 100644 index ba77226..ba77226 --- a/setup/wizard/lib/validation/serviceValidation.php +++ b/setup/wizard/lib/validation/serviceValidation.php diff --git a/setup/wizard/path.php b/setup/wizard/path.php old mode 100755 new mode 100644 index 676230b..676230b --- a/setup/wizard/path.php +++ b/setup/wizard/path.php diff --git a/setup/wizard/resources/css/ie6.css b/setup/wizard/resources/css/ie6.css old mode 100755 new mode 100644 index e69de29..e69de29 --- a/setup/wizard/resources/css/ie6.css +++ b/setup/wizard/resources/css/ie6.css diff --git a/setup/wizard/resources/css/migrate.css b/setup/wizard/resources/css/migrate.css old mode 100755 new mode 100644 index 15f0dcb..15f0dcb --- a/setup/wizard/resources/css/migrate.css +++ b/setup/wizard/resources/css/migrate.css diff --git a/setup/wizard/resources/css/wizard.css b/setup/wizard/resources/css/wizard.css old mode 100755 new mode 100644 index c32b210..3abad14 --- a/setup/wizard/resources/css/wizard.css +++ b/setup/wizard/resources/css/wizard.css @@ -361,7 +361,7 @@ select { .onclick { cursor: pointer; color: #EC7725; - width: 150px; + width: 130px; } .description { diff --git a/setup/wizard/resources/graphics/active.png b/setup/wizard/resources/graphics/active.png old mode 100755 new mode 100644 index 62b232c..62b232c Binary files a/setup/wizard/resources/graphics/active.png and b/setup/wizard/resources/graphics/active.png differ diff --git a/setup/wizard/resources/graphics/background.gif b/setup/wizard/resources/graphics/background.gif old mode 100755 new mode 100644 index d8039fb..d8039fb Binary files a/setup/wizard/resources/graphics/background.gif and b/setup/wizard/resources/graphics/background.gif differ diff --git a/setup/wizard/resources/graphics/big-ok.png b/setup/wizard/resources/graphics/big-ok.png old mode 100755 new mode 100644 index 62c9046..62c9046 Binary files a/setup/wizard/resources/graphics/big-ok.png and b/setup/wizard/resources/graphics/big-ok.png differ diff --git a/setup/wizard/resources/graphics/cross.png b/setup/wizard/resources/graphics/cross.png old mode 100755 new mode 100644 index 3ba9615..3ba9615 Binary files a/setup/wizard/resources/graphics/cross.png and b/setup/wizard/resources/graphics/cross.png differ diff --git a/setup/wizard/resources/graphics/cross_orange.png b/setup/wizard/resources/graphics/cross_orange.png old mode 100755 new mode 100644 index cb02cd5..cb02cd5 Binary files a/setup/wizard/resources/graphics/cross_orange.png and b/setup/wizard/resources/graphics/cross_orange.png differ diff --git a/setup/wizard/resources/graphics/dame/dot.png b/setup/wizard/resources/graphics/dame/dot.png old mode 100755 new mode 100644 index 0365307..0365307 Binary files a/setup/wizard/resources/graphics/dame/dot.png and b/setup/wizard/resources/graphics/dame/dot.png differ diff --git a/setup/wizard/resources/graphics/dame/finish.png b/setup/wizard/resources/graphics/dame/finish.png old mode 100755 new mode 100644 index 6176f6e..6176f6e Binary files a/setup/wizard/resources/graphics/dame/finish.png and b/setup/wizard/resources/graphics/dame/finish.png differ diff --git a/setup/wizard/resources/graphics/dame/gradiant.gif b/setup/wizard/resources/graphics/dame/gradiant.gif old mode 100755 new mode 100644 index 019998d..019998d Binary files a/setup/wizard/resources/graphics/dame/gradiant.gif and b/setup/wizard/resources/graphics/dame/gradiant.gif differ diff --git a/setup/wizard/resources/graphics/dame/installer-header_logo.png b/setup/wizard/resources/graphics/dame/installer-header_logo.png old mode 100755 new mode 100644 index c5d8e7d..c5d8e7d Binary files a/setup/wizard/resources/graphics/dame/installer-header_logo.png and b/setup/wizard/resources/graphics/dame/installer-header_logo.png differ diff --git a/setup/wizard/resources/graphics/dame/installer_head.png b/setup/wizard/resources/graphics/dame/installer_head.png old mode 100755 new mode 100644 index dcd92ac..dcd92ac Binary files a/setup/wizard/resources/graphics/dame/installer_head.png and b/setup/wizard/resources/graphics/dame/installer_head.png differ diff --git a/setup/wizard/resources/graphics/dame/kt_gradient.jpg b/setup/wizard/resources/graphics/dame/kt_gradient.jpg old mode 100755 new mode 100644 index e5c3b5b..e5c3b5b Binary files a/setup/wizard/resources/graphics/dame/kt_gradient.jpg and b/setup/wizard/resources/graphics/dame/kt_gradient.jpg differ diff --git a/setup/wizard/resources/graphics/dame/loginbg.png b/setup/wizard/resources/graphics/dame/loginbg.png old mode 100755 new mode 100644 index 02c3ad7..02c3ad7 Binary files a/setup/wizard/resources/graphics/dame/loginbg.png and b/setup/wizard/resources/graphics/dame/loginbg.png differ diff --git a/setup/wizard/resources/graphics/dame/navbar.png b/setup/wizard/resources/graphics/dame/navbar.png old mode 100755 new mode 100644 index c29b192..c29b192 Binary files a/setup/wizard/resources/graphics/dame/navbar.png and b/setup/wizard/resources/graphics/dame/navbar.png differ diff --git a/setup/wizard/resources/graphics/dame/powered-by-kt.png b/setup/wizard/resources/graphics/dame/powered-by-kt.png old mode 100755 new mode 100644 index 0526fd8..0526fd8 Binary files a/setup/wizard/resources/graphics/dame/powered-by-kt.png and b/setup/wizard/resources/graphics/dame/powered-by-kt.png differ diff --git a/setup/wizard/resources/graphics/dame/tick1.png b/setup/wizard/resources/graphics/dame/tick1.png old mode 100755 new mode 100644 index 2df208f..2df208f Binary files a/setup/wizard/resources/graphics/dame/tick1.png and b/setup/wizard/resources/graphics/dame/tick1.png differ diff --git a/setup/wizard/resources/graphics/dame/tick2.png b/setup/wizard/resources/graphics/dame/tick2.png old mode 100755 new mode 100644 index 979f834..979f834 Binary files a/setup/wizard/resources/graphics/dame/tick2.png and b/setup/wizard/resources/graphics/dame/tick2.png differ diff --git a/setup/wizard/resources/graphics/dropbox.png b/setup/wizard/resources/graphics/dropbox.png old mode 100755 new mode 100644 index af538e5..af538e5 Binary files a/setup/wizard/resources/graphics/dropbox.png and b/setup/wizard/resources/graphics/dropbox.png differ diff --git a/setup/wizard/resources/graphics/dropbox_old.png b/setup/wizard/resources/graphics/dropbox_old.png old mode 100755 new mode 100644 index 6958c3c..6958c3c Binary files a/setup/wizard/resources/graphics/dropbox_old.png and b/setup/wizard/resources/graphics/dropbox_old.png differ diff --git a/setup/wizard/resources/graphics/footer.png b/setup/wizard/resources/graphics/footer.png old mode 100755 new mode 100644 index 6486da9..6486da9 Binary files a/setup/wizard/resources/graphics/footer.png and b/setup/wizard/resources/graphics/footer.png differ diff --git a/setup/wizard/resources/graphics/gradient.png b/setup/wizard/resources/graphics/gradient.png old mode 100755 new mode 100644 index 6074bca..6074bca Binary files a/setup/wizard/resources/graphics/gradient.png and b/setup/wizard/resources/graphics/gradient.png differ diff --git a/setup/wizard/resources/graphics/img_fatlogo.jpg b/setup/wizard/resources/graphics/img_fatlogo.jpg old mode 100755 new mode 100644 index c9e2e79..c9e2e79 Binary files a/setup/wizard/resources/graphics/img_fatlogo.jpg and b/setup/wizard/resources/graphics/img_fatlogo.jpg differ diff --git a/setup/wizard/resources/graphics/inactive.png b/setup/wizard/resources/graphics/inactive.png old mode 100755 new mode 100644 index dfe29a2..dfe29a2 Binary files a/setup/wizard/resources/graphics/inactive.png and b/setup/wizard/resources/graphics/inactive.png differ diff --git a/setup/wizard/resources/graphics/indicator.png b/setup/wizard/resources/graphics/indicator.png old mode 100755 new mode 100644 index 89dbff0..89dbff0 Binary files a/setup/wizard/resources/graphics/indicator.png and b/setup/wizard/resources/graphics/indicator.png differ diff --git a/setup/wizard/resources/graphics/kt_browse.png b/setup/wizard/resources/graphics/kt_browse.png old mode 100755 new mode 100644 index 048cd6c..048cd6c Binary files a/setup/wizard/resources/graphics/kt_browse.png and b/setup/wizard/resources/graphics/kt_browse.png differ diff --git a/setup/wizard/resources/graphics/left.png b/setup/wizard/resources/graphics/left.png old mode 100755 new mode 100644 index bfca27c..bfca27c Binary files a/setup/wizard/resources/graphics/left.png and b/setup/wizard/resources/graphics/left.png differ diff --git a/setup/wizard/resources/graphics/loading.gif b/setup/wizard/resources/graphics/loading.gif old mode 100755 new mode 100644 index d42f72c..d42f72c Binary files a/setup/wizard/resources/graphics/loading.gif and b/setup/wizard/resources/graphics/loading.gif differ diff --git a/setup/wizard/resources/graphics/logo.png b/setup/wizard/resources/graphics/logo.png old mode 100755 new mode 100644 index bfeefd8..bfeefd8 Binary files a/setup/wizard/resources/graphics/logo.png and b/setup/wizard/resources/graphics/logo.png differ diff --git a/setup/wizard/resources/graphics/powered-by-kt.png b/setup/wizard/resources/graphics/powered-by-kt.png old mode 100755 new mode 100644 index 2bc078b..2bc078b Binary files a/setup/wizard/resources/graphics/powered-by-kt.png and b/setup/wizard/resources/graphics/powered-by-kt.png differ diff --git a/setup/wizard/resources/graphics/question.gif b/setup/wizard/resources/graphics/question.gif old mode 100755 new mode 100644 index 390a7fc..390a7fc Binary files a/setup/wizard/resources/graphics/question.gif and b/setup/wizard/resources/graphics/question.gif differ diff --git a/setup/wizard/resources/graphics/tick.png b/setup/wizard/resources/graphics/tick.png old mode 100755 new mode 100644 index a24d605..a24d605 Binary files a/setup/wizard/resources/graphics/tick.png and b/setup/wizard/resources/graphics/tick.png differ diff --git a/setup/wizard/resources/graphics/tree.jpg b/setup/wizard/resources/graphics/tree.jpg old mode 100755 new mode 100644 index d9e11f6..d9e11f6 Binary files a/setup/wizard/resources/graphics/tree.jpg and b/setup/wizard/resources/graphics/tree.jpg differ diff --git a/setup/wizard/resources/js/form.js b/setup/wizard/resources/js/form.js old mode 100755 new mode 100644 index e286d41..e286d41 --- a/setup/wizard/resources/js/form.js +++ b/setup/wizard/resources/js/form.js diff --git a/setup/wizard/resources/js/jquery.blockUI.js b/setup/wizard/resources/js/jquery.blockUI.js old mode 100755 new mode 100644 index 3a50783..3a50783 --- a/setup/wizard/resources/js/jquery.blockUI.js +++ b/setup/wizard/resources/js/jquery.blockUI.js diff --git a/setup/wizard/resources/js/jquery.form.js b/setup/wizard/resources/js/jquery.form.js old mode 100755 new mode 100644 index 51225ea..51225ea --- a/setup/wizard/resources/js/jquery.form.js +++ b/setup/wizard/resources/js/jquery.form.js diff --git a/setup/wizard/resources/js/jquery.hotkeys.js b/setup/wizard/resources/js/jquery.hotkeys.js old mode 100755 new mode 100644 index 15f1ce4..15f1ce4 --- a/setup/wizard/resources/js/jquery.hotkeys.js +++ b/setup/wizard/resources/js/jquery.hotkeys.js diff --git a/setup/wizard/resources/js/jquery.js b/setup/wizard/resources/js/jquery.js old mode 100755 new mode 100644 index 462cde5..462cde5 --- a/setup/wizard/resources/js/jquery.js +++ b/setup/wizard/resources/js/jquery.js diff --git a/setup/wizard/resources/js/wizard.js b/setup/wizard/resources/js/wizard.js old mode 100755 new mode 100644 index 3809f30..3809f30 --- a/setup/wizard/resources/js/wizard.js +++ b/setup/wizard/resources/js/wizard.js diff --git a/setup/wizard/resources/license/license.txt b/setup/wizard/resources/license/license.txt old mode 100755 new mode 100644 index 870d62d..870d62d --- a/setup/wizard/resources/license/license.txt +++ b/setup/wizard/resources/license/license.txt diff --git a/setup/wizard/session.php b/setup/wizard/session.php old mode 100755 new mode 100644 index c7eecce..c7eecce --- a/setup/wizard/session.php +++ b/setup/wizard/session.php diff --git a/setup/wizard/step.php b/setup/wizard/step.php old mode 100755 new mode 100644 index ff0acd0..ff0acd0 --- a/setup/wizard/step.php +++ b/setup/wizard/step.php diff --git a/setup/wizard/stepAction.php b/setup/wizard/stepAction.php old mode 100755 new mode 100644 index 5fde474..5fde474 --- a/setup/wizard/stepAction.php +++ b/setup/wizard/stepAction.php diff --git a/setup/wizard/steps/complete.php b/setup/wizard/steps/complete.php old mode 100755 new mode 100644 index ac73aee..ac73aee --- a/setup/wizard/steps/complete.php +++ b/setup/wizard/steps/complete.php diff --git a/setup/wizard/steps/configuration.php b/setup/wizard/steps/configuration.php old mode 100755 new mode 100644 index 7786742..7786742 --- a/setup/wizard/steps/configuration.php +++ b/setup/wizard/steps/configuration.php diff --git a/setup/wizard/steps/database.php b/setup/wizard/steps/database.php old mode 100755 new mode 100644 index 8089fd1..8089fd1 --- a/setup/wizard/steps/database.php +++ b/setup/wizard/steps/database.php diff --git a/setup/wizard/steps/dependencies.php b/setup/wizard/steps/dependencies.php old mode 100755 new mode 100644 index 85c4f3d..85c4f3d --- a/setup/wizard/steps/dependencies.php +++ b/setup/wizard/steps/dependencies.php diff --git a/setup/wizard/steps/errors.php b/setup/wizard/steps/errors.php old mode 100755 new mode 100644 index 21ea5c6..21ea5c6 --- a/setup/wizard/steps/errors.php +++ b/setup/wizard/steps/errors.php diff --git a/setup/wizard/steps/install.php b/setup/wizard/steps/install.php old mode 100755 new mode 100644 index 76c4d9c..76c4d9c --- a/setup/wizard/steps/install.php +++ b/setup/wizard/steps/install.php diff --git a/setup/wizard/steps/installtype.php b/setup/wizard/steps/installtype.php old mode 100755 new mode 100644 index 6932613..6932613 --- a/setup/wizard/steps/installtype.php +++ b/setup/wizard/steps/installtype.php diff --git a/setup/wizard/steps/license.php b/setup/wizard/steps/license.php old mode 100755 new mode 100644 index ccc3ad5..ccc3ad5 --- a/setup/wizard/steps/license.php +++ b/setup/wizard/steps/license.php diff --git a/setup/wizard/steps/registration.php b/setup/wizard/steps/registration.php old mode 100755 new mode 100644 index dd883e9..dd883e9 --- a/setup/wizard/steps/registration.php +++ b/setup/wizard/steps/registration.php diff --git a/setup/wizard/steps/services.php b/setup/wizard/steps/services.php old mode 100755 new mode 100644 index 6f5d309..6f5d309 --- a/setup/wizard/steps/services.php +++ b/setup/wizard/steps/services.php diff --git a/setup/wizard/steps/welcome.php b/setup/wizard/steps/welcome.php old mode 100755 new mode 100644 index 9ec2a99..9ec2a99 --- a/setup/wizard/steps/welcome.php +++ b/setup/wizard/steps/welcome.php diff --git a/setup/wizard/template.php b/setup/wizard/template.php old mode 100755 new mode 100644 index 28d5c35..28d5c35 --- a/setup/wizard/template.php +++ b/setup/wizard/template.php diff --git a/setup/wizard/templates/complete.tpl b/setup/wizard/templates/complete.tpl old mode 100755 new mode 100644 index 611bf4b..dfe48f8 --- a/setup/wizard/templates/complete.tpl +++ b/setup/wizard/templates/complete.tpl @@ -136,7 +136,7 @@ Goto Database Upgrade - Goto Login + Goto Login