20108 Commits

Author SHA1 Message Date
William Schaefer
6bc92a2e11 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3845-ObjectDetectionModule 2018-05-21 16:47:20 -04:00
William Schaefer
13402bc358 3845 initial version of object detection module 2018-05-21 16:47:09 -04:00
Andrew Ziehl
d84ef1c250 Merge branch '3788-intercase-correlation' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation 2018-05-21 12:43:47 -07:00
Andrew Ziehl
ada7ec2bc0 Polish and minor refactors 2018-05-21 12:43:40 -07:00
U-BASIS\dgrove
ffc44f9258 Merge remote-tracking branch 'upstream/develop' into 3846_AddViewCommentsCentralRepository 2018-05-21 15:21:02 -04:00
U-BASIS\zhaohui
f9104f22be 3844: Use full file name 2018-05-21 15:20:36 -04:00
Brian Sweeney
c9d50672fd Merge branch '3788-intercase-correlation' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation 2018-05-21 13:17:24 -06:00
Brian Sweeney
6dd5324ebf missing import 2018-05-21 13:17:09 -06:00
Andrew Ziehl
1a0b0a4a86 Merge branch '3788-intercase-correlation' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation 2018-05-21 12:15:02 -07:00
Andrew Ziehl
40f813721d cleanup query unused code, fix case:datasource string. 2018-05-21 12:14:52 -07:00
Brian Sweeney
cf5e2e1597 Merge branch '3776-intra-case-tests' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
2018-05-21 13:12:47 -06:00
U-BASIS\zhaohui
81f2e72148 3844: Fix issues that Codacy reported 2018-05-21 14:58:40 -04:00
U-BASIS\zhaohui
37e5fc2a7a 3844: Fix issues that Codacy reported 2018-05-21 14:24:12 -04:00
Brian Sweeney
1f5b75bf13 Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation 2018-05-21 12:10:22 -06:00
U-BASIS\zhaohui
38914f1210 3844: Export SQLite table as Csv 2018-05-21 14:09:12 -04:00
Brian Sweeney
4e13a6d97f updated to latest api calls 2018-05-21 11:52:55 -06:00
Brian Carrier
7f2902020e
Merge pull request #3792 from sleuthkit/cr_cleanup
Cr cleanup
2018-05-21 13:47:12 -04:00
Brian Carrier
44ec372fab updated javadoc 2018-05-21 13:46:02 -04:00
Brian Carrier
f0a11ed9a8 remove dead and confusing code 2018-05-21 13:43:38 -04:00
Brian Sweeney
409e0bd985 Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3776-intra-case-tests 2018-05-21 09:45:08 -06:00
Brian Sweeney
337c7b549e statement built for multiple values of md5 2018-05-21 09:14:42 -06:00
Ann Priestman
69c2af727b Fixing typos 2018-05-21 08:40:12 -04:00
Raman
068e898f18 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3762_tags_by_datasource 2018-05-21 07:32:22 -04:00
Andrew Ziehl
fc2b32f81d use setArray instead 2018-05-20 15:34:35 -07:00
Andrew Ziehl
99a2ea5660 Merge branch '3788-intercase-correlation' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation 2018-05-20 14:41:19 -07:00
Andrew Ziehl
81de68bd06 Collection fixes instead of ArrayList conversion. 2018-05-20 14:41:04 -07:00
Brian Sweeney
2eaf1f633e default checkbox got unset 2018-05-20 14:54:09 -06:00
Andrew Ziehl
fb6c68a8ef Merge branch '3788-intercase-correlation' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation 2018-05-20 13:48:17 -07:00
Andrew Ziehl
df4ec0b17e Revert "Update EamDb query to utilize currentCase instead of list of md5s."
This reverts commit 31a5e2f40e95fd2220278c2c69e267336ce4be02.
2018-05-20 13:48:09 -07:00
Brian Sweeney
a799aa1b12 missing exception declaration 2018-05-20 14:47:31 -06:00
Andrew Ziehl
a69a04ec26 Merge branch '3788-intercase-correlation' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation 2018-05-20 13:22:14 -07:00
Andrew Ziehl
31a5e2f40e Update EamDb query to utilize currentCase instead of list of md5s. 2018-05-20 13:21:58 -07:00
Brian Sweeney
4b5d2df7f8 wired metadatabuilders into search button and performed some minor refactors 2018-05-20 14:20:28 -06:00
Brian Sweeney
49636bcca1 more layout tweaks 2018-05-20 10:48:29 -06:00
Brian Sweeney
cbf1f4566c default radio buttons and card layout toggling fixed 2018-05-20 08:36:06 -06:00
Brian Sweeney
fd84929d5f layout tweaks 2018-05-19 15:20:51 -06:00
Brian Sweeney
45c8a443c1 checking various conditions to see what searches we can support 2018-05-18 20:41:39 -06:00
Brian Sweeney
245fbfe670 layout and wording on dialog box 2018-05-18 17:31:06 -06:00
Brian Sweeney
048148b2bd error messages 2018-05-18 17:07:02 -06:00
Brian Sweeney
7eba590211 action enabled for conditions which consider eamdb as well 2018-05-18 17:04:01 -06:00
Richard Cordovano
d0308d2b91
Merge pull request #3790 from dgrove727/3850_CaseUtilsImprovements_2a
Keep case directory when test fails.
2018-05-18 16:51:50 -04:00
U-BASIS\dgrove
9ecaa0d34b Keep case directory when test fails. 2018-05-18 16:09:43 -04:00
Richard Cordovano
629df2e084
Merge pull request #3789 from APriestman/3791_encryptionDocs
Update encryption detection module settings
2018-05-18 16:08:43 -04:00
Ann Priestman
63a07cf1e1 Update encryption detection module settings 2018-05-18 15:58:52 -04:00
Raman
22a119a130 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3763_new_results_by_datasource 2018-05-18 15:37:56 -04:00
Raman
63add9d2b7 3763: Group Results by data source 2018-05-18 15:36:55 -04:00
U-BASIS\dgrove
3be3f00c2a Instance ID populated; comments saved to instances. 2018-05-18 15:29:00 -04:00
Brian Sweeney
ed15f81a97 error messages 2018-05-18 12:31:41 -06:00
Brian Carrier
c75adf1df9
Merge pull request #3788 from rishwanth1995/remove_jar_warnings
removed sqlite-jar warnings
2018-05-18 13:45:20 -04:00
rishwanth1995
0ba2be590e removed sqlite-jar warnings 2018-05-18 13:36:02 -04:00