18529 Commits

Author SHA1 Message Date
U-BASIS\dgrove
e639d02fd6 Fixed merge conflicts. 2018-05-10 11:41:57 -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
millmanorama
5e7dddc8d8 improve comment 2018-05-10 16:28:41 +02:00
U-BASIS\zhaohui
c50ece29d7 3779: Fix typo 2018-05-10 10:05:46 -04:00
Ann Priestman
8495e6e204 Codacy fixes 2018-05-10 08:04:53 -04:00
Richard Cordovano
7195a146a6
Fix spelling errors in VisualizationPanel.java 2018-05-09 18:16:15 -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
U-BASIS\dgrove
1580a07d77 Removed SQLCipher encryption TSK_COMMENT. 2018-05-09 16:23:29 -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
Andrew Ziehl
d1fa7c0cd1 Codeacy cleanup 2018-05-09 12:46:37 -07: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
Andrew Ziehl
5bc8c4bbcf Add md5 null check, update to use of getCurrentCase() API usage 2018-05-09 12:26:38 -07:00
Andrew Ziehl
f9f64407da
Merge branch 'develop' into 3668-intra-case-correlation-content-viewer 2018-05-09 12:09:43 -07:00
Ann Priestman
d606c99305 Change max date range to one month.
Only get entries from data base that are less than a month old.
2018-05-09 14:23:29 -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
U-BASIS\dgrove
aed9b69538 SQLCipher detection functionality and test finished. 2018-05-09 13:23:09 -04:00
Ann Priestman
8a40ed22f4 Merge remote-tracking branch 'origin/3613_dashboard_gridLayout' into 3613_dashboard_gridLayout 2018-05-09 12:56:07 -04:00
Ann Priestman
8a8484db68 Add option to display one day of data 2018-05-09 12:54:43 -04:00
William Schaefer
b72439141c 3752 remove empty setup method for Encrypted partition test 2018-05-09 12:47:16 -04:00
rishwanth1995
8df35680ed added python script to setup sleuthkit branch in appveyor and travis 2018-05-09 10:28:46 -04:00
rishwanth1995
029d040cb0 added setupconfigdirectory script 2018-05-09 09:35:39 -04:00
U-BASIS\dgrove
1a0ab488f1 Merge. 2018-05-08 23:22:20 -04:00
U-BASIS\dgrove
b8ec65adbc Bitlocker detection implemented. 2018-05-08 18:22:08 -04:00
esaunders
4e35ec69be Lunacy fix. 2018-05-08 18:05:36 -04:00
U-BASIS\zhaohui
9f78d8bb35 3779: Updates according the comments. 2018-05-08 18:02:54 -04:00
esaunders
544c052485 Remove unused imports. 2018-05-08 17:55:51 -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
esaunders
791d5bfd39
Merge pull request #3752 from wschaeferB/ChangeGetOpenCaseInTest
Fix merge error, updating getOpenCase to getCurrentCaseThrows
2018-05-08 17:25:15 -04:00
esaunders
70fae68153
Merge pull request #3753 from wschaeferB/ChangeGetOpenCaseInTest-Develop
Fix merge error, updating getOpenCase to getCurrentCaseThrows
2018-05-08 17:24:37 -04:00
Andrew Ziehl
664984102f PR fixes. 2018-05-08 14:19:30 -07:00
U-BASIS\zhaohui
76f26b90da Merge remote-tracking branch 'upstream/develop' into 3779-addDSFilterToFileSearchByattributes 2018-05-08 17:16:17 -04:00
rishwanth1995
fdd68cea37 disable vhdi and vmdk from filechooser 2018-05-08 16:51:54 -04:00
esaunders
9cfb2ac560 Attempt to get a wait cursor and fix for case deletion events not being handled. 2018-05-08 16:45:37 -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