Commit Graph
24378 Commits
Author SHA1 Message Date
millmanorama c1272982b3 Merge remote-tracking branch 'raman/1010-ig-by-datasource' into 1010/7-datasource-filtering-merged 2018-08-27 11:57:49 +02:00
millmanorama 60d8939247 Merge remote-tracking branch 'upstream/timeline-event-mgr' into postArtifacts_fallout_KWS 2018-08-27 11:52:57 +02:00
millmanorama c1f996800f move button and refactor the Toolbar controller slightly 2018-08-27 11:32:06 +02:00
Brian Sweeney c829b57ec9 first pass at fixing all the merge conflicts 2018-08-24 17:18:59 -06:00
William Schaefer 7441735140 4114 clean up codacy suggestions 2018-08-24 17:49:49 -04:00
William Schaefer 12d92dd121 4114 fix comment checking following merge conflicts 2018-08-24 17:24:14 -04: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
William Schaefer eb9e93e39c 4114 resolve new merge conflict with develop 2018-08-24 15:58:38 -04:00
Brian Sweeney 33837e8d18 Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3868-normalize-cr
# Conflicts:
#	Core/nbproject/project.xml
#	Core/src/org/sleuthkit/autopsy/centralrepository/AddEditCentralRepoCommentAction.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrenceNodeInstanceData.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttribute.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamDb.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/SqliteEamDb.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseSearchResultsProcessor.java
#	Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDatamodelTest.java
2018-08-24 09:00:44 -06:00
Brian Carrier 8be5aee34a Merge pull request #4047 from millmanorama/postArtifacts_recent_activity
use the new Blackboard.postArtifacts API in recent activity
2018-08-24 10:46:36 -04:00
millmanorama 436ad753d5 fix datasource filtering weh All is seleceted 2018-08-24 15:29:40 +02:00
millmanorama 6b2a120c6a minor refactoring 2018-08-24 15:14:55 +02:00
Raman 3fd4419a4b Updated comment. 2018-08-24 08:39:54 -04:00
millmanorama aeff964579 cleanup SQL 2018-08-24 12:42:27 +02:00
millmanorama 28e27fa564 keep toolbar datasource in sync with groupmanager 2018-08-24 12:42:16 +02:00
millmanorama 659a86bb63 don't show datasource chooser if there is only ony datasource 2018-08-24 12:34:13 +02:00
millmanorama 0fc0b1347c improve initial dialog 2018-08-24 12:24:11 +02:00
millmanorama 894209cc2d Merge branch '1017-datasource-UI' into 1010/7-datasource-filtering-merged
# Conflicts:
#	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupKey.java
#	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
2018-08-24 11:47:44 +02:00
millmanorama 3055576f06 move dialog display. 2018-08-24 10:52:27 +02:00
Brian Sweeney cebb79822e validation modifications and test code modifications 2018-08-23 17:53:21 -06: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 ed9251ba35 Merge pull request #4050 from rishwanth1995/live_Cd_Files
added live cd files to unix folder
2018-08-23 15:37:15 -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
William Schaefer 4fd868b62c Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4114-AddHasCommentColumn 2018-08-23 13:42:29 -04:00
William Schaefer f701afa120 4114 make CommentChangedEvent more friendly towards being used between cases in the future 2018-08-23 13:38:52 -04:00
Raman fd6c014c9d 1010: Filter by datasource, for path based groups only. 2018-08-23 13:28:32 -04:00
Andrew Ziehl f0ec93e069 ignore warning on Type 2018-08-23 10:02:53 -07:00
William Schaefer 54ef9467d6 4114 fix bug with data source virtual directory having comment column 2018-08-23 12:50:47 -04: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
William Schaefer e4d5128c39 4114 fix bug due to incorrect clean up of adding Comment column 2018-08-23 11:51:25 -04:00
millmanorama 81a0fa511d datasource popup and WIP wiring of selected values 2018-08-23 17:06:58 +02: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
millmanorama 5bf5db7a92 sync datasources in IG toobar as they are added/removed 2018-08-23 15:30:35 +02:00
millmanorama 7191173aa8 deal with TODOs and some other small cleanup 2018-08-23 12:45:23 +02:00
millmanorama a7403df5e4 Merge branch 'timeline-event-mgr' into postArtifacts_fallout_KWS 2018-08-23 11:57:59 +02:00
millmanorama aacd6d99ba a bit more cleanup 2018-08-23 11:57:35 +02:00
millmanorama de51946bac remove todo 2018-08-23 11:38:14 +02: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