Jirafeau 4.7.0 is ready

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dcf19c2110968bcd993c9c28c09fb9017d380cd..40a62415d2a2af8f3cb2d598efb65eb258a6097d 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,14 +12,13 @@
 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. If a new item is missing in your `config.local.php`, this may trigger some errors as Jirafeau may expect to have them.
 
 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. 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.7.0 (not yet released)
+## Version 4.7.0

 
 - Added feature for using shortened download links. This requires a web server that supports URL rewriting, like Apache with `mod_rewrite`.
 - Added CSS class `tos` for addressing the link to the "Terms of Service" page
 - Download stats introduced in version 4.6.0 were accidentally removed in version 4.6.1. This feature is now available again.
 - Generated download passwords were not shown after the upload was completed
 - Uploading a file using `script.php` with an upload password set always ended up in an "Error 2". This is fixed now.
 
 - Added feature for using shortened download links. This requires a web server that supports URL rewriting, like Apache with `mod_rewrite`.
 - Added CSS class `tos` for addressing the link to the "Terms of Service" page
 - Download stats introduced in version 4.6.0 were accidentally removed in version 4.6.1. This feature is now available again.
 - Generated download passwords were not shown after the upload was completed
 - Uploading a file using `script.php` with an upload password set always ended up in an "Error 2". This is fixed now.

-- ...

 - Upgrade from 4.6.3: in-place upgrade
 
 New configuration items:
 - Upgrade from 4.6.3: in-place upgrade
 
 New configuration items:

diff --git a/lib/settings.php b/lib/settings.php
index cbdfaff47097ab6dc6d59c09ab5654e09d3bcf9c..5e8a13e9d6bb83de7cf3bbba23af6b8ef710984b 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -43,7 +43,7 @@ if ($cfg['debug'] === true) {
 
 /* Jirafeau package */
 define('JIRAFEAU_PACKAGE', 'Jirafeau');
 
 /* Jirafeau package */
 define('JIRAFEAU_PACKAGE', 'Jirafeau');

-define('JIRAFEAU_VERSION', '4.6.x-dev');
+define('JIRAFEAU_VERSION', '4.7.0');

 
 define('JIRAFEAU_WEBSITE', 'https://gitlab.com/jirafeau/Jirafeau');
 
 
 define('JIRAFEAU_WEBSITE', 'https://gitlab.com/jirafeau/Jirafeau');