Merge branch 'master' into develop

OasisLMF · Nov 14, 2023 · 6051927 · 6051927
2 parents 3b242b0 + d1b3ef8
commit 6051927
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -220,7 +220,7 @@ jobs:
 
   # --- Notify Slack --- #
   slack:
-    uses: OasisLMF/OasisLMF/.github/workflows/notify.yml@master
+    uses: OasisLMF/OasisLMF/.github/workflows/notify.yml@main
     secrets: inherit
     needs: release
     with:

diff --git a/BFE_RShiny/oasisui/DESCRIPTION b/BFE_RShiny/oasisui/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: oasisui
-Version: 1.11.6
+Version: 1.11.7
 License: BSD_3_clause + file LICENSE
 Title: Oasis User Interface
 Description: This package provides an extensible implementation of a user

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,13 @@
 OasisUI Changelog
 ==================
 
+`1.11.7`_
+ ---------
+* [#310](https://github.com/OasisLMF/OasisUI/pull/310) - fix for https://github.com/OasisLMF/OasisUI/issues/309
+* [#307, #308](https://github.com/OasisLMF/OasisUI/pull/312) - Feature/308 plus 307 improvements
+* [#313](https://github.com/OasisLMF/OasisUI/pull/313) - Fixed Trivy CVE scanning
+.. _`1.11.7`:  https://github.com/OasisLMF/OasisUI/compare/1.11.6...1.11.7
+
 `1.11.6`_
  ---------
 * [#292, #299, #277, #280, #282](https://github.com/OasisLMF/OasisUI/pull/305) - Feature/various bugfixes