Commit Graph
10313 Commits
Author SHA1 Message Date
Brian Sweeney 481099dedd bug in size function 2018-08-31 17:00:49 -06:00
Brian Sweeney 921d6c6f7c comments reformatted 2018-08-31 17:00:05 -06:00
Brian Sweeney d81c82a712 minor merge errors 2018-08-31 15:28:06 -06:00
Brian Sweeney 8ef34cb4d6 Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 4121_correlation_types
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/AllInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/Bundle.properties
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.form
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/IntraCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/SingleInterCaseCommonAttributeSearcher.java
2018-08-31 15:08:59 -06:00
Andrew Ziehl 56156cc7b9 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3870-pure-callable
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/AllInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributeSearchResults.java
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/InterCaseTestUtils.java
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseTestUtils.java
2018-08-29 08:56:55 -07:00
Brian Sweeney 333060bebb ui text added to bundles 2018-08-28 18:15:35 -06:00
Brian Sweeney 59efa9bf0e removed dead code 2018-08-28 17:53:30 -06:00
Brian Sweeney c202db7261 error messages truncated 2018-08-28 17:49:46 -06:00
Andrew Ziehl e5f1936e1f Make outlineView protected so that CommonAttributesSearchResultsViewerTable can add the treelistener itself. 2018-08-28 15:10:51 -07:00
Andrew Ziehl ea29efccf3 Address PR feedback 2018-08-28 13:24:03 -07:00
Andrew Ziehl c113844a3c rename findFiles() to findMatches() since it's more type agnostic. Add code comments. 2018-08-28 11:57:12 -07:00
Andrew Ziehl 5b2ac0ea0c Disable mimetype UI elements. 2018-08-28 11:23:14 -07:00
Andrew Ziehl f8e89a1f57 Adjust bunddle strings, naming from files to attributes, add type to tab title. Bugfix to check for null before adding commonAttributeValue to results. 2018-08-28 11:18:35 -07:00
Brian Sweeney 120b3db105 comparison was backwards 2018-08-28 11:37:19 -06:00
Andrew Ziehl a80efc959d fix spacing issue in query after switching to string builder. 2018-08-28 10:01:40 -07:00
Andrew Ziehl 3bde2744aa Fix for non-file correlation types. Also fies bug where last instance of CR search matches was not added to results. 2018-08-28 09:52:34 -07:00
Andrew Ziehl 1d99ed0e3b Functioning common file search on types. 2018-08-27 16:28:39 -07:00
Andrew Ziehl dc8749d000 Add combobox to intercasePanel. Wire up typing. 2018-08-27 15:31:01 -07:00
Andrew Ziehl 8d847415a2 Merge branch '4102-filter-by-frequency' of https://github.com/briangsweeney/autopsy into 4121_correlation_types
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/AllInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/IntraCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/SingleInterCaseCommonAttributeSearcher.java
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IngestedWithHashAndFileTypeInterCaseTests.java
2018-08-27 15:13:35 -07:00
Andrew Ziehl d0961279cc Revert "Break CommonFilesSearch into two Tab Panels"
This reverts commit cf5f576830.
2018-08-27 15:08:53 -07:00
Brian Sweeney 6681accdc7 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4102-filter-by-frequency
# Conflicts:
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseTestUtils.java
2018-08-27 13:46:02 -06:00
Andrew Ziehl 0a3f8c5773 add code to fill out correlation type filter model, and create a backing Map to lookup the type at time of search. 2018-08-27 07:55:49 -07:00
Andrew Ziehl cf5f576830 Break CommonFilesSearch into two Tab Panels 2018-08-24 13:25:47 -07:00
Andrew Ziehl cf8af26327 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4121_correlation_types
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CentralRepoCommonAttributeInstance.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseSearchResultsProcessor.java
2018-08-24 12:59:08 -07:00
Brian Carrier 8dcb97dc81 Merge pull request #4058 from rishwanth1995/autopsy_option_casedir
added  casedir as optionalargument in live ISO mode
2018-08-23 15:41:10 -04:00
Brian Carrier 0780e23507 Merge pull request #4046 from esaunders/4074_thumbnail_performance
Check extensions first in thumbnailSupported().
2018-08-23 15:31:31 -04:00
Brian Carrier 932832d9bb Merge pull request #4055 from briangsweeney/3863_remove_correlationattribute
3863 remove correlationattribute
2018-08-23 15:28:14 -04:00
Andrew Ziehl 20e0cf6dbd Backend logic changes to incorporate multiple CR types based on yet-to-be implemented UI selection. Decided to pass type into existing classes rather than create new extension classes, for simplicity. 2018-08-23 12:12:24 -07:00
Brian Sweeney 656b4464d4 codacy stuff 2018-08-23 12:59:08 -06:00
Brian Sweeney 4bd5fc4c91 protect against occasional use of unmodifiable collections 2018-08-23 11:58:03 -06:00
Andrew Ziehl f0ec93e069 ignore warning on Type 2018-08-23 10:02:53 -07:00
Brian Sweeney e70fc3210c assertion api changed slightly 2018-08-23 10:47:12 -06:00
Andrew Ziehl 2db51beb69 more codeacy cleanup for CorrelationAttributeInstance 2018-08-23 09:45:58 -07:00
Andrew Ziehl 7f0ba58eab Reduce NPath complexity 2018-08-23 09:37:17 -07:00
Andrew Ziehl e405c3ab98 Address codeacy, remove TODOs from code. 2018-08-23 09:05:10 -07:00
Brian Sweeney 5a2b9c924d Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 4102-filter-by-frequency 2018-08-23 08:06:57 -06:00
Andrew Ziehl 9ec50de216 Codeacy doesn't like reusing the target variable, or having multiple method calls on one line. Does it like this? 2018-08-22 18:04:31 -07:00
Andrew Ziehl a47979ee65 Code review cleanup, codeacy issue fixes. 2018-08-22 17:51:00 -07:00
Brian Sweeney 4be4c67de1 remove nodes with no children from ui 2018-08-22 17:32:55 -06:00
Brian Sweeney 41797943c2 improved conditions for enabling frequency percentage search 2018-08-22 17:21:37 -06:00
Brian Sweeney 6fa58b9ca7 fixed a concurrentmodificationexception when pruning results for frequency percentage search 2018-08-22 17:21:05 -06:00
Brian Sweeney ac31962c95 frequency search tests 2018-08-22 17:20:34 -06:00
Brian Sweeney 4a68eb7e57 updated comments with info pertinent to frequency search tests 2018-08-22 17:19:42 -06:00
Richard Cordovano 6654999950 Merge pull request #4052 from dannysmyda/4130-add-excel-to-selector-module
4130 add excel to selector module
2018-08-22 15:20:05 -04:00
U-BASIS\dsmyda 3b80c792be final codacy suggestions...... 2018-08-22 15:13:43 -04:00
U-BASIS\dsmyda e277931d58 Fixed Codacy issues 2018-08-22 14:05:58 -04:00
Brian Sweeney 92605055b5 typo in tests 2018-08-22 08:34:15 -06:00
Brian Sweeney 2c32fe42e8 fixed all the tests 2018-08-21 17:03:33 -06:00
Brian Sweeney 4cbf9d10e7 had forgotten to hook up the percentage value to the search results 2018-08-21 16:53:01 -06:00
Brian Sweeney 56989e022c text field stays the same size 2018-08-21 15:39:47 -06:00