Merge branch 'master' into fix/#4267-add-visited-on-most-days-query

Flowminder · Oct 27, 2021 · 635ccaf · 635ccaf
2 parents 6ccb93c + b30f16d
commit 635ccaf
Show file tree

Hide file tree

Showing 5 changed files with 120 additions and 720 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - Harmonised FlowAPI parameter names for start and end dates. They are now all `start_date` and `end_date`
 - Further improvements to token display in FlowAuth. [#1124](https://github.com/Flowminder/FlowKit/issues/1124)
+- Increased the FlowDB quickstart container's timeout to 15 minutes. [#782](https://github.com/Flowminder/FlowKit/issues/782)
 
 ### Fixed
 - Autoflow's prefect version is now current. [#2544](https://github.com/Flowminder/FlowKit/issues/2544)

diff --git a/flowauth/frontend/package-lock.json b/flowauth/frontend/package-lock.json
diff --git a/flowauth/frontend/package.json b/flowauth/frontend/package.json
@@ -30,7 +30,7 @@
   "devDependencies": {
     "cypress": "^8.6.0",
     "cypress-plugin-retries": "^1.5.2",
-    "husky": "^7.0.2",
+    "husky": "^7.0.4",
     "otp-cli": "^0.2.0",
     "prettier": "^2.4.1",
     "pretty-quick": "^3.1.1"