merging in develop

.gitignore

@@ -29,4 +29,6 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
-# End of https://www.toptal.com/developers/gitignore/api/macos
+# End of https://www.toptal.com/developers/gitignore/api/macos
+
+*.env

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "attack-workbench-frontend",
-  "version": "1.0.0",
-  "description": "Application for creating and editing ATT&CK-like content.",
+  "version": "1.0.1",
+  "description": "An application allowing users to explore, create, annotate, and share extensions of the MITRE ATT&CK® knowledge base. This repository contains an Angular-based web application providing the user interface for the ATT&CK Workbench application.",
   "keywords": [
     "cti",
     "cyber-threat-intelligence",
@@ -26,7 +26,6 @@
     "lint": "ng lint",
     "e2e": "ng e2e"
   },
-  "private": true,
   "dependencies": {
     "@angular/animations": "~10.1.1",
     "@angular/cdk": "^10.2.4",

docker-compose.certs.yml

@@ -0,0 +1,7 @@
+version: "3.9"
+services:
+  collection-manager:
+    volumes:
+      - ${HOST_CERTS_PATH}:/usr/src/app/certs
+    environment:
+      - NODE_EXTRA_CA_CERTS=./certs/${CERTS_FILENAME}

docs/changelog.md

@@ -31,6 +31,14 @@
 <!--    each repo's package.json file's version marking.                -->
 
 # Changelog
+## 8 July 2021
+### ATT&CK Workbench version 1.0.1
+#### Improvements in 1.0.1
+- Added a system for configuring the Collection Manager with self-signed certs when using the docker setup. Documentation for this configuration will be improved in a subsequent release.
+
+#### Fixes in 1.0.1
+- Fixed an error encountered when using the `attack-objects` API with large datasets. This error was preventing users from loading the "create a collection" page when Enterprise ATT&CK collections were imported. See [rest-api#87](https://github.com/center-for-threat-informed-defense/attack-workbench-rest-api/issues/87).
+
 ## 21 June 2021
 ### ATT&CK Workbench version 1.0.0
 #### Improvements in 1.0.0