From 6d1e313788e5c7f7449616faf587a6215a381c95 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Fri, 12 Jul 2013 10:23:45 +0200 Subject: Update Changelog and Upgrading instructions --- CHANGELOG | 2 ++ UPGRADING | 14 +++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8dc8d4b0f..5d0ee97b5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ CHANGELOG Roundcube Webmail =========================== +- Simplified configuration by merging it into one file + defaults (#1487311) +- Make message list header stay on top when scrolling (#1295420) - Fix bug where signature wasn't changed on identity selection when editing a draft (#1489229) - Fix IMAP SETMETADATA parameters quoting (#1489231) - Add support for 'enchant' spellcheck engine diff --git a/UPGRADING b/UPGRADING index 4ac0ca3b5..86ddde620 100644 --- a/UPGRADING +++ b/UPGRADING @@ -32,19 +32,23 @@ it on a unix system, you need to do the following operations by hand: - ./bin/ - ./SQL/ - ./program/ -2. rsync the contents of the following folders from your installation + - ./installer/ +2. Replace the configuration defaults files: + - config/defaults.inc.php + - config/mimetypes.php +3. rsync the contents of the following folders from your installation directory into the target folder: ./skins/ ./plugins/ -3. Run ./bin/update.sh from the commandline OR +4. Run ./bin/update.sh from the commandline OR open http://url-to-roundcube/installer/ in a browser and choose "3 Test config". To enable the latter one, you have to temporary set 'enable_installer' to true in your local config/config.inc.php file. WARNING: See SQLite database upgrade below. -4. Let the update script/installer check your configuration and +5. Let the update script/installer check your configuration and update your config files and database schema as suggested by the updater. -5. Make sure 'enable_installer' is set to false again. -6. See Post-Upgrade Activities section. +6. Make sure 'enable_installer' is set to false again. +7. See Post-Upgrade Activities section. Post-Upgrade Activities -- cgit v1.2.3