Commit Graph
22342 Commits
Author SHA1 Message Date
millmanorama 7a2bf4e06a don't read psort status since it is not interesting 2019-03-20 16:09:45 +01:00
millmanorama c364aa63a6 cleanup PlasoIngestModule 2019-03-20 14:02:51 +01:00
millmanorama 654855b46d plaso status PROTOTYPE WIP 2019-03-20 13:12:33 +01:00
Richard Cordovano a7718a4435 Merge pull request #4608 from millmanorama/timeline-event-mgr
merge develop into timeline event mgr
2019-03-14 11:34:00 -04:00
millmanorama bea96b6ac1 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr
# Conflicts:
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
2019-03-14 15:00:18 +01:00
Richard Cordovano c11e5a6620 Merge pull request #4540 from eugene7646/command_line_reports_4673
4673 Command line reports
2019-03-14 09:50:20 -04:00
Richard Cordovano 4138493010 Merge pull request #4607 from rcordovano/develop
Add output_dir_link.txt to .gitignore
2019-03-14 09:27:26 -04:00
rcordovano c9bdbe5f23 Add output_dir_link.txt to .gitignore 2019-03-14 09:26:10 -04:00
Richard Cordovano c95b8e995e Merge pull request #4604 from raman-bt/4786-malformed-html
4786: Handle incorrectly written HTML files.
2019-03-13 12:09:33 -04:00
Eugene Livis dd126a7ffe Switched to single thread 2019-03-13 11:01:29 -04:00
Raman dd621c54a1 Fixed malformed HTML handling in case of Show Images button toggling. 2019-03-12 17:36:24 -04:00
Eugene Livis 6efd93636a Code review 2019-03-12 16:03:32 -04:00
Eugene Livis 8396dea3bb Merge branch 'develop' of github.com:sleuthkit/autopsy into command_line_reports_4673 2019-03-12 11:05:47 -04:00
Richard Cordovano 7cedf2220b Merge pull request #4595 from kellykelly3/1208-zoneidentifier
1208 zoneidentifier
2019-03-12 09:30:18 -04:00
Kelly Kelly 1636a5d815 Fixed zone string format 2019-03-12 09:27:53 -04:00
Raman 814a61f4c8 4786: Handle incorrectly written HTML files. 2019-03-11 14:19:29 -04:00
Richard Cordovano dc7348e71e Merge pull request #4581 from APriestman/4784_portableCaseDoc
4784 Portable case doc
2019-03-11 11:46:35 -04:00
Ann Priestman 0cbdf35957 Fixes from review. 2019-03-11 11:40:24 -04:00
Kelly Kelly 459e558593 Addressed review comments from Raman 2019-03-11 10:41:42 -04:00
Richard Cordovano 2baf3d3454 Merge pull request #4600 from wschaeferB/4755-OpenInExternalViewerShortcut
4755 open in external viewer shortcut
2019-03-11 09:05:47 -04:00
Richard Cordovano d1c92b793a Merge pull request #4591 from raman-bt/1205-download-source
1205 download source
2019-03-08 17:35:25 -05:00
Richard Cordovano 184ccce273 Merge pull request #4601 from millmanorama/timeline-event-mgr
merge develop into Timeline event mgr
2019-03-08 09:09:03 -05:00
Richard Cordovano c395db0577 Merge pull request #4598 from APriestman/4794_moveManifestTool
Adding manifest generation tool
2019-03-08 08:27:29 -05:00
Richard Cordovano 5bc6d982e7 Merge pull request #4567 from APriestman/4750_externalFile
4750 Add new layout file type for externally defined files
2019-03-08 07:34:57 -05:00
millmanorama 47c7ed69bb Merge branch 'develop' into timeline-event-mgr 2019-03-08 12:29:08 +01:00
William Schaefer de07e8c4b3 4755 formatting and clean up 2019-03-07 18:22:29 -05:00
William Schaefer 1fbc4fc373 4755 working multi-select context menu action for main window 2019-03-07 18:08:19 -05:00
William Schaefer 27271d8942 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4755-OpenInExternalViewerShortcut 2019-03-07 17:45:45 -05:00
Kelly Kelly 260014d0a0 moved semi-colon 2019-03-07 11:44:21 -05:00
Kelly Kelly 637f8c6a4f Added static imports 2019-03-07 11:36:41 -05:00
Kelly Kelly b6a552c2a1 Addressed Jonathan's review comments 2019-03-07 11:00:45 -05:00
Ann Priestman 79c5b7ba17 Added copyright headers 2019-03-07 10:23:45 -05:00
Ann Priestman c319f01838 Adding manifest generation tool 2019-03-07 08:57:53 -05:00
Richard Cordovano f80dbca870 Merge pull request #4596 from dannysmyda/4790-Sort-Datasources-in-Tree
4790 sort datasources in tree
2019-03-07 08:22:34 -05:00
Kelly Kelly 05da0c83b5 Changed the logic per Brian's comments 2019-03-06 17:25:01 -05:00
Richard Cordovano b2957ad1e1 Merge pull request #4586 from wschaeferB/4755-OpenInExternalViewerShortcut
4755 open in external viewer shortcut
2019-03-06 17:05:33 -05:00
William Schaefer f3a7170354 4755 fix message usage for exe popup 2019-03-06 17:02:24 -05:00
William Schaefer 7f595ac294 4755 return when executable open attempted 2019-03-06 16:58:53 -05:00
William Schaefer 81b7f9580b 4755 ensure exe opening is once again disabled 2019-03-06 16:55:00 -05:00
William Schaefer 9d3dd7382d 4755 fix titles for failure on urls 2019-03-06 16:37:44 -05:00
William Schaefer 719e39547c 4755 adjust behavior of multi-selected open external viewer action for image gallery 2019-03-06 16:27:16 -05:00
Kelly Kelly c14b8d55fc Updated based on Brian's comments 2019-03-06 15:44:14 -05:00
William Schaefer 49b9d49a03 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4755-OpenInExternalViewerShortcut 2019-03-06 14:56:15 -05:00
William Schaefer 0ab6f73186 4755 remove parens from main application Ctrl+C shortcut txt 2019-03-06 14:55:56 -05:00
Richard Cordovano cc96803548 Merge pull request #4594 from wschaeferB/20190306-FixNullCheck
Add a null check of type before type is used
2019-03-06 12:15:10 -05:00
William Schaefer b5cd66fe7f Move checks for argument validity to public methods 2019-03-06 11:46:31 -05:00
U-BASIS\dsmyda d3338d57e0 Removed the comments 2019-03-06 11:36:43 -05:00
U-BASIS\dsmyda 836486717c Added sorting of the data sources to the classical tree view and the group by data source tree view 2019-03-06 11:35:40 -05:00
Raman e6a0c3bbaf Address review comments. 2019-03-06 11:09:14 -05:00
millmanorama ce6807b96e Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/AllInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/SingleInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java
2019-03-06 16:32:42 +01:00