codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-10-01 23:09:56 +00:00
Code Issues Releases Wiki Activity
24,378 Commits 24 Branches 52 Tags
c3e57475bb22eb4e501d2e0c94de27866ea6753e
Commit Graph
13409 Commits
Author SHA1 Message Date
millmanorama 0545516737 fix merge error in TimeLineController 2018-05-15 11:27:45 +02:00
millmanorama 67e5dde030 fix codacy and compilation issues 2018-05-15 11:23:19 +02:00
millmanorama a30980976b Merge remote-tracking branch 'upstream/develop' into timeline-cache-exception 
# 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:07:03 +02:00
millmanorama a5981a38c5 remove unneeded catch blocks 2018-05-15 11:05:29 +02:00
U-BASIS\dgrove 9fa58b354c Switched TSK_NAME to TSK_COMMENT. 2018-05-14 18:55:10 -04:00
Richard Cordovano 6f80293990 Merge pull request #3749 from zhhl/3779-addDSFilterToFileSearchByattributes 
3779 add data source filter to file search by attributes
 2018-05-14 18:48:24 -04:00
Richard Cordovano cab9b7d999 Merge pull request #3732 from briangsweeney/3668-intra-case-correlation-content-viewer 
3668 intra case correlation content viewer
 2018-05-14 18:47:19 -04:00
Richard Cordovano f4ea3e02a2 Merge pull request #3730 from APriestman/3786_ce_metrics 
Add metrics to correlation engine
 2018-05-14 18:44:52 -04:00
Richard Cordovano 71fc4112cf Merge pull request #3725 from APriestman/3613_dashboard_gridLayout 
3613,3722 Add Health Metrics dashboard and controls
 2018-05-14 18:43:43 -04:00
Brian Sweeney 59f7d30499 reflects new test API 2018-05-14 15:41:21 -06:00
Brian Sweeney 83d91d3e33 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3788-intercase-correlation 2018-05-14 14:22:33 -06:00
Brian Sweeney 0ec209021b reflects new case utils API 2018-05-14 14:20:26 -06:00
Brian Sweeney d5d9216d6c Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3776-intra-case-tests 2018-05-14 14:15:27 -06:00
Brian Sweeney 62ea0399c3 unused imports 2018-05-14 13:29:17 -06:00
Brian Sweeney df68ffebe0 size == 0 changed to isEmpty 2018-05-14 13:28:14 -06:00
Richard Cordovano d9e5b8758a CaseUtils and functional test code fixes 2018-05-14 14:19:31 -04:00
Richard Cordovano 929a58fcc3 Merge remote-tracking branch 'upstream/custom-release-may-2018' into develop 2018-05-14 12:47:49 -04:00
Richard Cordovano 72fd1eb015 Repair Core/build.xml 2018-05-14 12:38:32 -04:00
Richard Cordovano 6fc9f4ed96 Merge remote-tracking branch 'upstream/custom-release-may-2018' into develop 2018-05-14 12:14:39 -04:00
Richard Cordovano 162bd4de8b Merge branch 'develop' into custom-release-may-2018 2018-05-14 12:10:25 -04:00
Richard Cordovano 16a3c88abd Merge pull request #3759 from dgrove727/3834_SevenZipExtractorTskComment 
3834 seven zip extractor tsk comment
 2018-05-14 11:43:50 -04:00
Richard Cordovano 248e724161 Merge pull request #3760 from eugene7646/ocr_via_tika_3760 
OCR via tika (3760)
 2018-05-14 11:38:16 -04:00
Brian Sweeney 42754c5278 Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation 2018-05-14 09:17:07 -06:00
Brian Sweeney 461bc820d7 static fields, descriptive names 2018-05-14 09:15:52 -06:00
Brian Sweeney ac59c3e916 rename a super type 2018-05-14 09:12:14 -06:00
millmanorama f7fda92ca4 Merge remote-tracking branch 'upstream/develop' into custom_event_types 
# 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-14 17:11:50 +02:00
millmanorama 58791f1c42 Merge branch 'timeline-event-mgr' into timeline-cache-exception 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/timeline/FilteredEventsModel.java
#	Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
#	Core/src/org/sleuthkit/autopsy/timeline/actions/ZoomOut.java
#	Core/src/org/sleuthkit/autopsy/timeline/actions/ZoomToEvents.java
#	Core/src/org/sleuthkit/autopsy/timeline/datamodel/EventsRepository.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/PrimaryDetailsChartLane.java
 2018-05-14 17:09:05 +02:00
Brian Sweeney d7e87d7831 try-with-resources 2018-05-14 09:06:32 -06:00
Brian Sweeney e9e3756d40 empty default constructor removed 2018-05-14 09:04:54 -06:00
Brian Sweeney e2dabf4a0e comments 2018-05-14 09:02:04 -06:00
Brian Sweeney 1fe13d2463 Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3776-intra-case-tests 2018-05-14 08:57:19 -06:00
millmanorama 6696d12faa don't show events in the tree. 2018-05-14 13:45:34 +02:00
millmanorama f6c1761133 renamed SingleEvent -> TimelineEvent; move IntervalUtils, RangeDivisionInfo, and ZoomParams back to autopsy. 2018-05-12 13:35:07 +02:00
millmanorama 0803945462 cleanup 2018-05-12 12:59:43 +02:00
millmanorama f2e06ef918 move View specific code to to new model classes 2018-05-12 12:50:54 +02:00
millmanorama c76927220d first pass ass custom events 2018-05-12 10:48:19 +02:00
millmanorama 0c1d5ff992 move some presentation model classes back to autopsy and rename interface 2018-05-12 10:45:14 +02:00
millmanorama ce5a2d0040 first pass ass custom events 2018-05-12 10:45:14 +02:00
Brian Sweeney aa10c0b071 Merge branch '3788-intercase-correlation' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation 2018-05-11 13:13:50 -06:00
Brian Sweeney cc3c666c00 Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3776-intra-case-tests 2018-05-11 12:32:56 -06:00
Brian Sweeney f9fcca7a0b reverted 2018-05-11 12:14:14 -06:00
Raman f5b4dbdfe4 3763: Groups Results by Data source (Interim commit) 
- Group the extracted content subtree by data source
 2018-05-11 14:02:26 -04:00
Brian Sweeney e04569658c test for no mime types 2018-05-11 11:54:21 -06:00
Brian Sweeney 4dc2bf4118 renaming 2018-05-11 11:50:26 -06:00
Brian Sweeney 624e9cc363 these pass - needed a minor tweak 2018-05-11 08:49:10 -06:00
Brian Sweeney 3f0279ed72 added some helper functions and corrected some test cases 2018-05-11 08:45:42 -06:00
U-BASIS\zhaohui fc8fd8b77a 3779: Remove 2018-05-11 10:21:03 -04:00
millmanorama eefecc2c98 change to Blackboard.postArtifact() 2018-05-11 13:01:13 +02:00
millmanorama a8b0b95a7a fix codacy issues 2018-05-11 11:06:14 +02:00
Brian Sweeney 763eb661db tests added, data download issue dealt with, case closed NPE dealt with tentatively 2018-05-10 15:51:03 -06:00