22287 Commits

Author SHA1 Message Date
Eugene Livis
e989a15fba Merge branch 'develop' of github.com:sleuthkit/autopsy into archive_dsp_4658 2019-03-06 16:51:59 -05:00
Eugene Livis
a1bb00a59a First cut at not moving files around 2019-03-06 16:51:31 -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
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
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
Kelly Kelly
a153cfb4cd Completed zone identifier code and merged in progress bar changes from develop 2019-03-06 10:25:16 -05: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
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
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
b2bf617f62 Merge develop into auto ingest case deletion branch 2019-03-05 16:41:21 -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
Kelly Kelly
4421caef74 Removed a \ from the keywordsearch bundles.properties file 2019-03-05 15:56:15 -05:00
Kelly Kelly
91bd0e9e9d Inital work on zone identifier parsing 2019-03-05 15:46:01 -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
William Schaefer
5100ad8798 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4791-ReviseIntraCaseResults 2019-03-05 14:52:09 -05:00
Richard Cordovano
cd480a8f9a
Merge pull request #4590 from rcordovano/fix-for-compile-warning
Fix cause of compile warning for DataContentViewerOtherCases.java
2019-03-05 14:51:45 -05:00
rcordovano
6b6f38d550 Fix cause of compile warning for DataContentViewerOtherCases.java 2019-03-05 14:51:02 -05:00
Richard Cordovano
39cf9b881c
Merge pull request #4575 from wschaeferB/4626-CrDataSourcesUniqueConstraint
4626 cr data sources unique constraint
2019-03-05 13:53:26 -05:00
William Schaefer
2113c3c92f Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4791-ReviseIntraCaseResults 2019-03-05 13:35:08 -05:00
Richard Cordovano
63eecc7af8 Merge in develop branch 2019-03-05 13:00:28 -05:00
William Schaefer
fc356fc3e3 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4626-CrDataSourcesUniqueConstraint 2019-03-05 12:55:43 -05:00
William Schaefer
9a2d5f410a Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4755-OpenInExternalViewerShortcut 2019-03-05 12:50:33 -05:00
William Schaefer
3837da1f4b 4755 add shortcut for open in external viewer to image gallery 2019-03-05 12:48:40 -05:00
Richard Cordovano
2d4f7e7f50
Merge pull request #4589 from rcordovano/bundle-merge-updates
Update bundle MERGE files
2019-03-05 12:02:40 -05:00
Richard Cordovano
449955bfb6 Update bundle MERGE files 2019-03-05 12:00:39 -05:00
Richard Cordovano
10f8e55aa2 Interim commit for auto ingest case deletion 2019-03-05 11:37:09 -05:00
Raman
d96874bf4e Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1205-download-source 2019-03-05 11:01:06 -05:00
Kelly Kelly
b776821ce4 Merge branch 'develop' into 1202-fix-recentactive-plistjar 2019-03-05 10:36:57 -05:00
Kelly Kelly
a82bcc603e Modified code based on review comments 2019-03-05 10:33:44 -05:00