Merge branch 'DefectDojo:master' into master

blakeaowens · Dec 19, 2024 · 4d28821 · 4d28821
2 parents 1dc8075 + f1d6d02
commit 4d28821
Show file tree

Hide file tree

Showing 256 changed files with 1,347 additions and 2,198 deletions.
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -51,7 +51,7 @@ exclude-labels:
 
 change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
 template: |
-  Please consult the [Upgrade notes in the documentation ](https://documentation.defectdojo.com/getting_started/upgrading/) for specific instructions for this release, and general upgrade instructions. Below is an automatically generated list of all PRs merged since the previous release.
+  Please consult the [Upgrade notes in the documentation ](https://docs.defectdojo.com/en/open_source/upgrading/upgrading_guide/) for specific instructions for this release, and general upgrade instructions. Below is an automatically generated list of all PRs merged since the previous release.
 
   ## Changes since $PREVIOUS_TAG
   $CHANGES

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -5,8 +5,6 @@ on:
   push:
     branches:
       - master
-      - dev
-      - bugfix
 
 # Taken from https://github.com/marketplace/actions/hugo-setup#%EF%B8%8F-workflow-for-autoprefixer-and-postcss-cli
 # Both builds have to be one worflow as otherwise one publish will overwrite the other

diff --git a/.github/workflows/release-3-master-into-dev.yml b/.github/workflows/release-3-master-into-dev.yml
@@ -50,15 +50,11 @@ jobs:
           CURRENT_CHART_VERSION=$(grep -oP 'version: (\K\S*)?' helm/defectdojo/Chart.yaml | head -1)
           sed -ri "0,/version/s/version: \S+/$(echo "version: $CURRENT_CHART_VERSION" | awk -F. -v OFS=. 'NF==1{print ++$NF}; NF>1{$NF=sprintf("%0*d", length($NF), ($NF+1)); print}')-dev/" helm/defectdojo/Chart.yaml
       
-      - name: Update settings SHA
-        run: sha256sum dojo/settings/settings.dist.py | cut -d ' ' -f1 > dojo/settings/.settings.dist.py.sha256sum
-
       - name: Check numbers
         run: |
           grep version dojo/__init__.py
           grep appVersion helm/defectdojo/Chart.yaml
           grep version components/package.json
-          cat dojo/settings/.settings.dist.py.sha256sum
 
       - name: Create upgrade notes to documentation
         run: |
@@ -136,15 +132,11 @@ jobs:
           CURRENT_CHART_VERSION=$(grep -oP 'version: (\K\S*)?' helm/defectdojo/Chart.yaml | head -1)
           sed -ri "0,/version/s/version: \S+/$(echo "version: $CURRENT_CHART_VERSION" | awk -F. -v OFS=. 'NF==1{print ++$NF}; NF>1{$NF=sprintf("%0*d", length($NF), ($NF+1)); print}')-dev/" helm/defectdojo/Chart.yaml
       
-      - name: Update settings SHA
-        run: sha256sum dojo/settings/settings.dist.py | cut -d ' ' -f1 > dojo/settings/.settings.dist.py.sha256sum
-
       - name: Check numbers
         run: |
           grep version dojo/__init__.py
           grep appVersion helm/defectdojo/Chart.yaml
           grep version components/package.json
-          cat dojo/settings/.settings.dist.py.sha256sum
       
       - name: Push version changes
         uses: stefanzweifel/[email protected]

diff --git a/.github/workflows/release-x-manual-helm-chart.yml b/.github/workflows/release-x-manual-helm-chart.yml
@@ -46,10 +46,8 @@ jobs:
           git config --global user.name "${{ env.GIT_USERNAME }}"
           git config --global user.email "${{ env.GIT_EMAIL }}"
       
-      - name: Install Helm
-        uses: azure/setup-helm@v4
-        with:
-          version: v3.4.0
+      - name: Set up Helm
+        uses: azure/[email protected]
 
       - name: Configure HELM repos
         run: |-

diff --git a/components/package.json b/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "2.41.0",
+  "version": "2.41.2",
   "license" : "BSD-3-Clause",
   "private": true,
   "dependencies": {

diff --git a/docker/setEnv.sh b/docker/setEnv.sh
@@ -40,7 +40,7 @@ function get_current {
 # Tell to which environments we can switch
 function say_switch {
     echo "Using '${current_env}' configuration."
-    for one_env in dev debug unit_tests integration_tests release
+    for one_env in dev unit_tests integration_tests release
     do
         if [ "${current_env}" != ${one_env} ]; then
             echo "-> You can switch to '${one_env}' with '${0} ${one_env}'"
@@ -118,7 +118,7 @@ function set_integration_tests {
 # Change directory to allow working with relative paths.
 cd "${target_dir}" || exit
 
-if [ ${#} -eq 1 ] && [[ 'dev debug unit_tests unit_tests_cicd integration_tests release' =~ ${1} ]]
+if [ ${#} -eq 1 ] && [[ 'dev unit_tests unit_tests_cicd integration_tests release' =~ ${1} ]]
 then
     set_"${1}"
 else

diff --git a/docs/assets/images/About_Custom_Dashboard_Tiles.png b/docs/assets/images/About_Custom_Dashboard_Tiles.png
diff --git a/docs/assets/images/About_Custom_Dashboard_Tiles_10.png b/docs/assets/images/About_Custom_Dashboard_Tiles_10.png
diff --git a/docs/assets/images/About_Custom_Dashboard_Tiles_11.png b/docs/assets/images/About_Custom_Dashboard_Tiles_11.png
diff --git a/docs/assets/images/About_Custom_Dashboard_Tiles_12.png b/docs/assets/images/About_Custom_Dashboard_Tiles_12.png
diff --git a/docs/assets/images/About_Custom_Dashboard_Tiles_2.png b/docs/assets/images/About_Custom_Dashboard_Tiles_2.png
diff --git a/docs/assets/images/About_Custom_Dashboard_Tiles_3.png b/docs/assets/images/About_Custom_Dashboard_Tiles_3.png
diff --git a/docs/assets/images/About_Custom_Dashboard_Tiles_4.png b/docs/assets/images/About_Custom_Dashboard_Tiles_4.png
diff --git a/docs/assets/images/About_Custom_Dashboard_Tiles_5.png b/docs/assets/images/About_Custom_Dashboard_Tiles_5.png
diff --git a/docs/assets/images/About_Custom_Dashboard_Tiles_6.png b/docs/assets/images/About_Custom_Dashboard_Tiles_6.png
diff --git a/docs/assets/images/About_Custom_Dashboard_Tiles_7.png b/docs/assets/images/About_Custom_Dashboard_Tiles_7.png
diff --git a/docs/assets/images/About_Custom_Dashboard_Tiles_8.png b/docs/assets/images/About_Custom_Dashboard_Tiles_8.png
diff --git a/docs/assets/images/About_Custom_Dashboard_Tiles_9.png b/docs/assets/images/About_Custom_Dashboard_Tiles_9.png
diff --git a/docs/assets/images/About_In-App_Alerts.png b/docs/assets/images/About_In-App_Alerts.png
diff --git a/docs/assets/images/About_In-App_Alerts_2.png b/docs/assets/images/About_In-App_Alerts_2.png
diff --git a/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product.png b/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product.png
diff --git a/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product_2.png b/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product_2.png
diff --git a/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product_3.png b/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product_3.png
diff --git a/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product_4.png b/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product_4.png
diff --git a/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product_5.png b/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product_5.png
diff --git a/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product_6.png b/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product_6.png
diff --git a/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product_7.png b/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product_7.png
diff --git a/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product_8.png b/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product_8.png
diff --git a/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product_9.png b/docs/assets/images/Add_a_Connected_Jira_Project_to_a_Product_9.png
diff --git a/docs/assets/images/Avoiding_Duplicates_Reimport_Recurring_Tests.png b/docs/assets/images/Avoiding_Duplicates_Reimport_Recurring_Tests.png
diff --git a/docs/assets/images/Bulk_Editing_Findings.png b/docs/assets/images/Bulk_Editing_Findings.png
diff --git a/docs/assets/images/Bulk_Editing_Findings_2.png b/docs/assets/images/Bulk_Editing_Findings_2.png
diff --git a/docs/assets/images/Bulk_Editing_Findings_3.png b/docs/assets/images/Bulk_Editing_Findings_3.png
diff --git a/docs/assets/images/Bulk_Editing_Findings_4.png b/docs/assets/images/Bulk_Editing_Findings_4.png
diff --git a/docs/assets/images/Bulk_Editing_Findings_5.png b/docs/assets/images/Bulk_Editing_Findings_5.png
diff --git a/docs/assets/images/Configure_Single-Sign_On_Login.png b/docs/assets/images/Configure_Single-Sign_On_Login.png
diff --git a/docs/assets/images/Configure_Single-Sign_On_Login_2.png b/docs/assets/images/Configure_Single-Sign_On_Login_2.png
diff --git a/docs/assets/images/Configure_Single-Sign_On_Login_3.png b/docs/assets/images/Configure_Single-Sign_On_Login_3.png
diff --git a/docs/assets/images/Configure_Single-Sign_On_Login_4.png b/docs/assets/images/Configure_Single-Sign_On_Login_4.png
diff --git a/docs/assets/images/Configure_Single-Sign_On_Login_5.png b/docs/assets/images/Configure_Single-Sign_On_Login_5.png
diff --git a/docs/assets/images/Configure_System_&_Personal_Notifications.png b/docs/assets/images/Configure_System_&_Personal_Notifications.png
diff --git a/docs/assets/images/Configure_System_&_Personal_Notifications_2.png b/docs/assets/images/Configure_System_&_Personal_Notifications_2.png
diff --git a/docs/assets/images/Configure_System_&_Personal_Notifications_3.png b/docs/assets/images/Configure_System_&_Personal_Notifications_3.png
diff --git a/docs/assets/images/Configure_a_Microsoft_Teams_Integration.png b/docs/assets/images/Configure_a_Microsoft_Teams_Integration.png
diff --git a/docs/assets/images/Configure_a_Microsoft_Teams_Integration_2.png b/docs/assets/images/Configure_a_Microsoft_Teams_Integration_2.png
diff --git a/docs/assets/images/Configure_a_Slack_Integration.png b/docs/assets/images/Configure_a_Slack_Integration.png
diff --git a/docs/assets/images/Configure_a_Slack_Integration_2.png b/docs/assets/images/Configure_a_Slack_Integration_2.png
diff --git a/docs/assets/images/Configure_a_Slack_Integration_3.png b/docs/assets/images/Configure_a_Slack_Integration_3.png
diff --git a/docs/assets/images/Configure_a_Slack_Integration_4.png b/docs/assets/images/Configure_a_Slack_Integration_4.png
diff --git a/docs/assets/images/Configuring_the_Jira_DefectDojo_Webhook.png b/docs/assets/images/Configuring_the_Jira_DefectDojo_Webhook.png
diff --git a/docs/assets/images/Connect_DefectDojo_to_Jira.png b/docs/assets/images/Connect_DefectDojo_to_Jira.png
diff --git a/docs/assets/images/Connect_DefectDojo_to_Jira_2.png b/docs/assets/images/Connect_DefectDojo_to_Jira_2.png
diff --git a/docs/assets/images/Connect_DefectDojo_to_Jira_3.png b/docs/assets/images/Connect_DefectDojo_to_Jira_3.png
diff --git a/docs/assets/images/Connectivity_Troubleshooting.png b/docs/assets/images/Connectivity_Troubleshooting.png
diff --git a/docs/assets/images/Connectivity_Troubleshooting_2.png b/docs/assets/images/Connectivity_Troubleshooting_2.png
diff --git a/docs/assets/images/Connectivity_Troubleshooting_3.png b/docs/assets/images/Connectivity_Troubleshooting_3.png
diff --git a/docs/assets/images/Create_a_User_Group_for_shared_permissions.png b/docs/assets/images/Create_a_User_Group_for_shared_permissions.png
diff --git a/docs/assets/images/Create_a_User_Group_for_shared_permissions_2.png b/docs/assets/images/Create_a_User_Group_for_shared_permissions_2.png
diff --git a/docs/assets/images/Create_a_User_Group_for_shared_permissions_3.png b/docs/assets/images/Create_a_User_Group_for_shared_permissions_3.png
diff --git a/docs/assets/images/Create_a_User_Group_for_shared_permissions_4.png b/docs/assets/images/Create_a_User_Group_for_shared_permissions_4.png
diff --git a/docs/assets/images/Create_a_User_Group_for_shared_permissions_5.png b/docs/assets/images/Create_a_User_Group_for_shared_permissions_5.png
diff --git a/docs/assets/images/Create_a_User_Group_for_shared_permissions_6.png b/docs/assets/images/Create_a_User_Group_for_shared_permissions_6.png
diff --git a/docs/assets/images/Create_a_User_Group_for_shared_permissions_7.png b/docs/assets/images/Create_a_User_Group_for_shared_permissions_7.png
diff --git a/docs/assets/images/Create_a_User_Group_for_shared_permissions_8.png b/docs/assets/images/Create_a_User_Group_for_shared_permissions_8.png
diff --git a/docs/assets/images/Create_a_User_Group_for_shared_permissions_9.png b/docs/assets/images/Create_a_User_Group_for_shared_permissions_9.png
diff --git a/docs/assets/images/Creating_Findings_Manually.png b/docs/assets/images/Creating_Findings_Manually.png
diff --git a/docs/assets/images/Creating_Findings_Manually_2.png b/docs/assets/images/Creating_Findings_Manually_2.png
diff --git a/docs/assets/images/Creating_Issues_in_Jira.png b/docs/assets/images/Creating_Issues_in_Jira.png
diff --git a/docs/assets/images/Creating_Issues_in_Jira_2.png b/docs/assets/images/Creating_Issues_in_Jira_2.png
diff --git a/docs/assets/images/Creating_Issues_in_Jira_3.png b/docs/assets/images/Creating_Issues_in_Jira_3.png
diff --git a/docs/assets/images/Creating_Issues_in_Jira_4.png b/docs/assets/images/Creating_Issues_in_Jira_4.png
diff --git a/docs/assets/images/Creating_Issues_in_Jira_5.png b/docs/assets/images/Creating_Issues_in_Jira_5.png
diff --git a/docs/assets/images/Editing_Findings.png b/docs/assets/images/Editing_Findings.png
diff --git a/docs/assets/images/Editing_Findings_2.png b/docs/assets/images/Editing_Findings_2.png
diff --git a/docs/assets/images/Enabling_Deduplication_within_an_Engagement.png b/docs/assets/images/Enabling_Deduplication_within_an_Engagement.png
diff --git a/docs/assets/images/Enabling_Deduplication_within_an_Engagement_2.png b/docs/assets/images/Enabling_Deduplication_within_an_Engagement_2.png
diff --git a/docs/assets/images/Enabling_Deduplication_within_an_Engagement_3.png b/docs/assets/images/Enabling_Deduplication_within_an_Engagement_3.png
diff --git a/docs/assets/images/Enabling_Deduplication_within_an_Engagement_4.png b/docs/assets/images/Enabling_Deduplication_within_an_Engagement_4.png
diff --git a/docs/assets/images/Enabling_Product-Level_Deduplication.png b/docs/assets/images/Enabling_Product-Level_Deduplication.png
diff --git a/docs/assets/images/Enabling_Product-Level_Deduplication_2.png b/docs/assets/images/Enabling_Product-Level_Deduplication_2.png
diff --git a/docs/assets/images/Finding_Status_Definitions.png b/docs/assets/images/Finding_Status_Definitions.png
diff --git a/docs/assets/images/How-To_Add,_Edit_or_Delete_Dashboard_Tiles.png b/docs/assets/images/How-To_Add,_Edit_or_Delete_Dashboard_Tiles.png
diff --git a/docs/assets/images/How-To_Add,_Edit_or_Delete_Dashboard_Tiles_2.png b/docs/assets/images/How-To_Add,_Edit_or_Delete_Dashboard_Tiles_2.png
diff --git a/docs/assets/images/How-To_Add,_Edit_or_Delete_Dashboard_Tiles_3.png b/docs/assets/images/How-To_Add,_Edit_or_Delete_Dashboard_Tiles_3.png
diff --git a/docs/assets/images/How-To_Edit_Dashboard_Configuration.png b/docs/assets/images/How-To_Edit_Dashboard_Configuration.png
diff --git a/docs/assets/images/How-To_Edit_Dashboard_Configuration_2.png b/docs/assets/images/How-To_Edit_Dashboard_Configuration_2.png
diff --git a/docs/assets/images/How-To_Edit_Dashboard_Configuration_3.png b/docs/assets/images/How-To_Edit_Dashboard_Configuration_3.png
diff --git a/docs/assets/images/Introduction_to_Dashboard_Features.png b/docs/assets/images/Introduction_to_Dashboard_Features.png
diff --git a/docs/assets/images/Introduction_to_Dashboard_Features_2.png b/docs/assets/images/Introduction_to_Dashboard_Features_2.png
diff --git a/docs/assets/images/Introduction_to_Dashboard_Features_3.png b/docs/assets/images/Introduction_to_Dashboard_Features_3.png
diff --git a/docs/assets/images/Introduction_to_Dashboard_Features_4.png b/docs/assets/images/Introduction_to_Dashboard_Features_4.png
diff --git a/docs/assets/images/Introduction_to_Dashboard_Features_5.png b/docs/assets/images/Introduction_to_Dashboard_Features_5.png
diff --git a/docs/assets/images/Introduction_to_Dashboard_Features_6.png b/docs/assets/images/Introduction_to_Dashboard_Features_6.png
diff --git a/docs/assets/images/Introduction_to_Findings.png b/docs/assets/images/Introduction_to_Findings.png
diff --git a/docs/assets/images/Product_Hierarchy_Overview.png b/docs/assets/images/Product_Hierarchy_Overview.png
diff --git a/docs/assets/images/Product_Hierarchy_Overview_2.png b/docs/assets/images/Product_Hierarchy_Overview_2.png
diff --git a/docs/assets/images/Risk_Acceptances.png b/docs/assets/images/Risk_Acceptances.png
diff --git a/docs/assets/images/Risk_Acceptances_2.png b/docs/assets/images/Risk_Acceptances_2.png
diff --git a/docs/assets/images/Risk_Acceptances_3.png b/docs/assets/images/Risk_Acceptances_3.png
diff --git a/docs/assets/images/Risk_Acceptances_4.png b/docs/assets/images/Risk_Acceptances_4.png
diff --git a/docs/assets/images/Set_a_User's_Permissions.png b/docs/assets/images/Set_a_User's_Permissions.png
diff --git a/docs/assets/images/Set_a_User's_Permissions_2.png b/docs/assets/images/Set_a_User's_Permissions_2.png
diff --git a/docs/assets/images/Set_a_User's_Permissions_3.png b/docs/assets/images/Set_a_User's_Permissions_3.png
diff --git a/docs/assets/images/Set_a_User's_Permissions_4.png b/docs/assets/images/Set_a_User's_Permissions_4.png
diff --git a/docs/assets/images/Set_a_User's_Permissions_5.png b/docs/assets/images/Set_a_User's_Permissions_5.png
diff --git a/docs/assets/images/Set_a_User's_Permissions_6.png b/docs/assets/images/Set_a_User's_Permissions_6.png
diff --git a/docs/assets/images/Set_a_User's_Permissions_7.png b/docs/assets/images/Set_a_User's_Permissions_7.png
diff --git a/docs/assets/images/Using_Custom_Fields.png b/docs/assets/images/Using_Custom_Fields.png
diff --git a/docs/assets/images/Using_Custom_Fields_2.png b/docs/assets/images/Using_Custom_Fields_2.png
diff --git a/docs/assets/images/Using_the_Report_Builder.png b/docs/assets/images/Using_the_Report_Builder.png
diff --git a/docs/assets/images/Using_the_Report_Builder_10.png b/docs/assets/images/Using_the_Report_Builder_10.png
diff --git a/docs/assets/images/Using_the_Report_Builder_11.png b/docs/assets/images/Using_the_Report_Builder_11.png
diff --git a/docs/assets/images/Using_the_Report_Builder_12.png b/docs/assets/images/Using_the_Report_Builder_12.png
diff --git a/docs/assets/images/Using_the_Report_Builder_13.png b/docs/assets/images/Using_the_Report_Builder_13.png
diff --git a/docs/assets/images/Using_the_Report_Builder_14.png b/docs/assets/images/Using_the_Report_Builder_14.png
diff --git a/docs/assets/images/Using_the_Report_Builder_15.png b/docs/assets/images/Using_the_Report_Builder_15.png
diff --git a/docs/assets/images/Using_the_Report_Builder_2.png b/docs/assets/images/Using_the_Report_Builder_2.png
diff --git a/docs/assets/images/Using_the_Report_Builder_3.png b/docs/assets/images/Using_the_Report_Builder_3.png
diff --git a/docs/assets/images/Using_the_Report_Builder_4.png b/docs/assets/images/Using_the_Report_Builder_4.png
diff --git a/docs/assets/images/Using_the_Report_Builder_5.png b/docs/assets/images/Using_the_Report_Builder_5.png
diff --git a/docs/assets/images/Using_the_Report_Builder_6.png b/docs/assets/images/Using_the_Report_Builder_6.png
diff --git a/docs/assets/images/Using_the_Report_Builder_7.png b/docs/assets/images/Using_the_Report_Builder_7.png
diff --git a/docs/assets/images/Using_the_Report_Builder_8.png b/docs/assets/images/Using_the_Report_Builder_8.png
diff --git a/docs/assets/images/Using_the_Report_Builder_9.png b/docs/assets/images/Using_the_Report_Builder_9.png
diff --git a/docs/assets/images/Working_with_Generated_Reports.png b/docs/assets/images/Working_with_Generated_Reports.png
diff --git a/docs/assets/images/Working_with_Generated_Reports_2.png b/docs/assets/images/Working_with_Generated_Reports_2.png
diff --git a/docs/assets/images/Working_with_Generated_Reports_3.png b/docs/assets/images/Working_with_Generated_Reports_3.png
diff --git a/docs/assets/images/_index.png b/docs/assets/images/_index.png
diff --git a/docs/assets/images/add_edit_connectors.png b/docs/assets/images/add_edit_connectors.png
diff --git a/docs/assets/images/add_edit_connectors_2.png b/docs/assets/images/add_edit_connectors_2.png
diff --git a/docs/assets/images/add_edit_connectors_3.png b/docs/assets/images/add_edit_connectors_3.png
diff --git a/docs/assets/images/api-token.png b/docs/assets/images/api-token.png
diff --git a/docs/assets/images/api_pipeline_modelling.png b/docs/assets/images/api_pipeline_modelling.png
diff --git a/docs/assets/images/connectors_tool_reference.png b/docs/assets/images/connectors_tool_reference.png
diff --git a/docs/assets/images/connectors_tool_reference_2.png b/docs/assets/images/connectors_tool_reference_2.png
diff --git a/docs/assets/images/contact_defectdojo_support.png b/docs/assets/images/contact_defectdojo_support.png
diff --git a/docs/assets/images/contact_defectdojo_support_2.png b/docs/assets/images/contact_defectdojo_support_2.png
diff --git a/docs/assets/images/edit_ignore_delete_records.png b/docs/assets/images/edit_ignore_delete_records.png
diff --git a/docs/assets/images/edit_ignore_delete_records_2.png b/docs/assets/images/edit_ignore_delete_records_2.png
diff --git a/docs/assets/images/external-tools.png b/docs/assets/images/external-tools.png
diff --git a/docs/assets/images/import_scan_ui.png b/docs/assets/images/import_scan_ui.png
diff --git a/docs/assets/images/manage_records.png b/docs/assets/images/manage_records.png
diff --git a/docs/assets/images/manage_records_2.jpg b/docs/assets/images/manage_records_2.jpg
diff --git a/docs/assets/images/operations_discover.png b/docs/assets/images/operations_discover.png
diff --git a/docs/assets/images/operations_discover_2.png b/docs/assets/images/operations_discover_2.png
diff --git a/docs/assets/images/operations_discover_3.png b/docs/assets/images/operations_discover_3.png
diff --git a/docs/assets/images/operations_page.png b/docs/assets/images/operations_page.png
diff --git a/docs/assets/images/operations_sync.png b/docs/assets/images/operations_sync.png
diff --git a/docs/assets/images/request_a_trial.png b/docs/assets/images/request_a_trial.png
diff --git a/docs/assets/images/request_a_trial_2.png b/docs/assets/images/request_a_trial_2.png
diff --git a/docs/assets/images/request_a_trial_3.png b/docs/assets/images/request_a_trial_3.png
diff --git a/docs/assets/images/request_a_trial_4.png b/docs/assets/images/request_a_trial_4.png
diff --git a/docs/assets/images/request_a_trial_5.png b/docs/assets/images/request_a_trial_5.png
diff --git a/docs/assets/images/request_a_trial_6.png b/docs/assets/images/request_a_trial_6.png
diff --git a/docs/assets/images/request_a_trial_7.png b/docs/assets/images/request_a_trial_7.png
diff --git a/docs/assets/images/request_a_trial_mg.png b/docs/assets/images/request_a_trial_mg.png
diff --git a/docs/assets/images/run_operations_manually.png b/docs/assets/images/run_operations_manually.png
diff --git a/docs/assets/images/run_operations_manually_2.png b/docs/assets/images/run_operations_manually_2.png
diff --git a/docs/assets/images/smart_upload.png b/docs/assets/images/smart_upload.png
diff --git a/docs/assets/images/smart_upload_2.png b/docs/assets/images/smart_upload_2.png
diff --git a/docs/assets/images/smart_upload_3.png b/docs/assets/images/smart_upload_3.png
diff --git a/docs/assets/images/using_reimport.png b/docs/assets/images/using_reimport.png
diff --git a/docs/assets/images/using_reimport_2.png b/docs/assets/images/using_reimport_2.png
diff --git a/docs/assets/images/using_reimport_3.png b/docs/assets/images/using_reimport_3.png
diff --git a/docs/assets/images/using_the_cloud_manager.png b/docs/assets/images/using_the_cloud_manager.png
diff --git a/docs/assets/images/using_the_cloud_manager_2.png b/docs/assets/images/using_the_cloud_manager_2.png
diff --git a/docs/assets/images/using_the_cloud_manager_3.png b/docs/assets/images/using_the_cloud_manager_3.png
diff --git a/docs/assets/images/using_the_cloud_manager_4.png b/docs/assets/images/using_the_cloud_manager_4.png
diff --git a/docs/assets/images/using_the_cloud_manager_5.png b/docs/assets/images/using_the_cloud_manager_5.png
diff --git a/docs/assets/images/using_the_cloud_manager_6.png b/docs/assets/images/using_the_cloud_manager_6.png
diff --git a/docs/config.dev.toml b/docs/config.dev.toml
@@ -77,12 +77,6 @@ weight = 1
     pre = "<i class='fab fa-github'></i>"
     url = "https://github.com/DefectDojo/django-DefectDojo"
 
-[[menu.main]]
-    name = "Knowledge Base"
-    weight = 50
-    pre = "<i class='fas fa-atlas'></i>"
-    url = "https://support.defectdojo.com"
-
 [markup]
   [markup.goldmark]
     [markup.goldmark.renderer]

diff --git a/docs/content/en/about_defectdojo/contact_defectdojo_support.md b/docs/content/en/about_defectdojo/contact_defectdojo_support.md
@@ -6,26 +6,29 @@ pro-feature: true
 weight: 3
 ---
 
-For DefectDojo Pro users, DefectDojo's Support team can be contacted in a variety of ways.
+DefectDojo Pro subscriptions come with full support from the DefectDojo Inc team during the initial trial period and beyond.
 
-## Contacting Support via Email
+Open Source users can receive assistance via the OWASP [Slack Channel](https://owasp.org/slack/invite), or on [GitHub](https://github.com/DefectDojo/django-DefectDojo).  See our [Community Site](https://defectdojo.com/community) for more information.
 
-Customers / Pro Users can always email our team directly at [[email protected]](mailto:[email protected]).
+# Accessing Pro Support
+### Email
 
-## Contacting Support through the DefectDojo app
+Customers / Pro Users can always email our team directly at [[email protected]](mailto:[email protected]) for assistance.
+
+### Within DefectDojo
 
 You can contact us through the DefectDojo App:
 
-* by opening **Cloud Manager \> Contact Support** from the left sidebar**,**
+* by opening **Cloud Manager \> Contact Support** from the left sidebar
 * or through **{your\-instance}.defectdojo.com/cloud\_portal/support**.
 
-![Where to find the 'Contact Support' link in DefectDojo](https://defectdojo-inc.intercom-attachments-7.com/i/o/854681122/eca2271b89d62b943e80923b/gpUG1R_oppB0eO2XyzCludfqxjYCFT4xodToow7IBc-GE7zeXNc3CrGAtHCnLBMSAiFs5PRIcW6V58B6kHAxpKRado9NGjU3sBVbXQFCi2X1zNMfr0Xx8jgNED7ZCvt1bQWe83g47pnFcaPZ9L2oEs8?expires=1729720800&signature=74a5200740953f712cfcb0ed6145ac3ad5657bc5974e2e23e62ce5b13032272c&req=fCUjEMF%2FnINdFb4f3HP0gBxcVTY7O4IHl0%2Bn%2BVAfJVMzuNg%2FYQxvJl0daCy2%0AD6E%3D%0A)
+![image](images/contact_defectdojo_support.png)
 
-## Contact Support through the DefectDojo Cloud Portal
+### Through the Cloud Portal
 
 You can also contact our support team through your Cloud Portal:
 
 * by clicking on **Contact Us** (on the left sidebar)
 * or via **<https://cloud.defectdojo.com/resources/contact>**.
 
-![](https://downloads.intercomcdn.com/i/o/850350549/9183fa1703512f79f83a561b/Screenshot+2023-10-10+at+3.30.51+PM.png?expires=1729720800&signature=e6e5cda5d17f233575c7d5267d79de63210a1184a56e1c6d34468883a4c21817&req=fCUnFcx%2BmIVWFb4f3HP0gKi3DGFot4w4iwNAwMDaVsacaQIz63318wb%2BRw7J%0AOFM%3D%0A)
+![image](images/contact_defectdojo_support_2.png)
diff --git a/docs/content/en/about_defectdojo/new_user_checklist.md b/docs/content/en/about_defectdojo/new_user_checklist.md
@@ -10,18 +10,18 @@ Here's a quick reference you can use to ensure successful implementation - from
 
 ### The Basics
 
-1. Start by [importing a file](../../connecting_your_tools/import_scan_files/import_scan_ui) using the UI.  This is generally the quickest way to see how your data fits into the DefectDojo model. (note: OS users will need to set up a Product Type and Product before they can import data)
+1. Start by [importing a file](/en/connecting_your_tools/import_scan_files/import_scan_ui) using the UI.  This is generally the quickest way to see how your data fits into the DefectDojo model. (note: OS users will need to set up a Product Type and Product before they can import data)
 
-2. Now that you have data in DefectDojo, learn more about how to organize it with the [Product Hierarchy Overview](../../working_with_findings/organizing_engagements_tests/product-hierarchy-overview). The Product Hierarchy creates a working inventory of your apps, which helps you divide your data up into logical categories. These categories can be used to apply access control rules, or to segement your reports to the correct team.
+2. Now that you have data in DefectDojo, learn more about how to organize it with the [Product Hierarchy Overview](/en/working_with_findings/organizing_engagements_tests/product_hierarchy). The Product Hierarchy creates a working inventory of your apps, which helps you divide your data up into logical categories. These categories can be used to apply access control rules, or to segement your reports to the correct team.
 
-3. Try [creating a Report](../../pro_reports/using-the-report-builder/) to summarize the data you've imported.  Reports can be used to quickly share Findings with stakeholders such as Product Owners.
+3. Try [creating a Report](/en/pro_reports/using_the_report_builder/) to summarize the data you've imported.  Reports can be used to quickly share Findings with stakeholders such as Product Owners.
 
 This is the essence of DefectDojo - import security data, organize it, and present it to the folks who need to know. 
 
 All of these features can be automated, and because DefectDojo can handle over 190 tools (at time of writing) you should be all set to create a functional security inventory of your entire organizational output.
 
 ### Other guides
 
-- Does your organization use Jira? Learn how to use our [Jira integration](../jira_integration/Connect%20DefectDojo%20to%20Jira.md) to create Jira tickets from the data you ingest.
-- Are you expecting to share DefectDojo with many users in your organization? Check out our guides to [user management](../user_management/about-permissions-roles) and set up role-based access control (RBAC).
-- Ready to dive into automation? Learn how to use the [DefectDojo API](../connecting_your_tools/import_scan_files/api_pipeline_modelling) to automatically import new data, and build a robust CI / CD pipeline.
+- Does your organization use Jira? Learn how to use our [Jira integration](/en/jira_integration/connect_to_jira) to create Jira tickets from the data you ingest.
+- Are you expecting to share DefectDojo with many users in your organization? Check out our guides to [user management](/en/user_management/about_perms_and_roles/) and set up role-based access control (RBAC).
+- Ready to dive into automation? Learn how to use the [DefectDojo API](/en/connecting_your_tools/import_scan_files/api_pipeline_modelling) to automatically import new data, and build a robust CI / CD pipeline.
diff --git a/docs/content/en/about_defectdojo/request_a_trial.md b/docs/content/en/about_defectdojo/request_a_trial.md
@@ -1,101 +1,67 @@
 ---
-title: "Request a Trial"
+title: "Request a DefectDojo Pro Trial"
 description: "How to request and work with a trial of DefectDojo Cloud"
 draft: "false"
 weight: 4
 pro-feature: true
 ---
 
-
 If your team requires an on\-premise DefectDojo installation, please connect with our Sales team by emailing \-\> [[email protected]](mailto:[email protected]) . This trial setup process only applies to DefectDojo Cloud users.
 
-
 All DefectDojo plans include a free 2\-week trial, which you can use to evaluate our software. DefectDojo Trial instances are fully\-featured and can be immediately converted to our team into paid instances \- no need to set everything up again, or reupload any data when your trial period ends.
 
-
-
-# **Requesting your Trial**
-
-
-In order to sign up for the trial, you'll need to complete the process at <https://www.defectdojo.com/pricing>.
-
-
-
 At the end of this process, you'll be put in touch with our Sales team, who will follow up to receive your billing information, and authorize and set up your company's trial instance.
 
+# **Requesting your Trial**
 
+In order to sign up for a trial, you'll need to create an account on our Cloud Portal, and then click the New Subscription menu option from the sidebar.
 
-## Step 1: Select a Plan
-
-
-DefectDojo offers 4 plan tiers: Entry, Team, Business and Enterprise. For more information on these plan tiers, see <https://www.defectdojo.com/pricing>.
+![image](images/request_a_trial_mg.png)
 
+## Step 1: Welcome
+Click Continue to begin setting up your instance.
 
+![image](images/request_a_trial.png)
 
 ## Step 2: Enter your Company Information \& create your Domain
 
-
 Enter your company's **Name** and the **Server Label** you want to use with DefectDojo. You will then have a custom domain created for your DefectDojo instance on our servers.
 
-
-
+![image](images/request_a_trial_2.png)
 
 Normally, DefectDojo will name your domain according to your Company Name., but if you select "Use Server Label in Domain", DefectDojo will instead label your domain according to the Server Label you chose. This approach may be preferred if you plan to use multiple DefectDojo instances (such as a Production instance and a Test instance, for example). Please contact our Sales team \-\> [[email protected]](mailto:[email protected]) if you require multiple instances.
 
-
-
-![](https://downloads.intercomcdn.com/i/o/860988422/eedc579b6677431286d65848/Screenshot+2023-10-24+at+1.40.08+PM.png?expires=1729720800&signature=a5d0777d68939399aaa5ec509c17ed2d416c1ec2a6bf522f1975ba9081556b02&req=fCYnH8F2mYNdFb4f3HP0gE8a9ArLlDRdCgEOOG%2FhF1RTkIUw7Ito80YJSY0l%0AHKg%3D%0A)
-
 ## Step 3: Select a Server Location
 
-
 Select a Server Location from the drop\-down menu. We recommend selecting a server that is geographically closest to the main DefectDojo team to reduce server latency.
 
-
-
-![](https://downloads.intercomcdn.com/i/o/876540337/a0a35dcc0d6133d9920ae351/Screenshot+2023-11-06+at+10.52.31+AM.png?expires=1729720800&signature=ca343d1908f901d445fd42e4a6ad36bf5423fe11f5f5499330f12d5bcbb673f8&req=fCchE81%2BnoJYFb4f3HP0gEQv7p4cu3PEeMC%2F7lhGIjWslFuLY7y9ydfxMon8%0AEqc%3D%0A)
+![image](images/request_a_trial_3.png)
 
 ## Step 4: Configure your Firewall Rules
 
-
 Enter the IP address ranges, subnet mask and labels that you want to allow to access DefectDojo. Additional IP addresses and rules can be added or changed by your team after your instance is up and running.
 
+![image](images/request_a_trial_4.png)
 
-
-![](https://downloads.intercomcdn.com/i/o/861008661/a96af61112ab368531e5cea3/Screenshot+2023-10-24+at+2.03.54+PM.png?expires=1729720800&signature=dd429751626344d5acdbc978075350b93c1eee4e08b19a7e2600acc32ef5af09&req=fCYmFsl2m4deFb4f3HP0gC9i9UC9KLwQAM03VQIh7iIX1Mte7ZuJem%2FMasGI%0AMOs%3D%0A)
 If you want to use external services with DefectDojo (GitHub or JIRA), check the appropriate boxes listed under **Select External Services.** 
 
-
-
-![](https://downloads.intercomcdn.com/i/o/861010228/9af57d1dbc88ec8eb1aba838/Screenshot+2023-10-24+at+2.05.17+PM.png?expires=1729720800&signature=4de093e7d6e8eb2868d8827d43b21e3fdcca811d54129281312ed2046e8f436b&req=fCYmFsh%2Bn4NXFb4f3HP0gESMYM2ZnzQC0Fiw%2BtpOyJtEyhzu2iwxkZDcgD8G%0AOt8%3D%0A)
-
-## Step 4: Confirm your Plan type and Billing Frequency
-
+## Step 5: Confirm your Plan type and Billing Frequency
 
 Before you complete the process, please confirm the plan you want to use along with your billing frequency \- monthly or annually.
 
+![image](images/request_a_trial_5.png)
 
+## Step 6: Review and Submit your Request
 
-![](https://downloads.intercomcdn.com/i/o/876543637/6e37d8e254905d129b0db4e9/Screenshot+2023-11-06+at+12.50.04+PM.png?expires=1729720800&signature=71aa69825544e058bf464482c7a705d822cabe57df3d147383cd6f78606e2e2d&req=fCchE819m4JYFb4f3HP0gA6Fk0%2FefI4ZjPtNpPBBX2TaKmf7JCyejxcfyEyq%0Asw0%3D%0A)
+We'll prompt you to look over your request one more time. Once submitted, only Firewall rules can be changed by your team without assistance from Support. To contact Support, please email [[email protected]](mailto:[email protected]) or follow the instructions in [this article](https://docs.defectdojo.com/en/about_defectdojo/contact_defectdojo_support/).
 
-## Step 5: Review and Submit your Request
+![image](images/request_a_trial_6.png)
 
+After reviewing and accepting DefectDojo's License and Support Agreement, you can click **Checkout With Stripe** or **Contact Sales**.
 
-We'll prompt you to look over your request one more time. Once submitted, only Firewall rules can be changed by your team without assistance from Support. To contact Support, please email [[email protected]](mailto:[email protected]) or follow the instructions in [this article](https://support.defectdojo.com/en/articles/8461544-contact-defectdojo-support).
-
-
-
-![](https://downloads.intercomcdn.com/i/o/862067499/929fb73dfcda5759f44d5fe7/Screenshot+2023-10-25+at+3.41.42+PM.png?expires=1729720800&signature=c5c2efdb7cf11724b8e74e0193d63aab8cb6fdd479f5f05a385156dd4ce3f3fc&req=fCYlFs95mYhWFb4f3HP0gF2vZoT3mHEx2TF3mhg3tv%2FwJLi00MGhyKfgGvLa%0AiTI%3D%0A)
-After reviewing and accepting DefectDojo's License and Support Agreement, you can click **Proceed To Checkout,** or **Meet The Creators.**
-
-
-
-* Proceed To Checkout will take you to a Stripe page where you can enter your billing information.
-* If you do not wish to enter your billing info at this time, you can click Meet The Creators \- our Sales team will be in touch to set up your trial.
-
+* Checkout With Stripe will take you to a Stripe page where you can enter your billing information.
+* If you do not wish to enter your billing info at this time, you can click Contact Sales - our Sales team will be in touch to set up your trial.
 
 # Once your trial has been approved
 
-
-Our Support team will send you a Welcome email with links to access your DefectDojo instance. You can always reach out to [[email protected]](mailto:[email protected]) for product assistance once your trial begins.
-
+Our Support team will send you a Welcome email with links and an initial password to access your DefectDojo instance. You can always reach out to [[email protected]](mailto:[email protected]) for product assistance once your trial begins.
diff --git a/docs/content/en/changelog/changelog.md b/docs/content/en/changelog/changelog.md
@@ -5,11 +5,24 @@ description: "DefectDojo Changelog"
 
 Here are the release notes for **DefectDojo Pro (Cloud Version)**. These release notes are focused on UX, so will not include all code changes.
 
-For Open Source release notes, please see the [Releases page on GitHub](https://github.com/DefectDojo/django-DefectDojo/releases), or alternatively consult the Open Source [upgrate notes](../../open_source/upgrading/upgrading_guide).
+For Open Source release notes, please see the [Releases page on GitHub](https://github.com/DefectDojo/django-DefectDojo/releases), or alternatively consult the Open Source [upgrade notes](../../open_source/upgrading/upgrading_guide).
+
+
+## Dec 16, 2024: v2.41.2
+
+- **(Connectors)** Remove the 'Beta' logo from Connectors
+
+## Dec 9, 2024: v2.41.1
+
+- **(API)** When using the jira_finding_mappings API endpoint, trying to update a finding's Jira mapping with a Jira issue that is already assigned to another finding will now raise a validation error.
+- **(Beta UI)** A Test's Import History is now paginated by default.
+- **(Findings)** New Filter: 'Has Any JIRA' which accounts for Findings with single Issues or Findings that were pushed to Jira as part of a Group.
+- **(Classic UI)** Filters have been added to the Product Type view.  This is useful for when a single Product Type contains many Products which need to be filtered down.
+- **(Classic UI)** Reported Finding Severity by Month graph now tracks the X axis by month correctly.
 
 ## Dec 2, 2024: v2.41.0
 
-- **(Api)** `engagements/{id}/update_jira_epic` endpoint path added so that users can now push an updated Engagement to Jira, without creating a new Jira Epic.
+- **(API)** `engagements/{id}/update_jira_epic` endpoint path added so that users can now push an updated Engagement to Jira, without creating a new Jira Epic.
 - **(Beta UI)** Columns can now be reordered in tables, by clicking and dragging the column header.
 
 ![image](images/reorder-columns.png)
@@ -18,7 +31,6 @@ For Open Source release notes, please see the [Releases page on GitHub](https://
 - **(Classic UI)** Reviewers are now displayed on Finding pages.
 - **(Docs)** New integrated docs site: https://docs.defectdojo.com/
 
-
 ## Nov 25, 2024: v2.40.4
 
 - **(Beta UI)**  Improved Metadata tables with Parent object relationships for Products, Engagements, Tests, Findings, Endpoints/Hosts
@@ -140,7 +152,7 @@ configuration fields.
 
 
 
-## Sept 9, 2024: v2.39.1
+## Sept 9, 2024: v2.38.1
 
 - **(Beta UI)**  Clearing a date filter and re-applying it no longer throws a 400 error.
 - **(Dashboard)**  Dashboard Tag Filters now work correctly in both legacy and beta UIs.
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,8 +5,6 @@ on: @@
       push:
         branches:
           - master
-          - dev
-          - bugfix
     # Taken from https://github.com/marketplace/actions/hugo-setup#%EF%B8%8F-workflow-for-autoprefixer-and-postcss-cli
     # Both builds have to be one worflow as otherwise one publish will overwrite the other
@@ Expand Down @@