Commit Graph
10057 Commits
Author SHA1 Message Date
Brian Sweeney 882ac439c4 Merge branch '4071_populate_searchresults' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/AbstractCommonAttributeInstance.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CentralRepoCommonAttributeInstance.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseSearchResultsProcessor.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/IntraCasePanel.java
2018-08-03 11:21:16 -06:00
Brian Sweeney 547c981445 Merge branch '4070_remove_db_methods' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/IntraCasePanel.java
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDatamodelTest.java
2018-08-03 10:58:15 -06:00
Brian Sweeney 3bffd2017a Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseCommonAttributeSearcher.java
2018-08-03 10:34:29 -06:00
Richard Cordovano 7a60aba429 Revert "Revert "4072 remove cache"" 2018-08-03 11:15:28 -04:00
Richard Cordovano cde3d8dd1f Revert "4072 remove cache" 2018-08-03 11:03:02 -04:00
Andrew Ziehl 9163256cd3 Refactoring 2018-07-31 15:54:33 -07:00
Andrew Ziehl 35d5df5ebc Cleanup excess fields. 2018-07-31 15:32:32 -07:00
Andrew Ziehl 6ee9ed54bd cleanup logic, functionally complete 2018-07-31 15:20:35 -07:00
Andrew Ziehl 075b76e8bf logic overhaul to reduce manipulation and building of hashmaps. 2018-07-31 11:46:44 -07:00
Brian Sweeney 8d3aeff77f codacy suggestions 2018-07-31 11:00:13 -06:00
Andrew Ziehl 137aae131d Sqlite where cluase wasn't passed in. 2018-07-31 09:17:27 -07:00
Andrew Ziehl f0a87e43e5 Add code commments for IntraCasePanel in conjuction with the previous bugfix. 2018-07-31 08:14:41 -07:00
Brian Sweeney cd502079f6 rename 2018-07-27 10:55:09 -06:00
Brian Sweeney b570830d1b need to check for existance of eamdb before trying getinstance 2018-07-26 17:32:54 -06:00
Brian Sweeney 441230d3e9 and the tests are fixed 2018-07-26 17:19:23 -06:00
Brian Sweeney 94f0dfbee1 cleared up bugs illuminated by removing the file cache for the inter case leaf notes 2018-07-26 17:16:11 -06:00
Andrew Ziehl 5bad6cff78 Cleanup and add tests, add null check. 2018-07-26 12:57:24 -07:00
Andrew Ziehl 9ee4f8d44f fix bug where intracase datasource was not initialized. 2018-07-26 12:38:25 -07:00
Andrew Ziehl 08ad7eeba1 remove EamDb publicly accessible methods, replace with a single generic processInstanceTableWhere mmethod which takes a query string. 2018-07-26 12:07:27 -07:00
Brian Sweeney 178b48ecb7 comments 2018-07-26 10:04:18 -06:00
Brian Sweeney 29150018f3 fixes non-critical bug that still would sometimes throw an exception 2018-07-26 10:03:05 -06:00
Brian Sweeney c30ed1f251 build script modified to include intercase correleation test data 2018-07-26 08:56:46 -06:00
Brian Sweeney 23f48b0d33 cleanup 2018-07-26 08:29:09 -06:00
Brian Sweeney 5e9401186e dead code removed and other cleanup 2018-07-26 08:21:24 -06:00
Brian Sweeney 331ed172d5 full removal of abstract file cache for leaf node generation 2018-07-25 17:10:53 -06:00
Andrew Ziehl 12ba928564 Remove AbstractFile from constructor 2018-07-25 14:30:25 -07:00
Andrew Ziehl c93ab554c9 Merge branch '3788-intercase-intracase-merge' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
# Conflicts:
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDatamodelTest.java
2018-07-25 14:25:04 -07:00
Andrew Ziehl e2a5a17746 fix merge conflict of test removal 2018-07-25 14:23:53 -07:00
Brian Sweeney 80feccdbca comments and cleanup 2018-07-25 14:57:40 -06:00
Brian Sweeney 92cf85efa3 this test is obsolete 2018-07-25 14:55:00 -06:00
Brian Sweeney 948bd3d2b3 git screwed this up 2018-07-25 14:54:46 -06:00
Brian Sweeney cc34a759b4 Merge branch '3788-intercase-intracase-merge' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge 2018-07-25 13:34:54 -06:00
Brian Sweeney 188d63ea72 test cases for intercase correlation 2018-07-25 10:50:55 -06:00
Andrew Ziehl 1057c70cb6 Clean logic to return proper AbstractFile, including specific match if one exists. 2018-07-25 08:27:50 -07:00
Andrew Ziehl 672d1eea02 Merge branch '3788-intercase-intracase-merge' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
# Conflicts:
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDatamodelTest.java
2018-07-24 15:50:53 -07:00
Andrew Ziehl d6f3e79b47 4070 wip 2018-07-24 15:50:02 -07:00
Brian Sweeney 0468b6bd59 base case functioning correctly 2018-07-24 16:17:26 -06:00
Brian Sweeney 25f7cc5ef5 may still need this variable? 2018-07-24 13:58:18 -06:00
Brian Sweeney 8e7825de5f cleanup 2018-07-24 13:56:45 -06:00
Brian Sweeney a758fbe779 comment out broken stuff for the moment 2018-07-24 12:42:52 -06:00
Andrew Ziehl 944758225b Merge branch '3788-intercase-intracase-merge' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge 2018-07-24 11:29:29 -07:00
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