22206 Commits

Author SHA1 Message Date
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
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
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
William Schaefer
67d57cce53 4755 resolve merge conflict with develop 2019-03-05 10:20:50 -05:00
Kelly Kelly
0cb11be390 Merge branch 'develop' into 1194-edge-download 2019-03-05 10:09:09 -05:00
William Schaefer
b30681c138 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4791-ReviseIntraCaseResults 2019-03-05 10:08:29 -05:00
William Schaefer
1af5006a0e 4791 rename hash node with token file name 2019-03-05 10:08:04 -05:00
William Schaefer
44eb4d0b0d 4791 rename hash node with token file name 2019-03-05 10:07:37 -05:00
Richard Cordovano
a1d426569c
Merge pull request #4588 from sleuthkit/edge_support
Merge edge_support branch into develop branch
2019-03-05 09:56:38 -05:00
Richard Cordovano
2db8920e39
Merge branch 'develop' into edge_support 2019-03-05 09:56:14 -05:00
Raman
da28fabe13 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1205-download-source 2019-03-05 09:27:54 -05:00
Richard Cordovano
96e87f6b7d
Merge pull request #4569 from wschaeferB/4757-InterCaseSearchQueryChanges
4757 inter case search query changes
2019-03-05 09:17:14 -05:00
William Schaefer
b979217fe3 4791 Organize by number of data sources instead of instances 2019-03-04 17:43:09 -05:00
William Schaefer
90c75d635e 4791 use name of first image in multi-image data sources 2019-03-04 16:24:43 -05:00
Raman
49732b1dfc Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1205-download-source 2019-03-04 16:17:32 -05:00
Kelly Kelly
151e4218da Modify Extract and subclasses to take a progress bar in process function 2019-03-04 15:57:14 -05:00
William Schaefer
ba0010f626 4791 make default selection for intra-case search to filter by mime type 2019-03-04 15:44:36 -05:00
William Schaefer
7f7a1094ac 4791 remove text/plain mime type from document results 2019-03-04 15:43:38 -05:00
Richard Cordovano
7abee59bfe
Merge pull request #4578 from raman-bt/1188-cache-artifact
1188 Web cache artifact
2019-03-04 15:31:42 -05:00
William Schaefer
93cf20e363 4755 remove ctrl+e shortcut text from image gallery merged files 2019-03-04 14:31:10 -05:00
William Schaefer
2cc861d8f3 4755 fix copyright for new file 2019-03-04 13:01:46 -05:00
Kelly Kelly
67ebffac6c Removed the plist jar from recentActivity, it should be using the one from corelib now. 2019-03-04 12:50:01 -05:00
William Schaefer
e399ae4594 4755 add modified merged bundle files 2019-03-04 12:35:49 -05:00
William Schaefer
094f576e5b 4755 add (Ctrl+E) to end of Open in External Viewer to identify shortcut 2019-03-04 12:27:31 -05:00
William Schaefer
5b72595367 3921 add merged bundle files and diamond typing for html viewer 2019-03-04 11:39:46 -05:00
William Schaefer
e5733efd62 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4755-OpenInExternalViewerShortcut 2019-03-04 11:36:34 -05:00
Raman
90177a7fb6 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1205-download-source 2019-03-04 11:04:20 -05:00
Raman
ff5195eeff Close temp file copy in case of error. 2019-03-04 10:42:43 -05:00