From 87cf0a3fb158b5ffaa54a79997d7b01492d39b74 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 22 May 2016 02:19:27 -0400
Subject: [PATCH] Use minified publickey.js (with cache-buster) when available (#5254)

---
 UPGRADING |   42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/UPGRADING b/UPGRADING
index 7df82b0..fe0ad4d 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -19,7 +19,8 @@
 target location and check and update the configuration and database schema.
 After all is done, the temporary folder with the new Roundcube files can be 
 removed again.
-See Post-Upgrade Activities section.
+
+WARNING: See Post-Upgrade Activities section below.
 
 
 Updating manually
@@ -32,16 +33,32 @@
    - ./SQL/
    - ./program/
    - ./installer/
-   - ./skins/default/
-   - ./plugins/
-2. Run ./bin/update.sh from the commandline OR
+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/
+   ./vendor/
+4a. If you previously installed plugins through composer, update dependencies
+   by running `php composer.phar update --no-dev`
+4b. Install/update dependencies using composer:
+   - get composer from https://getcomposer.org/download/
+   - rename the composer.json-dist file into composer.json
+   - if you want to use LDAP address books, enable the LDAP libraries in your
+     composer.json file by moving the items from "suggest" to the "require"
+     section (remove the explanation texts after the version!).
+   - run `php composer.phar install --no-dev`
+5. 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/main.inc.php file.
-3. Let the update script/installer check your configuration and
+   to true in your local config/config.inc.php file.
+   WARNING: See SQLite database upgrade below.
+6. Let the update script/installer check your configuration and
    update your config files and database schema as suggested by the updater.
-4. Make sure 'enable_installer' is set to false again.
-5. See Post-Upgrade Activities section.
+7. Make sure 'enable_installer' is set to false again.
+8. See Post-Upgrade Activities section.
 
 
 Post-Upgrade Activities
@@ -51,3 +68,12 @@
 3. When upgrading from version older than 0.6-beta you should make sure
    your folder settings contain namespace prefix. For example Courier users
    should add INBOX. prefix to folder names in main configuration file.
+4. Check system requirements in INSTALL file.
+
+SQLite database upgrade
+-----------------------
+Versions older than 0.9 were supporting SQLite v2 only. Newer versions require
+database in v3 format. The best what you can do is to convert database file
+to the new format using command line tools:
+
+sqlite OLD.DB .dump | sqlite3 NEW.DB

--
Gitblit v1.9.1