22322 Commits

Author SHA1 Message Date
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
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
millmanorama
95adcb96f0 Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1192-manually_created_events 2019-03-05 16:31:23 +01:00
millmanorama
aecc229345 add right click menu option to add event with datetime prepopulated;
other small cleanup and refactoring
2019-03-05 16:30:52 +01: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
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
millmanorama
397f9694ee inline methods 2019-03-05 12:38:22 +01:00
millmanorama
58913c6970 remove notification cooldown timer 2019-03-05 12:37:59 +01:00
millmanorama
d9fe0134cc support User Created events 2019-03-05 12:37:40 +01: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
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
Richard Cordovano
5462b9f8c7
Merge pull request #4579 from wschaeferB/4782-UniqueNamedDocImages
4782 unique named doc images
2019-03-04 10:30:10 -05:00
Kelly Kelly
512d716e3f merge edge_support into 1194-edge-download 2019-03-04 10:28:02 -05:00
Kelly Kelly
4065b99967 Cleaned up the download code to put it on hold, fixed code to make sure we clean up the temp files properly and cleaned up a few javadocs 2019-03-04 10:22:42 -05:00
William Schaefer
874f239f0e Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4755-OpenInExternalViewerShortcut 2019-03-04 10:19:54 -05:00
Richard Cordovano
de9277ea56
Merge pull request #4573 from dgrove727/4663_OtherOccurrencesCount
Case and data source counts added.
2019-03-04 10:18:42 -05:00
Richard Cordovano
26b125f97c
Merge pull request #4566 from dgrove727/3921_HtmlContentViewer
3921 html content viewer
2019-03-04 10:18:03 -05:00
William Schaefer
d21ee983de Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4755-OpenInExternalViewerShortcut 2019-03-04 10:17:12 -05:00
Richard Cordovano
dc2fa3f8d4
Merge pull request #4580 from dgrove727/4777_ApplicationContentViewerSize
Reset viewport.
2019-03-04 10:16:45 -05:00
Richard Cordovano
e9d4019bf7
Merge pull request #4583 from millmanorama/timeline-event-mgr
merge develop into Timeline event mgr
2019-03-04 10:13:29 -05:00
millmanorama
1975c0e369 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr 2019-03-04 10:08:20 +01:00
William Schaefer
31dc94d794 4755 Add Shortcut for opening files in external viewer Ctrl+E 2019-03-01 17:17:06 -05:00
Richard Cordovano
d2b540d10b
Merge pull request #4572 from kellykelly3/1199-safari-cookies
1197, 1198, 1199, 1200 - Support for Safari
2019-03-01 16:26:43 -05:00
Raman
18beac06e8 1204: Show TSK_DOWNLOAD_SOURCE artifact in MetaData viewer
Also addressed review comments on previous commit.
2019-03-01 14:45:57 -05:00
William Schaefer
ec3903cdb6 4626 make connect(bool foreignKeys) an additional method instead of a replacement method 2019-03-01 11:51:52 -05:00
William Schaefer
1f92057a5f Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4626-CrDataSourcesUniqueConstraint 2019-03-01 11:42:25 -05:00
U-BASIS\dgrove
672e20bd6b Typo fix. 2019-03-01 11:42:15 -05:00