9078 Commits

Author SHA1 Message Date
Richard Cordovano
d9e5b8758a CaseUtils and functional test code fixes 2018-05-14 14:19:31 -04:00
Richard Cordovano
929a58fcc3 Merge remote-tracking branch 'upstream/custom-release-may-2018' into develop 2018-05-14 12:47:49 -04:00
Richard Cordovano
72fd1eb015 Repair Core/build.xml 2018-05-14 12:38:32 -04:00
Richard Cordovano
6fc9f4ed96 Merge remote-tracking branch 'upstream/custom-release-may-2018' into develop 2018-05-14 12:14:39 -04:00
Richard Cordovano
162bd4de8b
Merge branch 'develop' into custom-release-may-2018 2018-05-14 12:10:25 -04:00
Richard Cordovano
16a3c88abd
Merge pull request #3759 from dgrove727/3834_SevenZipExtractorTskComment
3834 seven zip extractor tsk comment
2018-05-14 11:43:50 -04:00
Richard Cordovano
248e724161
Merge pull request #3760 from eugene7646/ocr_via_tika_3760
OCR via tika (3760)
2018-05-14 11:38:16 -04:00
U-BASIS\dgrove
f9b2a8601f Merge remote-tracking branch 'upstream/develop' into 3834_SevenZipExtractorTskComment 2018-05-10 15:54:09 -04:00
U-BASIS\dgrove
b4a069e998 Switched TSK_NAME to TSK_COMMENT. 2018-05-10 15:53:51 -04:00
U-BASIS\dgrove
fdb725188c Fixed Codacy issue with appending String literals. 2018-05-10 11:43:17 -04:00
U-BASIS\dgrove
9c4cbae4c4 Fixed Codacy issues. 2018-05-10 11:21:15 -04:00
Eugene Livis
50d635a42a Merge branch 'develop' of github.com:sleuthkit/autopsy into ocr_via_tika_3760 2018-05-10 11:06:01 -04:00
U-BASIS\dgrove
702f46d911 Merge remote-tracking branch 'upstream/develop' into 3784_BitlockerDetection 2018-05-10 10:49:28 -04:00
Richard Cordovano
43a313253f
Merge pull request #3743 from wschaeferB/3752-EncryptedPartitionTest
3752 encrypted partition test
2018-05-09 17:26:59 -04:00
Richard Cordovano
4eefd2deeb
Merge pull request #3750 from rishwanth1995/disable_vmdkfiles_mac
Disable vmdkfiles in ImageFilePanel's filechooser mac
2018-05-09 17:13:21 -04:00
Richard Cordovano
cfb84568ba Merge remote-tracking branch 'upstream/custom-release-may-2018' into develop 2018-05-09 17:12:46 -04:00
Richard Cordovano
8f7fd27bc0
Merge pull request #3716 from rishwanth1995/release-4.7.0
added a generic settings file for python modules
2018-05-09 17:07:37 -04:00
William Schaefer
7aefbcbfe6 3752 remove local_files_test.zip 2018-05-09 16:19:19 -04:00
Richard Cordovano
6982f05cbc
Merge pull request #3751 from wschaeferB/3830-FixEventBusUnregisterCalls
3830 call eventbus.unregister on object given as arg instead of 0
2018-05-09 16:18:01 -04:00
Eugene Livis
218725b9d1 Merge branch 'develop' of github.com:sleuthkit/autopsy into ocr_via_tika_3760 2018-05-09 15:42:58 -04:00
U-BASIS\dgrove
c393569ab2 Merge. 2018-05-09 14:02:32 -04:00
U-BASIS\dgrove
ba6e2dbd0c Merge remote-tracking branch 'upstream/develop' into 3803_EncryptionSuspectedTskComment 2018-05-09 13:49:37 -04:00
William Schaefer
b72439141c 3752 remove empty setup method for Encrypted partition test 2018-05-09 12:47:16 -04:00
U-BASIS\dgrove
b8ec65adbc Bitlocker detection implemented. 2018-05-08 18:22:08 -04:00
William Schaefer
03ceae4c97 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3830-FixEventBusUnregisterCalls 2018-05-08 17:32:10 -04:00
William Schaefer
8ba0d716a3 3752 resolve merge conflict regarding getCurrentCaseThrows fix 2018-05-08 17:28:09 -04:00
rishwanth1995
fdd68cea37 disable vhdi and vmdk from filechooser 2018-05-08 16:51:54 -04:00
William Schaefer
650de50969 fix additional test related merge refactoring issues 2018-05-08 16:37:34 -04:00
William Schaefer
7c96bc0713 3752 change calls to getOpenCase to getCurrentCaseThrows 2018-05-08 16:31:10 -04:00
William Schaefer
a06cfb3c0c Fix merge error, updating getOpenCase to getCurrentCaseThrows in encryption detection test 2018-05-08 16:22:06 -04:00
William Schaefer
2f443ca6d3 Fix merge error, updating getOpenCase to getCurrentCaseThrows in encryption detection test 2018-05-08 16:20:26 -04:00
William Schaefer
49926828d4 3830 call eventbus.unregister on object given as arg instead of 0 2018-05-08 15:31:14 -04:00
William Schaefer
7446e82e3e 3752 remove comment about disabled test now that it is not disabled 2018-05-08 15:13:18 -04:00
William Schaefer
3965adbc97 Merge branch 'custom-release-may-2018' of https://github.com/sleuthkit/autopsy into 3752-EncryptedPartitionTest 2018-05-08 15:11:29 -04:00
William Schaefer
58b6f2da85 3752 enable Veracrypt test because of sleuthkit changes in 3820 2018-05-08 15:11:10 -04:00
Eugene Livis
31695a9ad8 Merge branch 'develop' of github.com:sleuthkit/autopsy into ocr_via_tika_3760 2018-05-08 12:51:34 -04:00
Andrew Ziehl
bc00fc95fd Fix for postgres String handling of mime_type query 2018-05-07 17:43:06 -06:00
Richard Cordovano
356ca9e1c3 Merge in custom-release-may-2018 branch and resolve conflicts 2018-05-07 16:08:40 -04:00
Richard Cordovano
523c2929f9 Merge in custom-release-may-2018 branch and resolve conflicts 2018-05-07 15:24:55 -04:00
Richard Cordovano
2c500be5bb Merge in release 4.7.0 branch 2018-05-07 15:17:26 -04:00
Richard Cordovano
2738ebfbea Merge in release-4.7.0 branch and resolve conflicts 2018-05-07 14:14:12 -04:00
William Schaefer
63518b5ad7 3752 re-disable veracrypt test after confirming it sometimes works following name changes 2018-05-07 12:08:53 -04:00
William Schaefer
5347514f61 3752 fix misspelled veracrypt names and files 2018-05-07 12:05:04 -04:00
William Schaefer
029cd46624 3752 make the Vericrypt test be ignored for the time being due to 3820 2018-05-07 11:04:50 -04:00
William Schaefer
82303be400 3752 fix merge conflicts between custom release may and 3752 2018-05-07 10:46:34 -04:00
Richard Cordovano
e5955ac542 Case.getCurrentOpenCase => getCurrentCaseThrows 2018-05-07 10:46:24 -04:00
Richard Cordovano
bedcaf6251 Restore ability to have a result view panel with no content view (Codacy fixes) 2018-05-04 18:42:04 -04:00
Richard Cordovano
82d9482f8c Restore ability to have a result view panel with no content view 2018-05-04 17:52:08 -04:00
Richard Cordovano
5cf5159ff9 Restore ability to have a result view panel with no content view 2018-05-04 17:49:38 -04:00
Richard Cordovano
d84bdf2c50 Restore ability to have a result view panel with no content view 2018-05-04 17:47:11 -04:00