Merge branch 'master' into ui_timesketch_unfurl_integration

google · Sep 29, 2023 · 2572d22 · 2572d22
2 parents f46f40f + cb0eb03
commit 2572d22
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 alembic==1.11.1
 altair==4.1.0
 celery==5.2.7
-cryptography==41.0.3
+cryptography==41.0.4
 datasketch==1.5.0
 dfir-unfurl
 opensearch-py==2.3.1

diff --git a/timesketch/frontend-ng/src/components/UploadForm.vue b/timesketch/frontend-ng/src/components/UploadForm.vue
@@ -174,6 +174,7 @@ export default {
       mandatoryHeaders: [
         { name: 'datetime', columnsSelected: [] },
         { name: 'message', columnsSelected: [] },
+        { name: 'timestamp_desc', columnsSelected: [] },
       ],
       form: {
         name: '',