Update CHANGELOG regarding new options

ref #303

Signed-off-by: Jerome Jutteau <jerome@jutteau.fr>

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b0d9179db08b4af629cf36b40aece7b96075e3c..c7cb37f296a4f487dc4029f0e4f491ad90f35b42 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@
    * If you have installed Jirafeau just by uploading files on your server, you can download the desired version, overwrite/remove all files and chown/chmod files if needed. Keep a backup of your local configuration file tough.
 4. With you browser, go to your Jirafeau root page
 5. Follow the installation wizard, it should propose you the same data folder or even update automatically
    * If you have installed Jirafeau just by uploading files on your server, you can download the desired version, overwrite/remove all files and chown/chmod files if needed. Keep a backup of your local configuration file tough.
 4. With you browser, go to your Jirafeau root page
 5. Follow the installation wizard, it should propose you the same data folder or even update automatically

-6. Check your `/lib/config.local.php` and compare it with the `/lib/config.original.php` to see if new configuration items are available
+6. Check your `/lib/config.local.php` and compare it with the `/lib/config.original.php` to see if new configuration items are available. If a new item is missing in your `config.local.php`, this may trigger some errors as Jirafeau may expect to have them.

 
 
 # version 4.4.0
 
 
 # version 4.4.0


@@ -23,6 +23,9 @@
 - Typo and spelling mistakes
 - Upgrade from 4.3.0: in-place upgrade
 
 - Typo and spelling mistakes
 - Upgrade from 4.3.0: in-place upgrade
 

+New configuration items:
+- `fortnight` value in `availabilities` array (default to `true`)
+

 # version 4.3.0
 
 - Fix various docker errors
 # version 4.3.0
 
 - Fix various docker errors


@@ -32,6 +35,9 @@
 - Add option 'store_uploader_ip' to avoid uploaders ip logging
 - Upgrade from 4.2.0: in-place upgrade
 
 - Add option 'store_uploader_ip' to avoid uploaders ip logging
 - Upgrade from 4.2.0: in-place upgrade
 

+New configuration items:
+- `store_uploader_ip` (default to `true`)
+

 # version 4.2.0
 
 - New file_hash option to eventually speed-up file identification process
 # version 4.2.0
 
 - New file_hash option to eventually speed-up file identification process

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e032590f3c0c5804aeed8355feecd7535e4ad0a3..71c5b882b00f4bfe8c62b7802f153a7e858202c3 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -93,7 +93,7 @@ Quick walkthrough:
 * If the release is not done for security purposes: create a new issue and freeze next-release branch for at least week.
 * Compare the [»next-release« branch to »master«](https://gitlab.com/mojo42/Jirafeau/compare/master...next-release)
 * Add a list of noteworthy features and bugfixes to `CHANGELOG.md`
 * If the release is not done for security purposes: create a new issue and freeze next-release branch for at least week.
 * Compare the [»next-release« branch to »master«](https://gitlab.com/mojo42/Jirafeau/compare/master...next-release)
 * Add a list of noteworthy features and bugfixes to `CHANGELOG.md`

-* Add eventual upgrade procedure to `CHANGELOG.md`
+* Add eventual upgrade procedure to `CHANGELOG.md`. Make sure to list all new configuration items.

 * Build and test docker image
 * Change the version, using [semantic versioning](http://semver.org/), in ```settings.php```
 * Merge »next-release« branch to »master«
 * Build and test docker image
 * Change the version, using [semantic versioning](http://semver.org/), in ```settings.php```
 * Merge »next-release« branch to »master«