Commit Graph
13409 Commits
Author SHA1 Message Date
Richard Cordovano 8fca918ee1 Merge remote-tracking branch 'upstream/develop' into improved-case-deletion-part2 2019-03-13 13:02:30 -04:00
Eugene Livis dd126a7ffe Switched to single thread 2019-03-13 11:01:29 -04:00
millmanorama c6e1050bbb attempt to set owner and only show one dialog. 2019-03-12 23:21:39 +01: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
William Schaefer 19797646a0 4792 fix counts and display of intra case results 2019-03-12 14:12:49 -04:00
Richard Cordovano a854a89e47 Merge remote-tracking branch 'upstream/develop' into improved-case-deletion-part2 2019-03-12 12:51:19 -04:00
U-BASIS\dsmyda b0a369fab0 Removed unncessary new space in CaseNodeData, and checked in changes to CaseMetadata 2019-03-12 12:28:57 -04:00
U-BASIS\dsmyda 6cc77655b1 Requested changes, API change, and new CaseMetadata method for locating metadata file 2019-03-12 12:15:42 -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
millmanorama 671f95c0e7 add tag actions to user created events.
cleanup related files
2019-03-12 14:31:04 +01:00
William Schaefer 2a04c86faa Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4792-RedoOtherOccurrencesViewer 2019-03-11 17:58:48 -04:00
Raman 814a61f4c8 4786: Handle incorrectly written HTML files. 2019-03-11 14:19:29 -04:00
William Schaefer 572c1af5a3 4792 adjustments to support intra-case other ocurrences again 2019-03-11 14:02:23 -04:00
Eugene Livis db791edb4c Merge branch 'develop' of github.com:sleuthkit/autopsy into archive_dsp_4658 2019-03-11 13:57:26 -04:00
Eugene Livis 48e1f224c9 Moved some of the Experimental utility code to Autopsy Core 2019-03-11 13:56:38 -04:00
William Schaefer 1edbbadf5b 4792 initial Other Occurrences Content viewer changes 2019-03-11 12:29:18 -04:00
Richard Cordovano 486fbfe152 Interim check in of adminstrative case deletion 2019-03-11 11:52:00 -04:00
Richard Cordovano ad227a3db5 INterim check in of adminstrative case deletion 2019-03-11 11:51:41 -04:00
millmanorama f8134a3d82 Merge remote-tracking branch 'upstream/develop' into 1192_manual_events_actions
# Conflicts:
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
2019-03-11 15:28:57 +01: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
millmanorama ae9c821e4d get content and not just abstractfiles 2019-03-11 10:11:06 +01:00
millmanorama a500ef01e6 fix issues found in code review 2019-03-10 15:32:02 +01: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 1cf785b8cb fix merge 2019-03-08 12:39:58 +01:00
millmanorama 8fccb3d845 Merge branch 'timeline-event-mgr' into 1192-manually_created_events 2019-03-08 12:31:35 +01:00
millmanorama 47c7ed69bb Merge branch 'develop' into timeline-event-mgr 2019-03-08 12:29:08 +01:00
millmanorama 2a30fa1a12 add alerts on errors 2019-03-08 12:28:09 +01:00
millmanorama b7f1e42ab8 Merge branch 'timeline-event-mgr' into 1192-manually_created_events 2019-03-08 10:49:04 +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
William Schaefer e69b3230da 4791 fix node name for non-file attributes 2019-03-07 17:35:19 -05:00
William Schaefer 07f23f3780 4791 update text for older inter case search option 2019-03-07 16:12:42 -05:00
William Schaefer 01e84910c8 4791 undo formating changes to datasourceUpdateService 2019-03-07 16:02:11 -05:00
William Schaefer 18dec7e543 4791 clean up and copyright update 2019-03-07 15:54:39 -05:00
William Schaefer 9dd378c12f 4791 make default selection for InterCase search to filter on file type for consistency 2019-03-07 13:58:35 -05:00
William Schaefer e6ad011e95 4791 correct count of data sources when duplicate name 2019-03-07 13:56:03 -05:00
William Schaefer f4780fc044 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4791-ReviseIntraCaseResults 2019-03-07 13:02:46 -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
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
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 8a0491ae62 Merge remote-tracking branch 'upstream/develop' into improved-case-deletion-part2 2019-03-06 14:11:41 -05:00
Richard Cordovano 710cfc243f Interim check in of case deletion to allow develop branch merge 2019-03-06 14:11:31 -05:00