Jirafeau version 3.4.1

Signed-off-by: Jerome Jutteau <mojo@couak.net>

diff --git a/README.md b/README.md
index 7054f5ae0783603ffda4f86740b0612f1b2d7ede..2aa7c4fb40af1293a7112e6d44366fed0d8fa37e 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,13 +1,3 @@
-# SECURITY ANNOUNCEMENT
-
-## 3th Mai 2018
-
-Multiple security vulnerabilities has been reported by [Bishopfox team](https://www.bishopfox.com/) on Jirafeau project.
-
-The next release of Jirafeau (3.4.1) will include security fixes and is planned 12th Mai 2018.
-
-Upgrading Jirafeau is recommended.
-

 # Jirafeau
 
 Welcome to the official Jirafeau project, an [Open-Source software](https://en.wikipedia.org/wiki/Open-source_software).
 # Jirafeau
 
 Welcome to the official Jirafeau project, an [Open-Source software](https://en.wikipedia.org/wiki/Open-source_software).


@@ -108,7 +98,7 @@ Installation steps:
 1. The "Terms of Service" text file changed
    * To reuse previous changes to the ToS, move the old ```/tos_text.php``` file to ```/lib/tos.local.txt``` and remove all HTML und PHP Tags, leaving a regular text file
 
 1. The "Terms of Service" text file changed
    * To reuse previous changes to the ToS, move the old ```/tos_text.php``` file to ```/lib/tos.local.txt``` and remove all HTML und PHP Tags, leaving a regular text file
 

-### from version 2.0.0 to 3.4.0
+### from version 2.0.0 to 3.4.1

 
 There is nothing special to do to update from/to the following versions:
 - 2.0.0 -> 3.0.0
 
 There is nothing special to do to update from/to the following versions:
 - 2.0.0 -> 3.0.0


@@ -117,6 +107,7 @@ There is nothing special to do to update from/to the following versions:
 - 3.2.0 -> 3.2.1
 - 3.2.1 -> 3.3.0
 - 3.3.0 -> 3.4.0
 - 3.2.0 -> 3.2.1
 - 3.2.1 -> 3.3.0
 - 3.3.0 -> 3.4.0

+- 3.4.0 -> 3.4.1

 
 ### Troubleshooting
 
 
 ### Troubleshooting
 


@@ -179,13 +170,13 @@ GNU Affero General Public License v3 (AGPL-3.0).
 
 The GNU Affero General Public License can be found at https://www.gnu.org/licenses/agpl.html.
 
 
 The GNU Affero General Public License can be found at https://www.gnu.org/licenses/agpl.html.
 

-Please note: If you decide do make adaptions to the source code and run a service with these changes incorporated, 
+Please note: If you decide do make adaptions to the source code and run a service with these changes incorporated,

 you are required to provide a link to the source code of your version in order to obey the AGPL-3.0 license.
 To do so please add a link to the source (eg. a public Git repository or a download link) to the Terms of Service page.
 Take a look at the FAQ to find out about how to change the ToS.
 
 PS: If you have fixed errors or added features, then please contribute to the project and send a merge request with these changes.
 you are required to provide a link to the source code of your version in order to obey the AGPL-3.0 license.
 To do so please add a link to the source (eg. a public Git repository or a download link) to the Terms of Service page.
 Take a look at the FAQ to find out about how to change the ToS.
 
 PS: If you have fixed errors or added features, then please contribute to the project and send a merge request with these changes.

- 
+

 ## Contribution
 
 If you want to contribute to project, then take a look at the git repository:
 ## Contribution
 
 If you want to contribute to project, then take a look at the git repository:


@@ -432,3 +423,11 @@ The very first version of Jirafeau after the fork of Jyraphe.
 - Removed installation step asking for language
 - Merged weblate contributions
 - Fixed some spelling issues
 - Removed installation step asking for language
 - Merged weblate contributions
 - Fixed some spelling issues

+
+## Version 3.4.1
+
+- Security fixes, thanks [Bishopfox Team](https://www.bishopfox.com/)
+- Translation fixes
+- Docker fix
+- Advertise javascript license for LibreJS compatibility
+- other minor fixes

diff --git a/lib/settings.php b/lib/settings.php
index 20a035b73a488fbf7d2585666b81e9bb86765947..48fbd40d108e7c77a40ee13c89294ecd5a3d9d1d 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -33,7 +33,7 @@ if (file_exists(JIRAFEAU_ROOT . 'lib/config.local.php')) {
 
 /* Jirafeau package */
 define('JIRAFEAU_PACKAGE', 'Jirafeau');
 
 /* Jirafeau package */
 define('JIRAFEAU_PACKAGE', 'Jirafeau');

-define('JIRAFEAU_VERSION', '3.4.0');
+define('JIRAFEAU_VERSION', '3.4.1');

 
 /* Directories. */
 define('VAR_FILES', $cfg['var_root'] . 'files/');
 
 /* Directories. */
 define('VAR_FILES', $cfg['var_root'] . 'files/');