19260 Commits

Author SHA1 Message Date
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
Brian Sweeney
1d2d4dd236 error text is presented, search is disabled when the user has not selected any categories 2018-04-27 15:59:27 -06: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
Brian Sweeney
acbd4f352b potentially null value was replaced with empty string 2018-04-27 13:56:45 -06:00
Brian Sweeney
4249ea18c6 added resultset to try-catch-with-resourcse 2018-04-27 13:56:03 -06: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
Ann Priestman
c1ecc34773 Added code to check for changed multiuser settings. 2018-04-27 14:39:34 -04:00
William Schaefer
4e2056fcc8 3752 fix url for vericrypt vhd file 2018-04-27 14:21:52 -04:00
William Schaefer
38fbff10d1 3752 add vericrpyt functional test, modify existing encryption test to use Utils 2018-04-27 14:14:54 -04:00
Ann Priestman
e3dc9f2f55 Add message if there is no timing data.
Improve some try with resources blocks.
2018-04-27 14:00:50 -04:00
Raman
97df1d2c21 Addressed Codacy comments. 2018-04-27 13:36:48 -04:00
U-BASIS\dgrove
88f781d247 Completed functional test. 2018-04-27 13:30:54 -04:00
U-BASIS\dgrove
14806f81b4 Merge remote-tracking branch 'upstream/custom-release-may-2018' into 3750_PasswordProtectionAccessDatabases 2018-04-27 12:05:56 -04:00
William Schaefer
1c64c10a01 Merge branch 'custom-release-may-2018' of https://github.com/sleuthkit/autopsy into 3752-EncryptedPartionsFunctionalTest 2018-04-27 12:00:12 -04:00
Ann Priestman
c30120f437 Fixing disabled panel.
cleanup.
2018-04-27 11:46:47 -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
Raman
3f01e351c2 3757: Group views in the case tree by data source
- Removed commented code.
2018-04-27 11:29:13 -04:00
Raman
56ba0edeec Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3757_views_by_datasource 2018-04-27 11:09:16 -04:00
Raman
c05e92aec2 3757: Group views in the case tree by data source 2018-04-27 11:08:46 -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
f18d27c4b2
Merge branch 'release-4.7.0' into release-4.7.0 2018-04-26 22:52:20 -04: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
Ann Priestman
871ce3ead1 Remove testing files and cleanup 2018-04-26 15:09:38 -04:00
Ann Priestman
3fe761185c Bundle messages and cleanup 2018-04-26 14:57:10 -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
William Schaefer
446c3b72eb Merge branch 'custom-release-may-2018' of https://github.com/sleuthkit/autopsy into 3752-EncryptedPartionsFunctionalTest 2018-04-26 14:14:58 -04: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
Ann Priestman
1e3a8c5449 Merge remote-tracking branch 'upstream/custom-release-may-2018' into 3613_dashboard
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/healthmonitor/EnterpriseHealthMonitor.java
2018-04-26 12:41:17 -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
Ann Priestman
f496a20295 Change to use bundle messages 2018-04-26 11:22:14 -04:00
Brian Carrier
46ce69ff8f
Update GenericIngestModuleJobSettings.java 2018-04-26 11:15:51 -04:00