Merge branch '2.41.1-docs-maint' of https://github.com/paulOsinski/dj…

…ango-DefectDojo into 2.41.1-docs-maint

.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

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "2.42.0-dev",
+  "version": "2.41.1",
   "license" : "BSD-3-Clause",
   "private": true,
   "dependencies": {

docs/content/en/changelog/changelog.md

@@ -3,10 +3,29 @@ title: "DefectDojo Pro Changelog"
 description: "DefectDojo Changelog"
 ---
 
-Here are the release notes for **DefectDojo Pro (Cloud Version)**.  
+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 [upgrade notes](../../open_source/upgrading/upgrading_guide).
 
+## 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.
+- **(Beta UI)** Columns can now be reordered in tables, by clicking and dragging the column header.
+
+![image](images/reorder-columns.png)
+
+- **(Beta UI)** Notes can now be added to a Test directly from the Test page.
+- **(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
@@ -128,7 +147,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.  

docs/content/en/cloud_management/using-cloud-manager.md

@@ -16,11 +16,11 @@ This page allows you to request a [new, or additional Cloud instance](../set-up-
 The Subscription Management page shows all of your currently active Cloud instances, and allows you to configure the Firewall settings for each instance.
 
 ### Changing your Firewall Settings
-![image](images/Using_the_Cloud_Manager.png)
+![image](images/using_the_cloud_manager.png)
 
 Once on the **Edit Subscription** page, enter the IP Address, Mask, and Label for the rule you wish to add. If more than one firewall rule is needed, click **Add New Range** to create a new empty rule.
 
-![image](images/Using_the_Cloud_Manager_2.png)
+![image](images/using_the_cloud_manager_2.png)
 
 Here, you can also open your firewall to external services (GitHub & Jira Cloud).  You can also disable your firewall entirely, if you wish, by selecting **Proceed Without Firewall** from the menu.
 
@@ -37,14 +37,14 @@ Enter the email associated with the user's Cloud Portal account, and click Submi
 
 The Resources page contains a Contact Us form, which you can use to get in touch with our Support team.
 
-![image](images/Using_the_Cloud_Manager_3.png)
+![image](images/using_the_cloud_manager_3.png)
 
 ## Tools
 <https://cloud.defectdojo.com/external_tools/defectdojo-cli>
 
 The Tools page is one of the places where you can download external Pro tools, such as Universal Importer or DefectDojo CLI.  These tools are external add-ons which can be used to quickly build a command-line import pipeline in your network. For more information about these tools, see the [External Tools](../../connecting_your_tools/external_tools/) documentation.
 
-![image](images/Using_the_Cloud_Manager_6.png)
+![image](images/using_the_cloud_manager_6.png)
 
 
 ## Account Settings
@@ -62,7 +62,7 @@ The account settings page has four sections:
 
 Note that this will only add MFA to your DefectDojo Cloud login, not to the login for your DefectDojo app.
 
-![image](images/Using_the_Cloud_Manager_4.png)
+![image](images/using_the_cloud_manager_4.png)
 
 1. Begin by installing an Authenticator app which supports QR code authentication on your smartphone or computer.
 2. Once you've done this, click **Generate QR Code**.

docs/layouts/partials/head/script-header.html

@@ -1 +1,6 @@
 <!-- Insert scripts NOT needed by stylesheets here -->
+<!-- Start of Reo Javascript -->
+<script type="text/javascript">
+    !function(){var e,t,n;e="a92cfcfa51eca96",t=function(){Reo.init({clientID:"a92cfcfa51eca96"})},(n=document.createElement("script")).src="https://static.reo.dev/"+e+"/reo.js",n.async=!0,n.onload=t,document.head.appendChild(n)}();
+  </script>
+  <!-- End of Reo Javascript -->

dojo/__init__.py

@@ -4,6 +4,6 @@
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app  # noqa: F401
 
-__version__ = "2.41.0"
+__version__ = "2.41.1"
 __url__ = "https://github.com/DefectDojo/django-DefectDojo"
 __docs__ = "https://documentation.defectdojo.com"

helm/defectdojo/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "2.42.0-dev"
+appVersion: "2.41.1"
 description: A Helm chart for Kubernetes to install DefectDojo
 name: defectdojo
-version: 1.6.163-dev
+version: 1.6.163
 icon: https://www.defectdojo.org/img/favicon.ico
 maintainers:
   - name: madchap