codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-19 17:21:46 +00:00
Code Issues Releases Wiki Activity
22,554 Commits 24 Branches 52 Tags
77cfb5faa2513eb2c0777258b03372ed9b50fa17
Commit Graph
22554 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
millmanorama 77cfb5faa2 Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1150-limit_plaso_workers 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java
 2019-04-16 13:10:55 +02:00
Richard Cordovano c819ad739a Merge pull request #4636 from millmanorama/1135-plaso_status 
1135 plaso progress messages in UI
 2019-04-10 17:38:45 -04:00
Richard Cordovano 277717b8d6 Merge pull request #4632 from millmanorama/1124_disable_plaso_by_default 
1124 set Plaso module disabled by default
 2019-04-10 17:38:20 -04:00
Richard Cordovano d7c9c62e65 Merge pull request #4626 from millmanorama/1215-datasource-query 
1215 use simpler query from sleuthkit to determine datasources for the fil…
 2019-04-10 17:37:51 -04:00
Richard Cordovano 5885e3da89 Merge pull request #4593 from millmanorama/1192-manually_created_events 
1192 manually created events
 2019-04-10 17:37:17 -04:00
Richard Cordovano cd2e7159a0 Merge pull request #4672 from millmanorama/1216-drop-immutablesets 
1216 fix merge
 2019-04-04 11:19:22 -04:00
millmanorama ca14a06d8a refactor to fix codacy issues. 2019-04-03 17:21:13 +02:00
millmanorama 2a7d1a1f84 Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1192-manually_created_events 2019-04-03 16:20:55 +02:00
millmanorama 55eecf4508 fix getClusters() by making sorted set with explicit comparator. 2019-04-03 15:10:40 +02:00
Richard Cordovano 182db4dc02 Merge pull request #4614 from millmanorama/1216-drop-immutablesets 
1216 drop immutablesets
 2019-04-03 08:09:33 -04:00
millmanorama 567f9c59bb fix merge 2019-04-03 14:08:22 +02:00
millmanorama 2754102d86 fix merge 2019-04-03 14:06:16 +02:00
millmanorama afaa098a49 Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1216-drop-immutablesets 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventClusterNode.java
#	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/EventCluster.java
#	Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/EventStripe.java
 2019-04-03 13:54:38 +02:00
millmanorama 3a62cd765d Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1192-manually_created_events 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/timeline/explorernodes/EventNode.java
 2019-04-03 13:28:45 +02:00
Richard Cordovano aa85a45755 Merge pull request #4547 from millmanorama/1157-collapse_file_events 
1157 collapse file events
 2019-04-02 11:13:19 -04:00
millmanorama 10e0b60117 limit plaso to 2 workers 2019-03-29 15:54:48 +01:00
millmanorama e3d51055ae codacy and review comments cleanup 2019-03-29 11:35:31 +01:00
millmanorama 3fd348a079 Merge branch 'timeline-event-mgr' into 1192-manually_created_events 
# Conflicts:
#	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
 2019-03-29 11:14:13 +01:00
millmanorama 6873582ce5 revised method Javadoc 2019-03-29 11:12:19 +01:00
millmanorama 502d81dc15 Merge branch 'timeline-event-mgr' into 1124_disable_plaso_by_default 2019-03-29 11:05:53 +01:00
millmanorama 429b0ba246 address review comments. 2019-03-28 17:16:12 +01:00
millmanorama cdd12745e5 pass image into buildLog2TimeLineCommand rather than derived bits of information 2019-03-27 14:10:06 +01:00
millmanorama a2a3014867 minor cleanup 2019-03-27 13:53:55 +01:00
millmanorama 30974adefa Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1215-datasource-query 
# Conflicts:
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
 2019-03-27 12:46:44 +01:00
millmanorama 0e3a1edcdb Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1216-drop-immutablesets 
# Conflicts:
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
#	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
#	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
 2019-03-27 12:45:16 +01:00
millmanorama 2119625f5a Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1157-collapse_file_events 
# Conflicts:
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
#	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
#	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
 2019-03-27 12:37:10 +01:00
millmanorama c900746b48 Fix method javadoc 2019-03-27 12:34:21 +01:00
Richard Cordovano 9d039b42f6 Merge pull request #4643 from millmanorama/timeline-event-mgr 
merge develop into Timeline event mgr
 2019-03-22 09:09:36 -04:00
millmanorama 886356dcd5 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/AbstractCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/timeline/snapshot/SnapShotReportWriter.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
#	thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/VcardParser.java
 2019-03-22 09:11:46 +01:00
Brian Carrier 80e71817de reduce pmd warnings 2019-03-21 16:31:53 -04:00
Brian Carrier 92a8190056 reduce pmd warnings 2019-03-21 16:16:31 -04:00
Richard Cordovano b91cdd4c98 Merge pull request #4637 from APriestman/restoreClearingPortableCase 
Portable Case - clear out the artifact caches and set the case to null.
 2019-03-21 13:32:48 -04:00
Ann Priestman e61f372720 Clear out the artifact caches and set the case to null. 2019-03-21 13:21:19 -04:00
millmanorama 69cc2df231 pass command to methods for logging 2019-03-21 17:27:20 +01:00
millmanorama a0458bc013 rename and comment new ExecUtil method 2019-03-21 17:18:38 +01:00
millmanorama f43c968af9 change case and filemanager initialization; make log entries severe 2019-03-21 17:09:48 +01:00
Richard Cordovano b11e7d748b Merge pull request #4635 from sleuthkit/revert-4633-revert-4630-4841-ra-sansYYYY 
Revert "Revert "4841: RecentActivity not making progress on large image""
 2019-03-21 11:52:11 -04:00
Richard Cordovano 4947c739bc Revert "Revert "4841: RecentActivity not making progress on large image"" 2019-03-21 11:51:54 -04:00
Richard Cordovano 50595543dc Merge pull request #4631 from wschaeferB/4865-FixNpeInTextFileExtractor 
4865 fix npe in text file extractor
 2019-03-21 09:02:55 -04:00
Richard Cordovano 5d24cec81a Merge pull request #4633 from sleuthkit/revert-4630-4841-ra-sansYYYY 
Revert "4841: RecentActivity not making progress on large image"
 2019-03-21 08:32:33 -04:00
Richard Cordovano 81b2938fd3 Revert "4841: RecentActivity not making progress on large image" 2019-03-21 08:32:12 -04:00
millmanorama 2a4468587f set Plaso module disabled by default 2019-03-21 11:56:08 +01:00
Brian Carrier 70e50abad9 removed ignored PMD rules 2019-03-20 22:43:54 -04:00
Richard Cordovano 72d2c0ee22 Merge pull request #4630 from raman-bt/4841-ra-sansYYYY 
4841: RecentActivity not making progress on large image
 2019-03-20 19:51:06 -04:00
William Schaefer 962bfc2467 4865 handle null reader in better manner 2019-03-20 17:13:21 -04:00
William Schaefer dbff27ef39 4865 fix NPE possible with null Reader 2019-03-20 16:59:19 -04:00
William Schaefer 670b11d5a0 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4865-FixNpeInTextFileExtractor 2019-03-20 16:14:32 -04:00
William Schaefer f442ee4df6 4865 check if results of TextFileExtractor are null 2019-03-20 16:13:06 -04:00
Richard Cordovano 2391476351 Merge pull request #4627 from APriestman/4851_dataSourceIntegrityMessage 
4851 Don't display an error pop up if image size is zero
 2019-03-20 15:50:42 -04:00
Richard Cordovano 6e3b8d1a42 Merge pull request #4623 from wschaeferB/4791-UseMostCommonFileName 
4791 change token file name to be most common file name
 2019-03-20 15:49:00 -04:00