Commit Graph
18776 Commits
Author SHA1 Message Date
U-BASIS\dgrove 8952c5686c Merge. 2018-02-23 14:55:31 -05:00
Richard Cordovano 14a55af19c Merge pull request #3450 from millmanorama/930-use_getRelationshipsCount_to_increase_performance
930 use get relationships count to increase performance
2018-02-23 14:49:19 -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
Richard Cordovano 69c2dcb40d Merge pull request #3409 from dgrove727/3284_DiskImageBlockSize
3284 disk image block size
2018-02-23 14:25:24 -05:00
Raman 9949b77dd1 Fixes an NPE in the previous commit. 2018-02-23 14:20:34 -05:00
U-BASIS\dgrove 89bf08c1d1 Cleanup. 2018-02-23 13:31:20 -05:00
U-BASIS\dgrove 2012bfb773 Merge branch '3284_DiskImageBlockSize' into 3545_LocalDiskImageBlockSize 2018-02-23 13:03:49 -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 f180ff75b1 Merge. 2018-02-23 12:20:57 -05:00
U-BASIS\dgrove c02263a7f9 Merge. 2018-02-23 12:15:21 -05:00
U-BASIS\dgrove 739d7cbb57 Minor tweaks. 2018-02-23 12:06:07 -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 55b3ab2953 Merge branch '3284_DiskImageBlockSize' into 3545_LocalDiskImageBlockSize 2018-02-23 10:34:38 -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
U-BASIS\dgrove 96aa6ff76f Block size selection fully implemented. 2018-02-23 10:13:57 -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 7b8c65e8d4 Merge branch '3284_DiskImageBlockSize' into 3545_LocalDiskImageBlockSize 2018-02-22 17:06:24 -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 a9884f3eff Initial changes. 2018-02-22 16:55:08 -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
U-BASIS\dgrove bdd1ccd15e Minor fix. 2018-02-22 10:35:31 -05:00
U-BASIS\dgrove 5760349475 Minor fix. 2018-02-22 10:33:34 -05:00
Richard Cordovano 7db4694600 Merge remote-tracking branch 'upstream/release-4.6.0' into develop 2018-02-21 16:14:28 -05:00
Richard Cordovano 7362ac989a Merge remote-tracking branch 'upstream/release-4.6.0' into custom-release-2.11.1 2018-02-21 16:12:51 -05:00
U-BASIS\dgrove 53acf9d923 Minor tweaks. 2018-02-21 15:59:51 -05:00
U-BASIS\dgrove ca2780b332 Added deprioritization functionality. 2018-02-21 15:46:37 -05:00
Richard Cordovano 32e6e64301 Switch back to DEVELOPMENT build type 2018-02-21 14:48:47 -05:00
Brian Carrier 596baec84b initial stubs for report action to open URL 2018-02-21 14:22:41 -05:00
Raman 66de987490 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into sqliteviewer 2018-02-21 13:57:53 -05:00
Raman 707ec08eff 3504: Allow user to format SQLite columns as EPOCH dates 2018-02-21 13:53:46 -05:00
Brian Carrier 74f4ba403a codacy rule change 2018-02-21 13:16:10 -05:00
Raman 399c7adfb8 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into sqliteviewer 2018-02-21 13:10:57 -05:00
millmanorama 85d9577ea2 use new getRelationshionshipsCount(a1,a2) method to improve graph loading time 2018-02-21 13:21:02 +01:00
Richard Cordovano dea5acbd62 Merge remote-tracking branch 'upstream/custom-release-2.11.1' into develop 2018-02-20 19:22:36 -05:00
esaunders da5872e132 Modified Solr status command to not request index info. 2018-02-20 19:12:29 -05:00
Richard Cordovano 927f1a578f Updates for Autopsy-Core NBM version number change autopsy-4.6.0 2018-02-20 18:42:49 -05:00
Richard Cordovano 8bcdbf74b2 Merge pull request #3449 from esaunders/3551_solr_status
Modified Solr status command to not request index info.
2018-02-20 17:56:56 -05:00
esaunders d7495c0e67 Modified Solr status command to not request index info. 2018-02-20 17:33:54 -05:00