22322 Commits

Author SHA1 Message Date
millmanorama
671f95c0e7 add tag actions to user created events.
cleanup related files
2019-03-12 14:31:04 +01: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
d1c92b793a
Merge pull request #4591 from raman-bt/1205-download-source
1205 download source
2019-03-08 17:35:25 -05:00
millmanorama
4bb8e44947 Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1192-manually_created_events 2019-03-08 15:29:35 +01: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
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
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
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
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
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
Raman
acacd03017 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1205-download-source
# Conflicts:
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
2019-03-05 16:41:34 -05:00
Richard Cordovano
e17ccc62a1
Merge pull request #4592 from rcordovano/merged-bundle-fixes
Fix MERGED bundle for KWS, update MERGED bundle for RA
2019-03-05 16:34:39 -05:00
Richard Cordovano
ac754393e2 Fix MERGED bundle for KWS, update MERGED bundle for RA 2019-03-05 16:33:46 -05:00
Richard Cordovano
db98ac1111
Merge pull request #4587 from kellykelly3/1207-progressbar-message
Modify Extract and subclasses to take a progress bar in process function
2019-03-05 16:20:37 -05:00
Richard Cordovano
2bf654bfe3
Merge pull request #4585 from kellykelly3/1202-fix-recentactive-plistjar
Removed the plist jar from recentActivity, it should be using the one…
2019-03-05 16:17:45 -05:00
Kelly Kelly
706005772f removed commented out line from ivy.xml 2019-03-05 16:12:58 -05:00
Raman
ddfe63c6ab Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1205-download-source 2019-03-05 16:10:53 -05:00
Kelly Kelly
28b3bd34a1 Merge remote-tracking branch 'upstream/develop' into 1202-fix-recentactive-plistjar 2019-03-05 16:00:47 -05:00
Raman
24e310374d 1205: create TSK_DOWNLOAD_SOURCE artifact for downloaded files. 2019-03-05 15:25:38 -05:00
Richard Cordovano
2b739fe313 Bundle.properties-MERGE file fixes 2019-03-05 15:14:26 -05:00
Richard Cordovano
ca24aacd53
Merge pull request #4584 from kellykelly3/1194-edge-download
1194 edge download
2019-03-05 15:11:54 -05:00