Commit Graph
8179 Commits
Author SHA1 Message Date
U-BASIS\dgrove 59f87f77f8 Removed double-wrapped catches. 2018-03-05 21:55:55 -05:00
U-BASIS\dgrove 6ff3438b08 Typo's corrected. 2018-02-28 16:13:49 -05:00
U-BASIS\dgrove 3c63e3d802 Cleanup. 2018-02-28 16:08:23 -05:00
U-BASIS\dgrove 2a121d27c1 Merge remote-tracking branch 'upstream/develop' into 3437_ReadContentInputStreamError_3 2018-02-28 16:03:27 -05:00
U-BASIS\dgrove 5557c5b5b8 Added handling for ReadContentInputStreamException. 2018-02-28 16:02:48 -05:00
Richard Cordovano 0705374e8e Merge pull request #3457 from raman-bt/3544_mediacontentviewer
3544: Integrate Media content viewer into Application content viewer
2018-02-28 13:12:41 -05:00
Brian Carrier 80868442fd Made method public so that modules would know what sets were configured 2018-02-28 10:45:05 -05:00
Brian Carrier cb3a0c7a5d Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2018-02-28 10:41:09 -05:00
Brian Carrier eb1bb6b93c rearranged methods to group ingest filters from interesting files methods 2018-02-28 10:40:33 -05:00
Raman 2895060b3b Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3544_mediacontentviewer 2018-02-28 10:10:29 -05:00
Richard Cordovano bc28f09939 Merge pull request #3475 from sleuthkit/custom-release-2.11.1
Merge in custom release 2.11.1 branch
2018-02-27 17:13:16 -05:00
Richard Cordovano 3ba9385102 Merge pull request #3462 from raman-bt/develop
Fixes an NPE in the previous commit.
2018-02-27 17:08:06 -05:00
U-BASIS\zhaohui e1251d7975 Delete Autopsy Core Unit test: IngestFileFiltersTest.java 2018-02-27 12:48:58 -05:00
U-BASIS\dgrove 521d15ca63 Merge remote-tracking branch 'upstream/develop' into 3353_CenterChildWindows 2018-02-23 14:56:18 -05:00
U-BASIS\dgrove 8952c5686c Merge. 2018-02-23 14:55:31 -05:00
Richard Cordovano 7e493c7888 Merge pull request #3441 from dgrove727/3385_ContentViewerReset
3385 content viewer reset
2018-02-23 14:38:37 -05:00
Richard Cordovano 038542151b Merge pull request #3454 from esaunders/report_index_and_search
Merged develop into report indexing work and fixed issue with Content not in lookup
2018-02-23 14:32:23 -05:00
Raman 9949b77dd1 Fixes an NPE in the previous commit. 2018-02-23 14:20:34 -05:00
U-BASIS\dgrove d0e127d8c0 Compile issue resolved. 2018-02-23 12:59:26 -05:00
Raman 2c9b6fe6a4 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3544_mediacontentviewer
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/contentviewers/FileViewer.java
#	Core/src/org/sleuthkit/autopsy/contentviewers/SQLiteViewer.java
2018-02-23 12:35:14 -05:00
U-BASIS\dgrove c02263a7f9 Merge. 2018-02-23 12:15:21 -05:00
Raman c1fd998807 3544: Integrate Media content viewer into Application content viewer
Modified DataContentViewerMedia to implement the FileTypeViewer interface, and renamed it to MediaFileViewer
2018-02-23 11:38:44 -05:00
Richard Cordovano 817d8e5945 Merge pull request #3440 from wschaeferB/1916-L01Processor
1916 l01 processor
2018-02-23 10:57:09 -05:00
Richard Cordovano 92e5ac4eab Merge pull request #3434 from dgrove727/3335_EncryptionDetectionStartupValidation
3335 encryption detection startup validation
2018-02-23 10:56:23 -05:00
U-BASIS\dgrove eeec005160 Merge remote-tracking branch 'upstream/develop' into 3284_DiskImageBlockSize 2018-02-23 10:21:46 -05:00
U-BASIS\dgrove 1b121ec138 Bug fix. 2018-02-23 10:17:13 -05:00
Richard Cordovano 7babb6a0b9 Merge pull request #3428 from raman-bt/sqliteviewer
3457: SQLiteViewer should handle databases with WAL files
2018-02-23 08:56:31 -05:00
Richard Cordovano 88edf39ca5 Address some issues in PListViewer detected by Codacy/IDE 2018-02-23 08:54:49 -05:00
Richard Cordovano 6ef7317c8a Merge pull request #3423 from raman-bt/plistviewer
3508: Add a File Content Viewer for binary plist files
2018-02-23 08:32:10 -05:00
Raman 5be3ae9a8c 3544: Integrate Media content viewer into Application content viewer
- Moved DataContentViewerMedia from CoreComponents to ContentViewers
2018-02-23 07:26:52 -05:00
U-BASIS\dgrove 11b23227d9 Merge remote-tracking branch 'upstream/develop' into 3284_DiskImageBlockSize 2018-02-22 17:04:22 -05:00
U-BASIS\dgrove b8d7933194 Cleanup. 2018-02-22 17:04:00 -05:00
U-BASIS\dgrove 9de880bb0f Merge remote-tracking branch 'upstream/develop' into 3353_CenterChildWindows 2018-02-22 15:15:48 -05:00
Raman 00261361d5 3544: Integrate Media content viewer into Application content viewer
- Moved FileTypeViewer to corecomponentinterfaces
2018-02-22 15:12:23 -05:00
U-BASIS\dgrove ee07f777b3 More windows centered. 2018-02-22 15:07:36 -05:00
William Schaefer 13048e2096 3565 add MD5 Hash column to File Tags and Interesting Files 2018-02-22 12:19:35 -05:00
Raman 707ec08eff 3504: Allow user to format SQLite columns as EPOCH dates 2018-02-21 13:53:46 -05:00
Raman 399c7adfb8 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into sqliteviewer 2018-02-21 13:10:57 -05:00
Richard Cordovano dea5acbd62 Merge remote-tracking branch 'upstream/custom-release-2.11.1' into develop 2018-02-20 19:22:36 -05:00
Richard Cordovano 20c2feba60 Update verson numbers for 4.6.0 release 2018-02-20 17:18:25 -05:00
esaunders 665d1a8e0c Merge branch 'develop' of github.com:sleuthkit/autopsy into report_index_and_search 2018-02-20 15:01:45 -05:00
William Schaefer e30a0902ff Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1916-L01Processor 2018-02-16 11:46:58 -05:00
Richard Cordovano 5a7820ae61 Merge remote-tracking branch 'upstream/release-4.6.0' into develop 2018-02-16 10:42:58 -05:00
Raman 2b7494f4be 3504: allow user to parse SQLite column as EPOCH date.
Initial cut
2018-02-16 10:21:33 -05:00
rishwanth1995 df56203f53 added enable enable_timeline settings in a propert file 2018-02-16 09:54:20 -05:00
rishwanth1995 8a1d4abcdc added enable enable_timeline settings in a propert file 2018-02-16 09:41:21 -05:00
Raman f099c9a46b Deleted commented code line 2018-02-16 09:00:41 -05:00
Raman af0be5116e Some more Codacy. 2018-02-16 08:13:29 -05:00
Raman e984dc49b0 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into sqliteviewer 2018-02-16 07:44:13 -05:00
Raman 8282f9eec7 Addressed Codacy review action items. 2018-02-16 07:31:05 -05:00