Skip to content

Commit

Permalink
Merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
@amickan
amickan committed Dec 6, 2024
2 parents 40156db + 18b50ce commit b2060b9
Show file tree
Hide file tree
Showing 68 changed files with 21,437 additions and 18,055 deletions.
284 changes: 6 additions & 278 deletions amass.lock
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lock_version": "1.0",
"content_hash": "sha256:05362dd42a39941270e366ce0673eda17e4848e72943e01d624bd6a84be87497",
"content_hash": "sha256:0a7943db0d3b15f7feaa43639b886c458726c259b578c501c832af80c1c46d34",
"dependencies": [
{
"name": "@github/markdown-toolbar-element",
Expand Down Expand Up @@ -430,54 +430,6 @@
],
"maps": []
},
{
"name": "cornerstone-core",
"version": "2.2.4",
"provider": "unpkg",
"assets": [
{
"name": "dist/cornerstone.js",
"sri": "sha384-V9P/aL0q9pHtJ5T6nu+lMhECpty2o5AHEDsqq5ByENSdmSVczBubXTeqWusnVfQ8"
},
{
"name": "dist/cornerstone.js.map",
"sri": "sha384-1vkwCAGusYzE592znPE8lVIZQAPV/7DF6JckMwbfg6pXgMDch/7EKUj4Vz6BT699"
},
{
"name": "dist/cornerstone.min.js",
"sri": "sha384-axIAanIpsk+TbLbn7RXaEMJEsc0w/DJg4nIxSU87gwHTbYiGiAqm0UEkXMfO3+xV"
},
{
"name": "dist/cornerstone.min.js.map",
"sri": "sha384-7j+1ToNLmDfbvDDhe8Xj6QrLI7jx/RISJuwhPaYebm4tk8b99+3pDprBADX+KkYe"
}
],
"maps": []
},
{
"name": "cornerstone-math",
"version": "0.1.6",
"provider": "unpkg",
"assets": [
{
"name": "dist/cornerstoneMath.js",
"sri": "sha384-t6p6Opmh59HFuC9TXYcExw8Y9+ktPG19qZbANsHnyykXOEwQBDcocYRU3xv85e+7"
},
{
"name": "dist/cornerstoneMath.js.map",
"sri": "sha384-1hXv23Bk4Wof0LUgtFqI/ae3HZE66aoLAVXgSM9ou3jp78g+v+7J9VkKyiPF3ODv"
},
{
"name": "dist/cornerstoneMath.min.js",
"sri": "sha384-b8DtrZnVyBc7YpJXY9bYyIw5wSFgxX2VlFYmGX9z0laMaBQRRWVH6BCxKhV8ETfz"
},
{
"name": "dist/cornerstoneMath.min.js.map",
"sri": "sha384-lFVUKZBwft7C7BClSfHzU//h02ySP98vJTy/KlcEgieEx8IE3AD53GO1GLoRl+7g"
}
],
"maps": []
},
{
"name": "datatables.net",
"version": "1.11.3",
Expand Down Expand Up @@ -718,34 +670,6 @@
],
"maps": []
},
{
"name": "itk-vtk-viewer",
"version": "11.11.2",
"provider": "unpkg",
"assets": [
{
"name": "dist/itkVtkViewerCDN.js",
"sri": "sha384-LTeflmm51FBGPPQClZZuYQKlisKD6AINeDUXFQxyoY0UsU/acHZnhG99cV4bjIvX"
}
],
"maps": []
},
{
"name": "itk-wasm",
"version": "1.0.0-a.10",
"provider": "unpkg",
"assets": [
{
"name": "dist/umd/itk-wasm.js",
"sri": "sha384-f2/1X/J50zy+SOILsk/35q8j6EJMHjfhJSyEevmMi1vMz7bKr9EOJh8cKTKV2Oqn"
},
{
"name": "dist/umd/itk-wasm.min.js",
"sri": "sha384-g5R6BnQF/3Ypnj8/lpb91MkaPdBIBbl/lZJzTWFPKVuUmPofyszDh4X8rk8XcPi3"
}
],
"maps": []
},
{
"name": "jquery",
"version": "3.7.0",
Expand Down Expand Up @@ -784,7 +708,7 @@
},
{
"name": "jsoneditor",
"version": "9.5.2",
"version": "10.1.1",
"provider": "cdnjs",
"assets": [
{
Expand All @@ -793,19 +717,19 @@
},
{
"name": "jsoneditor.css",
"sri": "sha512-7BNBvfwEnG/+oK7PTxRr4I5f7SQQjYdnGjLe1F4kjNU9m4sXSOxcld4x2NRtgYiYkO+ltKQ1foU5Eau7kSnkVA=="
"sri": "sha512-iOFdnlwX6UGb55bU5DL0tjWkS/+9jxRxw2KiRzyHMZARASUSwm0nEXBcdqsYni+t3UKJSK7vrwvlL8792/UMjQ=="
},
{
"name": "jsoneditor.js",
"sri": "sha512-L0Ev5uNLTNswQjWgk65iN2z2q5TvDwe3qf5YYLROgs/SrVNfhqs6nwpfo+RXJ/+QM9bh/Acd7x03XvogdX5XFQ=="
"sri": "sha512-HePx5/4V5aGOlhxKK/l2O80+a/aHOOxzMIl/SiuPOGfBcbuLDhFwTI1WKk5CijlbvsJuHosMCZNGWik0gE7enw=="
},
{
"name": "jsoneditor.min.css",
"sri": "sha512-oEH5lcAN+ZIIBvRXjo3cI689oL9c7HGoLxEkPnzRskQ8lSkKh2aZ/wd6rx//5+dI1eY20mPQPQTEx69UuHBu3Q=="
"sri": "sha512-8G+Vb2+10BSrSo+wupdzJIylDLpGtEYniQhp0rsbTigPG7Onn2S08Ai/KEGlxN2Ncx9fGqVHtRehMuOjPb9f8g=="
},
{
"name": "jsoneditor.min.js",
"sri": "sha512-sWWNHrucAGzw6+kdky+SP1jIqkzY+bYzZRFn6H0aRw/jyaBKvj4A8hvze0bhSplOtAzY1YZyar8KrK8lDRtUdQ=="
"sri": "sha512-ZZTYi+tU/p2AEQSfuloqzXrZZiPkgPrXF1Pcj4OVAm4rsUnUPGme+gga6eAMbzKu+gPa1uciaOVIcxCGIsuLEQ=="
}
],
"maps": [
Expand All @@ -828,190 +752,6 @@
],
"maps": []
},
{
"name": "openseadragon",
"version": "2.4.1",
"provider": "cdnjs",
"assets": [
{
"name": "images/button_grouphover.png",
"sri": null
},
{
"name": "images/button_hover.png",
"sri": null
},
{
"name": "images/button_pressed.png",
"sri": null
},
{
"name": "images/button_rest.png",
"sri": null
},
{
"name": "images/flip_grouphover.png",
"sri": null
},
{
"name": "images/flip_hover.png",
"sri": null
},
{
"name": "images/flip_pressed.png",
"sri": null
},
{
"name": "images/flip_rest.png",
"sri": null
},
{
"name": "images/fullpage_grouphover.png",
"sri": null
},
{
"name": "images/fullpage_hover.png",
"sri": null
},
{
"name": "images/fullpage_pressed.png",
"sri": null
},
{
"name": "images/fullpage_rest.png",
"sri": null
},
{
"name": "images/home_grouphover.png",
"sri": null
},
{
"name": "images/home_hover.png",
"sri": null
},
{
"name": "images/home_pressed.png",
"sri": null
},
{
"name": "images/home_rest.png",
"sri": null
},
{
"name": "images/next_grouphover.png",
"sri": null
},
{
"name": "images/next_hover.png",
"sri": null
},
{
"name": "images/next_pressed.png",
"sri": null
},
{
"name": "images/next_rest.png",
"sri": null
},
{
"name": "images/previous_grouphover.png",
"sri": null
},
{
"name": "images/previous_hover.png",
"sri": null
},
{
"name": "images/previous_pressed.png",
"sri": null
},
{
"name": "images/previous_rest.png",
"sri": null
},
{
"name": "images/rotateleft_grouphover.png",
"sri": null
},
{
"name": "images/rotateleft_hover.png",
"sri": null
},
{
"name": "images/rotateleft_pressed.png",
"sri": null
},
{
"name": "images/rotateleft_rest.png",
"sri": null
},
{
"name": "images/rotateright_grouphover.png",
"sri": null
},
{
"name": "images/rotateright_hover.png",
"sri": null
},
{
"name": "images/rotateright_pressed.png",
"sri": null
},
{
"name": "images/rotateright_rest.png",
"sri": null
},
{
"name": "images/zoomin_grouphover.png",
"sri": null
},
{
"name": "images/zoomin_hover.png",
"sri": null
},
{
"name": "images/zoomin_pressed.png",
"sri": null
},
{
"name": "images/zoomin_rest.png",
"sri": null
},
{
"name": "images/zoomout_grouphover.png",
"sri": null
},
{
"name": "images/zoomout_hover.png",
"sri": null
},
{
"name": "images/zoomout_pressed.png",
"sri": null
},
{
"name": "images/zoomout_rest.png",
"sri": null
},
{
"name": "openseadragon.js",
"sri": "sha512-wLveiqffVDS+4JWoWKHUFKCw2zUjqsG8dHN8Q72zgGWTed/fLP4NePfxQ3nw1Ewe3hd7mvUIjO3owmLWvZyf2Q=="
},
{
"name": "openseadragon.js.map",
"sri": null
},
{
"name": "openseadragon.min.js",
"sri": "sha512-ydnIgG69uS1sVDFa1ki6qvOVkc47BmyW3RGoMwn9jATwDIFdIZ8Yuoy/w3IQEv8xzUwqFPs/yNoD2bSaQTGXYg=="
},
{
"name": "openseadragon.min.js.map",
"sri": null
}
],
"maps": []
},
{
"name": "sentry-browser",
"version": "6.19.7",
Expand Down Expand Up @@ -1130,18 +870,6 @@
}
],
"maps": []
},
{
"name": "world-atlas",
"version": "2.0.2",
"provider": "unpkg",
"assets": [
{
"name": "countries-110m.json",
"sri": "sha384-yOCJ+8ShBm8UDqtAVtAvxTDDf4gXo5edxl/YG0FmVC5OTmqVLl7utuVGBDEeZWHf"
}
],
"maps": []
}
]
}
11 changes: 11 additions & 0 deletions app/config/settings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@
# Use AutoField for backwards compatibility
DEFAULT_AUTO_FIELD = "django.db.models.AutoField"

DOCUMENTATION_HELP_VIEWER_CONTENT_SLUG = os.environ.get(
"DOCUMENTATION_HELP_VIEWER_CONTENT_SLUG", "viewer-content"
)

# General forum
DOCUMENTATION_HELP_FORUM_PK = os.environ.get(
"DOCUMENTATION_HELP_FORUM_PK", "1"
Expand All @@ -127,6 +131,10 @@
"DOCUMENTATION_HELP_FORUM_SLUG", "general"
)

DOCUMENTATION_HELP_INTERFACES_SLUG = os.environ.get(
"DOCUMENTATION_HELP_INTERFACES_SLUG", "interfaces"
)

# About Flatpage
FLATPAGE_ABOUT_URL = os.environ.get("FLATPAGE_ABOUT_URL", "/about/")

Expand Down Expand Up @@ -1095,6 +1103,9 @@ def sentry_before_send(event, hint):
)
COMPONENTS_CONTAINER_PLATFORM = "linux/amd64"

COMPONENTS_VIRTUAL_ENV_BIOM_LOCATION = os.environ.get(
"COMPONENTS_VIRTUAL_ENV_BIOM_LOCATION", "/opt/virtualenvs/biom"
)
# Set which template pack to use for forms
CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap4"
CRISPY_TEMPLATE_PACK = "bootstrap4"
Expand Down
Loading

0 comments on commit b2060b9

Please sign in to comment.