codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-20 17:51:48 +00:00
Code Issues Releases Wiki Activity
18,144 Commits 24 Branches 52 Tags
734b4ebe6ea040cc7fda687a09f39f0a1dc95342
Commit Graph
18144 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Ziehl 734b4ebe6e Merge branch '3700-3730-3731-3732-3639-roundup' of https://github.com/briangsweeney/autopsy into 3668-intra-case-correlation-content-viewer 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/AllDataSources.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaData.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaDataBuilder.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/FileInstanceMetaData.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/Md5MetaData.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/SingleDataSource.java
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
 2018-05-01 14:40:46 -07:00
Andrew Ziehl 3145e60631 Codeacy fixes 2018-05-01 14:17:14 -07:00
Andrew Ziehl 43545a0805 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3668-intra-case-correlation-content-viewer 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
 2018-05-01 08:52:35 -07:00
Richard Cordovano ebeed4893e Merge in custom-release-may-2018 and resolve conflicts 2018-05-01 10:58:55 -04:00
Richard Cordovano 33dcffdd28 Merge in customw-release-may-2018 and resolve conflicts 2018-05-01 10:57:08 -04:00
Richard Cordovano aad70991ea Resolve conflicts for release-4.7.0 merge 2018-05-01 09:59:54 -04:00
Brian Carrier 611cd721a1 use custom TSK branch 2018-05-01 09:19:44 -04:00
Richard Cordovano f87fd0cc8a Remove methods with unnecessary public access from ThunderbirdMboxFileIngestModule 2018-04-30 18:57:19 -04:00
Andrew Ziehl 7cb3ece7c5 remove testing hashcode comment 2018-04-30 14:58:24 -07:00
Andrew Ziehl 29b369390b Refactored methods, set path to lowercase for hashcode comparisons, which fixes duplicates. 2018-04-30 11:55:22 -07:00
Andrew Ziehl 3c3d162159 Cleanup correlation case function. 2018-04-30 06:58:12 -07:00
Brian Carrier d5d623bcbb fix typo 2018-04-28 13:33:12 -04:00
Brian Carrier e29ec34d17 adjusted CI scripts for new TSK names 2018-04-28 10:41:49 -04:00
Brian Carrier a5fe951761 Updated to use 4.6.1 TSK 2018-04-27 22:48:26 -04:00
Brian Carrier 3fbca05057 Update to use tsk 4.6.1 jar 2018-04-27 22:45:51 -04:00
Brian Carrier ec6850f520 update TSK dependency 2018-04-27 22:34:13 -04:00
Brian Carrier da4b415e20 update TSK dependency 2018-04-27 22:33:12 -04:00
Richard Cordovano ef58e61759 Merge pull request #3726 from rcordovano/3726-result-view-infrastructure 
3726 result view infrastructure
 2018-04-27 20:12:59 -04:00
Richard Cordovano e5ede42dc1 Merge remote-tracking branch 'upstream/develop' into 3726-result-view-infrastructure 2018-04-27 20:11:49 -04:00
Richard Cordovano c665942aec Merge remote-tracking branch 'upstream/custom-release-may-2018' into develop 2018-04-27 20:10:43 -04:00
Richard Cordovano fda8b94741 Complete documentation nad clean up of result view infrastructure 2018-04-27 20:06:04 -04:00
Andrew Ziehl 684e179ab3 Check for known status, if not known check tags and set, then add if not in CR. 2018-04-27 16:38:55 -07:00
Richard Cordovano 9015e2bf8a Merge pull request #3721 from sleuthkit/3503_kwsrch_refactor 
renamed classes - 3503
 2018-04-27 18:41:39 -04:00
Richard Cordovano 875a619e2d Resolve merge conflict for custom-release-may-2018 branch 2018-04-27 17:36:33 -04:00
Richard Cordovano fd4de73013 Merge remote-tracking branch 'upstream/release-4.7.0' into custom-release-may-2018 2018-04-27 17:33:19 -04:00
Richard Cordovano eb01a3e899 Merge pull request #3719 from wschaeferB/3752-EncryptedPartitionsSupport 
3752 encrypted partitions support
 2018-04-27 16:53:24 -04:00
Richard Cordovano 4a2faa9983 Merge pull request #3712 from dgrove727/3749_FunctionalTest 
3749 functional test
 2018-04-27 16:51:18 -04:00
Richard Cordovano 780a2b4487 Merge pull request #3710 from dgrove727/3749_PasswordProtectionPdfDocuments 
3749 password protection pdf documents
 2018-04-27 16:49:44 -04:00
Richard Cordovano fdb6e9ec50 Merge pull request #3706 from wschaeferB/3768-CleanUpAidMonitor 
3768 have AutoIngestMonitor's shutdown method called when the AutoIng…
 2018-04-27 16:09:38 -04:00
Richard Cordovano becc875516 Merge pull request #3720 from zhhl/3709-AllTestCasesForEmbeddedFiles 
3709: All test cases for Embedded file tests.
 2018-04-27 15:01:21 -04:00
Richard Cordovano 641c2a8473 Merge pull request #3709 from dgrove727/3748_RegressionTest 
3748 encryption module functional testing
 2018-04-27 11:30:50 -04:00
Brian Sweeney d8bd086ad7 is supported function for other occurrences tab of content viewer had a bug (needs to exit if abstract file cannot be derived from the node) 2018-04-27 08:34:42 -06:00
Brian Carrier 4a08a71ff6 Merge pull request #3678 from sleuthkit/vol_fix 
Remember selection and allow user to specify profile
 2018-04-26 22:50:01 -04:00
U-BASIS\dgrove 24228af441 Merge remote-tracking branch 'upstream/custom-release-may-2018' into 3748_RegressionTest 2018-04-26 22:36:12 -04:00
U-BASIS\dgrove d0ddd3f540 Added assertion messages. 2018-04-26 22:35:00 -04:00
Brian Carrier 81f46c4119 renamed classes - 3503 2018-04-26 17:50:01 -04:00
William Schaefer 30020ec602 3752 fix issues found in review. comments, and other minor things 2018-04-26 17:15:33 -04:00
U-BASIS\zhaohui 6484e6b4d6 3709: All test cases for Embedded file tests. 2018-04-26 17:01:49 -04:00
Richard Cordovano f285ebd340 Merge pull request #3689 from APriestman/3339_keywordSearchBoundaries 
3339 keyword search boundaries
 2018-04-26 16:28:54 -04:00
Andrew Ziehl 359900250d Add comments 2018-04-26 11:18:13 -07:00
Andrew Ziehl b92413dcf0 Do not create or add duplicate correlation instances. Adjust filePath. 2018-04-26 11:15:30 -07:00
Richard Cordovano 45c147f35a Merge branch 'custom-release-may-2018' into develop 2018-04-26 13:35:09 -04:00
Richard Cordovano 57e644fbb8 Add testutils to custom release May 2018 branch 2018-04-26 13:34:31 -04:00
William Schaefer 0984f1d9b7 Merge branch 'custom-release-may-2018' of https://github.com/sleuthkit/autopsy into 3752-EncryptedPartitionsSupport 2018-04-26 13:09:07 -04:00
Richard Cordovano f093c763e0 Merge pull request #3676 from zhhl/3709-embeddedFiles 
3709 1st test for  embedded files
 2018-04-26 13:01:17 -04:00
U-BASIS\zhaohui 4af2d8c291 Merge branch '3709-embeddedFiles' of github.com:zhhl/autopsy into 3709-embeddedFiles 2018-04-26 12:42:42 -04:00
Andrew Ziehl cfcb7410b1 Add logic to avoid errors and enable Other Occurances even if CR is not enabled. 2018-04-26 09:12:08 -07:00
Richard Cordovano ff1436054c Merge pull request #3711 from APriestman/3754_hashMetric 
3754 Add metrics for hash lookup and a database query
 2018-04-26 11:59:19 -04:00
U-BASIS\zhaohui 9f9622c2c1 3709: Add IngestUtils class for unit test. 2018-04-26 11:56:55 -04:00
Richard Cordovano 7c9aa10674 Merge pull request #3707 from APriestman/doxygenWarningFix 
Deleted unrelated comment block to remove doxygen warnings.
 2018-04-26 10:00:40 -04:00