Merge branch 'dev' into 'master'

Dev See merge request turris/reforis/foris-js!164
Merge branch 'bump-5113' into 'dev'
2025-06-15 13:36:35 +02:00 · 2021-06-30 12:34:05 +00:00 · 2021-06-30 11:56:44 +00:00 · 2021-06-30 10:51:03 +02:00 · 2021-06-30 10:45:30 +02:00 · 2021-06-30 08:41:09 +00:00
3 changed files with 933 additions and 582 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "foris",
-    "version": "5.1.12",
+    "version": "5.1.13",
    "description": "Set of components and utils for Foris and its plugins.",
    "author": "CZ.NIC, z.s.p.o.",
    "repository": {
@ -53,7 +53,7 @@
        "react": "16.9.0",
        "react-dom": "16.9.0",
        "react-router-dom": "^5.1.2",
-        "react-styleguidist": "^11.1.5",
+        "react-styleguidist": "^11.1.7",
        "snapshot-diff": "^0.7.0",
        "style-loader": "^1.2.1",
        "webpack": "^5.15.0"
--- a/src/utils/forisUrls.js
+++ b/src/utils/forisUrls.js
@ -21,7 +21,9 @@ export const ForisURLs = {
        packages: `${REFORIS_URL_PREFIX}/package-management/packages`,
    },

+    // Plugins
    storage: `${REFORIS_URL_PREFIX}/storage`,
+    sentinelAgreement: `${REFORIS_URL_PREFIX}/sentinel/agreement`,

    // Notifications links are used with <Link/> inside Router, thus url subdir is not required.
    overview: "/overview",
Author	SHA1	Message	Date
Aleksandr Gumroian	c35a4a8236	Merge branch 'dev' into 'master' Dev See merge request turris/reforis/foris-js!164	2021-06-30 12:34:05 +00:00
Aleksandr Gumroian	67b8386cd0	Merge branch 'bump-5113' into 'dev' Bump v5.1.13 See merge request turris/reforis/foris-js!163	2021-06-30 11:56:44 +00:00
Aleksandr Gumroian	f67edc39e1	Bump v5.1.13 * Add sentinelAgreement endpoint to forisUrls * NPM audit fix	2021-06-30 10:51:03 +02:00
Aleksandr Gumroian	6f0f344eb4	NPM audit fix	2021-06-30 10:45:30 +02:00
Aleksandr Gumroian	3a39e44c34	Merge branch 'add-data-collection-endpoint' into 'dev' Add sentinelAgreement endpoint to forisUrls See merge request turris/reforis/foris-js!162	2021-06-30 08:41:09 +00:00
Aleksandr Gumroian	cff5f1e5e1	Add sentinelAgreement endpoint to forisUrls	2021-06-29 17:39:53 +02:00