Commit Graph
18187 Commits
Author SHA1 Message Date
Brian Sweeney 6ad28c1968 intercase and intracase panel stubs 2018-05-15 15:54:20 -06:00
Brian Sweeney 48daecf1ec unused import 2018-05-15 09:19:32 -06:00
Brian Sweeney 83d91d3e33 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3788-intercase-correlation 2018-05-14 14:22:33 -06:00
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
Brian Sweeney 42754c5278 Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation 2018-05-14 09:17:07 -06:00
Richard Cordovano 7903ad0710 Merge pull request #3768 from sleuthkit/release-4.7.0
Minor updates to documentation
2018-05-14 10:25:19 -04:00
Richard Cordovano bb150ed295 Merge pull request #3755 from dgrove727/3784_BitlockerDetection
3784 bitlocker detection
2018-05-11 18:37:05 -04:00
Brian Sweeney aa10c0b071 Merge branch '3788-intercase-correlation' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation 2018-05-11 13:13:50 -06:00
Eugene Livis 5843d8e7b1 Addressed code review comments 2018-05-11 14:26:14 -04:00
Richard Cordovano 6ce3e7f3cf Merge pull request #3758 from zhhl/3827-updateTestScript
3827: Update regression.py to take care of the new platform structure.
2018-05-11 11:35:38 -04:00
Brian Carrier a0dba7a232 Merge pull request #3764 from rishwanth1995/setupsleuthkitbranch_ci
added python script to setup sleuthkit branch in appveyor and travis
2018-05-11 11:22:42 -04:00
Brian Carrier 5dbe8469b4 Updated comments. 2018-05-11 11:22:24 -04:00
rishwanth1995 496875b8d5 changed algorithm for sleuthkit branches 2018-05-11 10:12:41 -04:00
Brian Carrier 804682b34b Merge pull request #3761 from rishwanth1995/launch_Script_bootable
cleanup bootable script
2018-05-10 16:54:37 -04:00
rishwanth1995 c1e8df66d5 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into setupsleuthkitbranch_ci 2018-05-10 16:43:38 -04:00
rishwanth1995 d1e7dd3ec0 cleanup bootable script 2018-05-10 16:39:41 -04:00
Eugene Livis 4b9ec66708 Merge branch 'develop' of github.com:sleuthkit/autopsy into ocr_via_tika_3760 2018-05-10 16:02:39 -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\zhaohui c32b4f5dc0 3827: Update regression.py to take care of the new platform structure. 2018-05-10 15:28:29 -04:00
U-BASIS\dgrove 7554815580 Merge remote-tracking branch 'upstream/develop' into 3784_BitlockerDetection 2018-05-10 14:35:11 -04:00
Eugene Livis 9d34250941 Added more comments 2018-05-10 12:45:21 -04:00
Eugene Livis 18546ec8b4 Enabled OCR for PDFs 2018-05-10 12:34:34 -04:00
Brian Carrier d3948ae87d modified script a bit and moved it 2018-05-10 12:25:51 -04:00
Eugene Livis 068bf86c48 Only using OCR for English language 2018-05-10 11:55:01 -04:00
Brian Carrier ddb6c5a65a Merge pull request #3745 from rishwanth1995/configdir_paladins
Used Dialog to prompt user about where to write config data for Linux Boot CD
2018-05-10 11:52:58 -04:00
Eugene Livis a8bb28b4f3 Bug fixes 2018-05-10 11:52:31 -04:00
U-BASIS\dgrove fdb725188c Fixed Codacy issue with appending String literals. 2018-05-10 11:43:17 -04:00
Richard Cordovano 01995825d0 Fix merge error in AutoIngestManager.java 2018-05-10 11:28:39 -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
Eugene Livis 1b36fe3a43 Added ability to enable/disable OCR via KWS options panel 2018-05-10 11:05:31 -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 7f69c1176c 3752 update .gitignore to ignore data dir 2018-05-09 16:24:24 -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
Richard Cordovano cb4745854b Merge pull request #3739 from dgrove727/3803_EncryptionSuspectedTskComment
TSK_COMMENT added.
2018-05-09 16:06:33 -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