Merge pull request #243 from fledge-iot/synch_main_to_develop_2.1.0

Synch main to develop
fledge-iot · Jan 6, 2023 · f8f0264 · f8f0264
2 parents 1820991 + 0422dde
commit f8f0264
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/deploy b/deploy
@@ -21,7 +21,7 @@
 
 set -e
 
-__version__="2.0.1"
+__version__="2.1.0"
 if [ -f "package.json" ];
   then
 	__version__=`cat package.json | grep version | head -1 | awk -F: '{ print $2 }' | sed 's/[" ,]//g'`

diff --git a/deploy-rh b/deploy-rh
@@ -21,7 +21,7 @@
 
 set -e
 
-__version__="2.0.1"
+__version__="2.1.0"
 if [ -f "package.json" ];
   then
 	__version__=`cat package.json | grep version | head -1 | awk -F: '{ print $2 }' | sed 's/[" ,]//g'`

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,16 +1,19 @@
-## Unreleased [202x-xx-xx]
+## v2.1.0 [2022-12-26]
 
 #### Added
 
--
+- [FOGL-7108] Role based access for view & data_view role users [#231](https://github.com/fledge-iot/fledge-gui/pull/231)
+- [FOGL-7126] South and North instances's details modal configuration grouping based on group key [#234](https://github.com/fledge-iot/fledge-gui/pull/234)
+
 
 #### Changed
 
 - [FOGL-7049] Timestamps with YYYY-MM-DD for tabular data, latest reading and datapoint hover for assets & readings graphs [#217](https://github.com/fledge-iot/fledge-gui/pull/217)
+- [FOGL-7193] Show assets collapsed by default on Southbound services page [#232](https://github.com/fledge-iot/fledge-gui/pull/232)
 
 #### Fixed
 
--
+- [FOGL-7065] Fixed add & update user for Administrator role [#227](https://github.com/fledge-iot/fledge-gui/pull/227)
 
 #### Others
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fledge",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "doc_url": "https://fledge-iot.readthedocs.io/en/",
   "scripts": {