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,495 Commits 24 Branches 52 Tags
afaa098a49bb9969598be2fa3d20e54b181dd5ba
Commit Graph
22495 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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
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
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
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
Richard Cordovano aa14954d15 Merge pull request #4621 from APriestman/4837-addHighestPortableCaseIDs 
4837 Store highest portable case IDs
 2019-03-20 15:46:25 -04:00
Raman 99e447af90 4841: RecentActivity not making progress on SANS. 2019-03-20 14:30:48 -04:00
Richard Cordovano d433bf13d0 Merge pull request #4628 from eugene7646/fix_command_line_panel_4850 
Fix for Apply/OK buttons not working properly in Tools->Options (4850)
 2019-03-20 13:20:56 -04:00
Eugene Livis ccc03bf915 Accepting empty path as valid path 2019-03-20 11:37:05 -04:00
Richard Cordovano d6e2f0ebbe Merge pull request #4622 from dannysmyda/4848-Multi-case-list 
4848 multi case list
 2019-03-20 10:15:36 -04:00
Richard Cordovano 8cbbc48690 Merge pull request #4625 from APriestman/4853_vcardNPE 
4853 Put name together manually if formattedName field is missing.
 2019-03-20 09:21:19 -04:00
Ann Priestman 04772757a8 Don't display an error pop up if image size is zero 2019-03-20 09:08:18 -04:00
millmanorama c158e71fec Merge branch 'timeline-event-mgr' into 1157-collapse_file_events 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
 2019-03-20 12:50:24 +01:00
Richard Cordovano d9e315ee93 Merge pull request #4624 from eugene7646/fix_caseuco_report 
Fixed a bug in CASE-UCO report module initialization
 2019-03-19 16:02:07 -04:00
Ann Priestman d6cb162d6c Put name together manually if formattedName field is missing. 2019-03-19 15:09:59 -04:00
Richard Cordovano 4c014dfa3f Merge pull request #4618 from eugene7646/archive_dsp_4658 
Archive DSP 4658
 2019-03-19 15:04:50 -04:00
Eugene Livis 9c8aaeca4a Fixed a bug in CASE-UCO report module initialization 2019-03-19 13:58:19 -04:00
William Schaefer 8f158dad12 4791 change token file name to be most common file name 2019-03-19 12:28:18 -04:00
Richard Cordovano 9f5f586aae Merge pull request #4609 from kellykelly3/1213-com-view-image-report 
1213 communications snapshot report
 2019-03-19 12:11:37 -04:00
Richard Cordovano f5ea7b50e4 Merge pull request #4599 from wschaeferB/4791-ReviseIntraCaseResults 
4791 revise intra case results
 2019-03-19 10:52:14 -04:00
Ann Priestman 8c64e63277 Name changes 2019-03-19 10:05:00 -04:00
Kelly Kelly e7f0e87c8d Switched from using getClass.getName to instanceof 2019-03-19 09:55:57 -04:00
U-BASIS\dsmyda 46729e8ded Added bundle comments back in 2019-03-19 09:47:04 -04:00
Richard Cordovano 6b20b0491b Merge pull request #4619 from wschaeferB/3956-IsSupportedForDataContentViewers 
3956 is supported for data content viewers
 2019-03-19 09:45:56 -04:00
U-BASIS\dsmyda cc1924faca Removed some warnings 2019-03-19 09:44:40 -04:00
Ann Priestman b7a95b9787 Change to storing max IDs in new table. 
Close the portable case when done.
 2019-03-19 09:42:24 -04:00
U-BASIS\dsmyda fd688a21c5 Changed the case list panel on the left hand side 2019-03-19 09:16:27 -04:00
Ann Priestman 88a6971520 Merge remote-tracking branch 'upstream/develop' into 4837-addHighestPortableCaseIDs 2019-03-19 08:40:51 -04:00
millmanorama cf607dcce8 fixes for codacy 2019-03-19 13:39:03 +01:00
Kelly Kelly e3199919dd Updated to check for white space report name. 2019-03-19 08:00:01 -04:00
Ann Priestman 6875c94050 Get max database IDs 2019-03-19 07:28:52 -04:00
Kelly Kelly a063ec1087 Merged in develop branch 2019-03-18 16:53:52 -04:00