Merge remote-tracking branch 'origin/master' into develop

mitre-attack · Dec 31, 2024 · 67ee2e7 · 67ee2e7
2 parents 521dd41 + 525fb10
commit 67ee2e7
Show file tree

Hide file tree

Showing 11 changed files with 422 additions and 5 deletions.
diff --git a/attack-theme/static/images/attackcon5/ATTACKCON_5.0_banner.png b/attack-theme/static/images/attackcon5/ATTACKCON_5.0_banner.png
diff --git a/attack-theme/static/images/attackcon5/mitreengenuity.png b/attack-theme/static/images/attackcon5/mitreengenuity.png
diff --git a/attack-theme/static/images/attackcon5/pentera.png b/attack-theme/static/images/attackcon5/pentera.png
diff --git a/attack-theme/static/images/attackcon5/redcanary.png b/attack-theme/static/images/attackcon5/redcanary.png
diff --git a/attack-theme/static/images/attackcon5/safebreach.png b/attack-theme/static/images/attackcon5/safebreach.png
diff --git a/attack-theme/static/images/attackcon5/socradar.png b/attack-theme/static/images/attackcon5/socradar.png
diff --git a/attack-theme/static/images/attackcon5/tidalcyber.png b/attack-theme/static/images/attackcon5/tidalcyber.png
diff --git a/attack-theme/static/images/attackcon5/trendmicro.png b/attack-theme/static/images/attackcon5/trendmicro.png
diff --git a/data/attackcon.json b/data/attackcon.json
diff --git a/requirements.txt b/requirements.txt
@@ -8,7 +8,7 @@ mitreattack-python==3.0.8
 pelican==4.8.0
 pyScss==1.4.0
 python-dotenv==1.0.1
-requests==2.32.0
+requests==2.32.3
 stix2==3.0.1
 stix2-validator==3.2.0
 toml==0.10.2

diff --git a/website-banner.production b/website-banner.production
@@ -1 +1 @@
-Reminder: the TAXII 2.0 server will be <a href='https://medium.com/mitre-attack/introducing-taxii-2-1-and-a-fond-farewell-to-taxii-2-0-d9fca6ce4c58'>retiring on December 18</a>. Please switch to the <a href='https://github.com/mitre-attack/attack-workbench-taxii-server/blob/main/docs/USAGE.md'>TAXII 2.1 server</a> to ensure uninterrupted service.
+Reminder: the TAXII 2.0 server <a href='https://medium.com/mitre-attack/introducing-taxii-2-1-and-a-fond-farewell-to-taxii-2-0-d9fca6ce4c58'>retired on December 18</a>. Please switch to the <a href='https://github.com/mitre-attack/attack-workbench-taxii-server/blob/main/docs/USAGE.md'>TAXII 2.1 server</a> to ensure uninterrupted service.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Reminder: the TAXII 2.0 server will be <a href='https://medium.com/mitre-attack/introducing-taxii-2-1-and-a-fond-farewell-to-taxii-2-0-d9fca6ce4c58'>retiring on December 18</a>. Please switch to the <a href='https://github.com/mitre-attack/attack-workbench-taxii-server/blob/main/docs/USAGE.md'>TAXII 2.1 server</a> to ensure uninterrupted service.
		Reminder: the TAXII 2.0 server <a href='https://medium.com/mitre-attack/introducing-taxii-2-1-and-a-fond-farewell-to-taxii-2-0-d9fca6ce4c58'>retired on December 18</a>. Please switch to the <a href='https://github.com/mitre-attack/attack-workbench-taxii-server/blob/main/docs/USAGE.md'>TAXII 2.1 server</a> to ensure uninterrupted service.