Commit Graph
13409 Commits
Author SHA1 Message Date
Richard Cordovano 03fda5ff13 Merge pull request #3782 from dgrove727/3850_CaseUtilsImprovements
3850 case utils improvements
2018-05-17 11:49:22 -04:00
millmanorama 2662d7b708 Merge remote-tracking branch 'upstream/timeline-event-mgr' into move_ui_code_out_of_tsk
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/timeline/FilteredEventsModel.java
#	Core/src/org/sleuthkit/autopsy/timeline/ShowInTimelineDialog.java
#	Core/src/org/sleuthkit/autopsy/timeline/explorernodes/EventNode.java
#	Core/src/org/sleuthkit/autopsy/timeline/ui/ViewFrame.java
#	Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/EventCountsChart.java
#	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailsChartLane.java
#	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventClusterNode.java
#	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventNodeBase.java
#	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventStripeNode.java
#	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/MultiEventNodeBase.java
#	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/PinnedEventsChartLane.java
#	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/PrimaryDetailsChartLane.java
#	Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListTimeline.java
#	Core/src/org/sleuthkit/autopsy/timeline/zooming/ZoomSettingsPane.java
2018-05-17 16:16:55 +02:00
millmanorama b65c6e4466 WIP CompoundFilterModel 2018-05-17 14:32:32 +02:00
U-BASIS\dgrove 7baa8a8176 Fixed issue affecting EmbeddedFileTest. 2018-05-17 02:19:24 -04:00
U-BASIS\dgrove f741ceabe1 Improved documentation. 2018-05-17 01:05:30 -04:00
U-BASIS\dgrove ea73615a24 Fixed documentation typo. 2018-05-17 01:02:16 -04:00
U-BASIS\dgrove 05077948d2 Merge remote-tracking branch 'upstream/develop' into 3850_CaseUtilsImprovements 2018-05-17 00:55:48 -04:00
U-BASIS\dgrove fe1a278efa CaseUtils API improved. 2018-05-17 00:55:10 -04:00
esaunders 41cfd733f9 Lunacy cleanup. 2018-05-16 17:43:23 -04:00
U-BASIS\dgrove c597985175 Partial implementation. 2018-05-16 16:18:15 -04:00
Raman 5d9424906f Merge branch '3802_group_tree_by_datasource' of https://github.com/raman-bt/autopsy into 3763_new_results_by_datasource 2018-05-16 14:44:28 -04:00
Brian Carrier 04df83dd93 Made name longer 2018-05-16 13:57:41 -04:00
Brian Carrier b1f78c62c6 Fix error interpretting UTF16 because of signed/unsigned issue. Also fixed NetBeans comments 2018-05-16 13:34:15 -04:00
Richard Cordovano a36e56469d Merge branch 'custom-release-may-2018' into 3751_SqlCipherDetection 2018-05-16 11:52:56 -04:00
Mark McKinnon 002b40fb97 Merge remote-tracking branch 'upstream/timeline-event-mgr' into timeline-event-mgr 2018-05-16 08:34:55 -07:00
esaunders ad0c2927cd Merge branch 'custom-release-may-2018' of github.com:sleuthkit/autopsy into 3734_ingest_progress 2018-05-16 11:11:50 -04:00
Richard Cordovano c40fcae982 Merge pull request #3773 from rcordovano/add-bitlocker-detection
Add Bitlocker detection from develop branch
2018-05-16 10:26:55 -04:00
Richard Cordovano ec2aed9db6 Merge branch 'custom-release-may-2018' into 3751_SqlCipherDetection 2018-05-16 10:23:54 -04:00
Raman 5c55a699e6 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3813_view_in_dir_action 2018-05-16 10:12:01 -04:00
Raman f73dad988d 3813: Fix 'View In Directory' context menu action. 2018-05-16 10:03:31 -04:00
Mark McKinnon 1652b3aac2 Initial creation of plaso module
Initial creation of plaso module that will run plaso against an image.
2018-05-16 06:55:32 -07:00
Richard Cordovano 0ab385007f Merge pull request #3775 from dgrove727/3836_IngestUtils
3836 ingest utils
2018-05-16 09:21:25 -04:00
millmanorama 989222549f Merge remote-tracking branch 'upstream/develop' into move_ui_code_out_of_tsk 2018-05-16 12:01:20 +02:00
millmanorama 37d040cdbb continue refactoring FilteState classes 2018-05-16 12:01:08 +02:00
Brian Sweeney 3f215ea582 more wiring 2018-05-15 19:39:44 -06:00
Brian Sweeney 4ae16a6727 default selections changed 2018-05-15 19:33:41 -06:00
Brian Sweeney 0058d69066 more ui stuff 2018-05-15 19:31:40 -06:00
Brian Sweeney 9091ed7748 intercase panel wired in partially 2018-05-15 19:27:36 -06:00
Brian Sweeney 93b64437dc intra case panel wired in 2018-05-15 18:31:26 -06:00
Richard Cordovano d0505cde0a Merge pull request #3771 from APriestman/3791_updateCVTdocs
Added CVT visualization docs.
2018-05-15 18:07:39 -04:00
Brian Sweeney 6ad28c1968 intercase and intracase panel stubs 2018-05-15 15:54:20 -06:00
Richard Cordovano b4c9881bd0 Merge branch 'timeline-event-mgr' into custom_event_types 2018-05-15 17:45:44 -04:00
Richard Cordovano 574ca6c0cc Cosmetic change to EncryptionDetectionTest for travis rebuild 2018-05-15 17:29:05 -04:00
esaunders ed7b4c7c95 Merge branch '3738_job_cancellation' into 3734_ingest_progress 2018-05-15 17:19:13 -04:00
U-BASIS\dgrove 4b01a48dbc Show error messages. 2018-05-15 17:18:17 -04:00
U-BASIS\dgrove 9cd23cdece Updated 'addDataSource()' to handle critical errors. 2018-05-15 16:45:23 -04:00
esaunders 862c6e4e7b Added ingest progress snapshot support to AID. 2018-05-15 13:00:11 -04:00
Richard Cordovano 387f5f697d EncryptionDetectionTest merge fixes 2018-05-15 11:56:21 -04:00
Richard Cordovano 17df5f03a4 Fix merge error in BitLocker detection cherry-pick 2018-05-15 11:38:30 -04:00
Richard Cordovano 4676df8ab9 Adding BitLocker detection to custom release branch 2018-05-15 11:19:50 -04:00
Brian Sweeney 48daecf1ec unused import 2018-05-15 09:19:32 -06:00
U-BASIS\dgrove c2b6b5854b Bitlocker detection implemented. 2018-05-15 11:17:03 -04:00
Brian Sweeney cc18414f4f Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3776-intra-case-tests
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetadata.java
2018-05-15 08:53:39 -06:00
millmanorama 95f5f50ffe WIP 2018-05-15 16:45:04 +02:00
Richard Cordovano 028b0177ce Update functional test code from develop branch 2018-05-15 10:31:48 -04:00
Ann Priestman 115cfde0f9 Added CVT visualization docs.
Fixed some doxygen warnings.
2018-05-15 10:25:51 -04:00
Ann Priestman 430ac5813c Merge remote-tracking branch 'upstream/custom-release-may-2018' into 3801_reduceGraphSpikes
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/healthmonitor/TimingMetricGraphPanel.java
2018-05-15 07:52:45 -04:00
millmanorama 90867690be Merge remote-tracking branch 'upstream/develop' into move_ui_code_out_of_tsk
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionDataSourceIngestModule.java
#	Core/src/org/sleuthkit/autopsy/timeline/FilteredEventsModel.java
#	Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
2018-05-15 11:48:48 +02:00
millmanorama 3c4fe6cee5 remove unused import 2018-05-15 11:41:25 +02:00
millmanorama aea379209a Merge remote-tracking branch 'upstream/develop' into 985-suppress-NPE 2018-05-15 11:31:40 +02:00