20771 Commits

Author SHA1 Message Date
Andrew Ziehl
d71bfe99fe Remove for loop, add md5 qualifier to AbstractFile lookup 2018-07-24 11:26:38 -07:00
Brian Sweeney
88ab16833d rename some stuff for clarity 2018-07-24 11:57:30 -06:00
Brian Sweeney
fd2d9908f5 renaming 2018-07-24 08:43:55 -06:00
Brian Sweeney
dd44150b99 removed some dead code 2018-07-24 08:28:57 -06:00
Brian Sweeney
898448abc5 npe in certain situations fixed 2018-07-24 08:27:30 -06:00
Brian Sweeney
a41073542c vestigial param removed 2018-07-23 17:44:13 -06:00
Brian Sweeney
a65e43d112 more merge conflicts 2018-07-23 16:15:09 -06:00
Brian Sweeney
d8b4fc878e Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributeSearchResultRootNode.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributeSearchResults.java
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/InterCaseUtils.java
2018-07-23 15:28:10 -06:00
Brian Sweeney
bbd7154153 Merge branch 'commonfiles' of https://github.com/sleuthkit/autopsy into commonfiles 2018-07-23 15:16:52 -06:00
Brian Sweeney
a3d03fa0ba test utils and access modifiers required for testing 2018-07-23 15:10:08 -06:00
Brian Carrier
78eaac2f7f
Merge pull request #3982 from sleuthkit/common_1
minor refactor
2018-07-23 15:17:14 -04:00
Brian Carrier
23a487c190 minor refactor 2018-07-23 14:06:49 -04:00
Brian Carrier
af1380ce98
Merge pull request #3981 from sleuthkit/common_1
minor refactor.  No logic changes
2018-07-23 12:58:23 -04:00
Brian Carrier
5fad7ae67b minor refactor. No logic changes 2018-07-23 12:55:04 -04:00
Brian Sweeney
9d04ef439e names/comments 2018-07-23 10:38:30 -06:00
rishwanth1995
3b8788c952 live_usb warning 2018-07-23 11:58:59 -04:00
Brian Sweeney
8dce2e9477 Merge branch 'commonfiles' of https://github.com/sleuthkit/autopsy into 3788-intercase-intracase-merge 2018-07-23 09:41:07 -06:00
Brian Sweeney
086e57551b notes 2018-07-23 09:39:52 -06:00
Brian Carrier
6774fec151
Merge pull request #3957 from briangsweeney/3788-intercase-intracase-merge
3788 intercase intracase merge
2018-07-23 11:26:04 -04:00
Brian Sweeney
2258e368b3 merge/refactor de-conflicting 2018-07-21 18:11:32 -06:00
Brian Sweeney
2e0b1e0dca these did not merge well 2018-07-21 10:16:38 -06:00
Brian Sweeney
941ae94b15 greater access to tests can see these members 2018-07-21 10:16:19 -06:00
Brian Sweeney
f2c97b8079 cleanup 2018-07-21 09:46:54 -06:00
Brian Sweeney
8c9d03ec60 work in progress 2018-07-21 09:41:28 -06:00
Brian Sweeney
ba24556ac0 cleanup 2018-07-21 09:22:26 -06:00
Brian Sweeney
26987a4c5d polish 2018-07-21 08:53:42 -06:00
Brian Sweeney
cc0639d1d6 cleanup 2018-07-21 08:10:24 -06:00
Brian Sweeney
0396a52b52 comments 2018-07-20 14:49:49 -06:00
Brian Sweeney
f03c675cf2 notes 2018-07-20 14:07:07 -06:00
Brian Sweeney
dd0b41e62d cleanup 2018-07-20 14:06:39 -06:00
U-BASIS\dgrove
f283009c68 Changed form layout to conform with Add Keywords. 2018-07-20 15:02:12 -04:00
Brian Sweeney
2e40856eab fixes a bug where no leaves files were added to the tree because the map was not populated 2018-07-20 08:50:37 -06:00
Brian Carrier
464f1dd5ad
Merge pull request #3977 from APriestman/4058_checkForEDT
Make sure setupTable is called from the EDT
2018-07-20 10:42:12 -04:00
Brian Carrier
ffd45d3bf5 update version 2018-07-20 10:27:42 -04:00
millmanorama
d70802cb62 add tooltip to timeline listview description column 2018-07-20 14:57:32 +02:00
William Schaefer
3bbb3261c9 4040 Associate the user name of who created a tag with that tag 2018-07-19 17:12:37 -04:00
Brian Carrier
8764aeba87
Update TSKVersion.xml 2018-07-19 14:02:04 -04:00
Brian Carrier
0638a6d13c
Merge pull request #3978 from dgrove727/4055_HtmlReportTaggedItemsFixes
Fixed bugs around checkboxes.
2018-07-19 13:57:17 -04:00
Brian Sweeney
1e84766419 these were deleted and i think it was a mistake 2018-07-19 11:52:40 -06:00
Brian Carrier
80cdb999c3
Merge pull request #3976 from wschaeferB/ObjectDetectionObjectClosing
Object detection object closing
2018-07-19 13:49:56 -04:00
Ann Priestman
e98e0db15b Revert to old method of calling setupTabs 2018-07-19 13:41:31 -04:00
Brian Sweeney
61064e4d7f Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge 2018-07-19 11:06:28 -06:00
Brian Sweeney
7df457b5e3 polish 2018-07-19 11:02:33 -06:00
U-BASIS\dgrove
5ab3050362 Fixed bugs around checkboxes. 2018-07-19 11:15:33 -04:00
Ann Priestman
771f8489a8 Moved EDT check up to setNode() 2018-07-19 11:03:41 -04:00
Ann Priestman
e970e8b71c Make sure setupTable is called from the EDT 2018-07-19 10:59:30 -04:00
William Schaefer
fb28c62d60 4037 add explicit calls to release opencv objects to avoid reliance on finalize method 2018-07-19 09:57:20 -04:00
William Schaefer
fad0f57406 4037 introduce max file size to object detection module (100 mb) 2018-07-19 09:57:11 -04:00
William Schaefer
8d546a217e remove unnecessary imports from Object detection 2018-07-19 09:56:58 -04:00
William Schaefer
04068dd492 4037 entirely remove unnecessary input stream in Object Detection 2018-07-19 09:56:42 -04:00