Merge branch 'master' of https://github.com/monarc-project/MonarcAppFO

CHANGELOG.md

@@ -1,6 +1,26 @@
 MONARC Changelog
 ================
 
+
+## 2.11.0 (2021-09-02)
+
+### New
+
+- Having the possibility to define custom scales for operational risks
+  ([#353](https://github.com/monarc-project/MonarcAppFO/issues/353));
+- introduction of the risk context and the risk owner
+  ([#21](https://github.com/monarc-project/MonarcAppFO/issues/21)),
+  ([#186](https://github.com/monarc-project/MonarcAppFO/issues/186));
+
+
+### Fix
+
+- update-all.sh: Could not read from remote repository
+  ([#365](https://github.com/monarc-project/MonarcAppFO/issues/365));
+- Some files in script do not have the correct permissions
+  ([#364](https://github.com/monarc-project/MonarcAppFO/issues/364)).
+
+
 ## 2.10.4 (2021-06-24) Includes bug-fixes.
 
 ### Fix

VERSION.json

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

composer.json

@@ -45,7 +45,7 @@
         "ext-json": "*",
         "ext-pdo": "*",
         "ext-bcmath": "*",
-        "monarc/frontoffice": "dev-feature/353 as 2.10.3",
+        "monarc/frontoffice": "^2.10.3",
         "monarc/core": "^2.10.3",
         "laminas/laminas-mvc": "^3.1",
         "laminas/laminas-di": "^3.1",

package.json

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