Merge remote-tracking branch 'origin/master'

diff --git a/README.md b/README.md
index f4c1ef472880bdb1ba2a96d4130bbb70f58b50e4..ea431eea7afbfc3688daefd0f58371a2eabbb0fa 100644 (file)
--- a/README.md
+++ b/README.md
@@ -192,4 +192,49 @@ So:
 
 ### How to contact someone from Jirafeau ?
 
-Feel free to create an issue if you found a bug.
\ No newline at end of file
+Feel free to create an issue if you found a bug.
+
+# Release notes
+
+## Version 1.0
+
+The very first version of Jirafeau after the fork of Jiraph.
+
+- Security fix
+- Keep uploader's ip
+- Delete link for each upload
+- No more clear text password storage
+- Simple langage support
+- Add an admin interface
+- New Design
+- Add term of use
+- New path system to manage large number of files 
+- New option to show a page at download time
+- Add option to activate or not preview mode
+
+## Version 1.1
+
+- New skins
+- Add optional server side encryption 
+- Unlimited file size upload using HTML5 file API
+- Show speed and estimated time during upload
+- A lot of fixes
+- A lot of new langages
+- Small API to upload files
+- Limit access to Jirafeau using IP, mask, passwords
+- Manage (some) proxy headers
+- Configure your maximal upload size
+- Configure file's lifetime durations
+- Preview URL
+- Get Jirafeau's version in admin interface
+
+### Update from 1.0 to 1.1
+
+1. Backup you Jirafeau installation
+2. Block access to Jirafeau
+3. Checkout new version using git tag 1.1
+4. With you browser, go to your Jirafeau root page
+5. Follow installation wizard, it should propose you the same data folder
+6. Add a rewrite rule in your web server configuration to rename file.php to f.php to make old url work again
+7. Go in you lib/config.local.php and lib/config.original.php to check new options and eventually change skin to 'courgette'
+

diff --git a/admin.php b/admin.php
index 49a2f8f77de01e61e0a735ebb0cb01162bdfbb7d..25b16ed94e7b7241a5f2d3fad77fc80e9d988ea7 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -128,6 +128,7 @@ if (!(isset ($_POST['action']) && strcmp ($_POST['action'], 'download') == 0))
 {
         require (JIRAFEAU_ROOT . 'lib/template/header.php');
         ?><h2><?php echo t('Admin interface'); ?></h2><?php
+        ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php
 
         ?><div id = "admin">
         <fieldset><legend><?php echo t('Actions');?></legend>

diff --git a/lib/settings.php b/lib/settings.php
index 000eb5ec079b67b0b78e2a81d7ca162f2bf2184b..dc36996dcca3e526b27d28d40ecfe2fb63bed460 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -19,7 +19,7 @@
 
 /* Jirafeau constants */
 define ('JIRAFEAU_PACKAGE', 'Jirafeau');
-define ('JIRAFEAU_VERSION', '1.0');
+define ('JIRAFEAU_VERSION', '1.1');
 
 /* Directories. */
 define ('VAR_FILES', $cfg['var_root'] . 'files/');