12395 Commits

Author SHA1 Message Date
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
William Schaefer
6a0186f4cb 4791 change number of instances to number of data sources in search common property search results 2019-03-06 13:33:34 -05:00
William Schaefer
28d19a8f67 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4791-ReviseIntraCaseResults 2019-03-06 12:51:07 -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
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
William Schaefer
1c6286f3bc Add a null check of type before type is used 2019-03-06 10:22:46 -05:00
Ann Priestman
6880b2f778 Removed unused imports 2019-03-06 10:14:57 -05:00
millmanorama
24d73bb34e use correct class name in Bundle 2019-03-06 12:11:42 +01:00
millmanorama
07a23ac0f9 set time at invocation note creation of action. comments 2019-03-06 11:52:06 +01:00
William Schaefer
88404aa9ee 4791 fix sorting of results by count for inter-case search 2019-03-05 18:35:19 -05:00
William Schaefer
b6c8936d55 4791-fix potential null pointer with token file name 2019-03-05 17:01:55 -05:00
Richard Cordovano
b2bf617f62 Merge develop into auto ingest case deletion branch 2019-03-05 16:41:21 -05:00
William Schaefer
5100ad8798 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4791-ReviseIntraCaseResults 2019-03-05 14:52:09 -05:00