Merge branches 'master' and 'feature/353' of https://github.com/monarc-project/MonarcAppFO into feature/353

CHANGELOG.md

@@ -1,6 +1,18 @@
 MONARC Changelog
 ================
 
+## 2.10.4 (2021-06-24) Includes bug-fixes.
+
+### Fix
+
+- Foreign Key Error by when deactivating information security risks.
+  ([#358](https://github.com/monarc-project/MonarcAppFO/issues/358))
+- Dashboard cartography error for risk lists.
+  ([#359](https://github.com/monarc-project/MonarcAppFO/issues/359))
+- [FrontOffice] Snapshots creation error.
+  ([#362](https://github.com/monarc-project/MonarcAppFO/issues/362))
+
+
 ## 2.10.3 (2021-05-12) Includes bug-fixes, new features and an enhancement.  
 
 ### New

VERSION.json

@@ -1 +1 @@
-{"major":2, "minor":10, "hotfix":3}
+{"major":2, "minor":10, "hotfix":4}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "MONARC",
-  "version": "2.10.3",
+  "version": "2.10.4",
   "description": "Monarc front office application",
   "private": true,
   "repository": {

scripts/check_composer.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/bin/bash
 
 RED='\033[0;31m'
 GREEN='\033[0;32m'
@@ -34,16 +34,12 @@ vercomp () {
 composer_version_string=`composer --version`
 composer_version=`echo $composer_version_string | awk 'BEGIN { FS="[ ]" } ; { print $3 }'`
 
-if [[ $(vercomp $composer_version 1.9.0 ; echo $?) -eq 0 ]]; then
+if [[ $(vercomp $composer_version 2.1.0 ; echo $?) -eq 0 ]]; then
-    echo -e "${RED}Please update your version of composer.${NC} The minimum requirements is 1.9.0."
+    echo -e "${RED}Please update your version of composer.${NC} The minimum requirements is 2.1.0."
-    echo -e "The minimum requirement is 1.9.0. You can use the following to update your composer installation:"
+    echo -e "You can run 'composer self-update' command or follow the link with the installation details:"
 
     cat << EOF
-
+https://getcomposer.org/download/
-  $ php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-  $ php -r "if (hash_file('sha384', 'composer-setup.php') === 'e0012edf3e80b6978849f5eff0d4b4e4c79ff1609dd1e613307e16318854d24ae64f26d17af3ef0bf7cfb710ca74755a') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
-  $ php composer-setup.php --install-dir=/tmp --filename=composer
-  $ mv /tmp/composer /usr/local/bin/composer
 EOF
 
     exit 1

scripts/update_config_variables.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/bin/bash
 
 conf_file='./config/autoload/local.php'
 if [ -f "$conf_file" ]; then