Commit Graph
20607 Commits
Author SHA1 Message Date
Richard Cordovano 1ebefa9bfe Merge pull request #3571 from rishwanth1995/develop-merge
Merged release-4.6.0-linux-beta1 to develop branch
2018-03-19 22:19:08 -04:00
Richard Cordovano fbd8dae5a4 Merge pull request #3568 from zhhl/3178-addDataSourcetoFileFiltersunitest
3178: Add data source to file filters unit test class
2018-03-19 22:16:50 -04:00
Richard Cordovano 69823f8ec1 Merge pull request #3555 from eugene7646/aid_services_checks_3580
Aid services checks (3580)
2018-03-19 22:06:54 -04:00
Richard Cordovano c988090e9b Merge pull request #3579 from rcordovano/2103-ingest-task-sched-concurrency
2103 ingest concurrency bug fixes
2018-03-19 21:56:37 -04:00
Richard Cordovano 75d4b9ad55 Fix IngestTasksScheduler, IngestManager concurrency issues 2018-03-19 19:46:01 -04:00
Richard Cordovano 0d4a2315cd Fix IngestTasksScheduler, IngestManager concurrency issues 2018-03-19 19:09:36 -04:00
U-BASIS\zhaohui 34a153acd6 3191: Put the runInjestJob in the private method to prepare more tests to re-use it. 2018-03-19 18:00:21 -04:00
U-BASIS\zhaohui 913e4abf8a 3191: Add running ingest to IngestsFileFilterTest. 2018-03-19 17:48:17 -04:00
William Schaefer 7124b8396c 3562 add comment to updateDerivedFile method 2018-03-19 17:47:44 -04:00
Eugene Livis f1ca90cb54 Merge branch 'develop' of github.com:sleuthkit/autopsy into unalloc_image_add_3590 2018-03-19 16:55:13 -04:00
U-BASIS\dgrove 172d955b72 Changed 'refreshTable()' access modifier to private. 2018-03-19 16:14:09 -04:00
U-BASIS\dgrove 74d0d4e2eb Removed unused methods, and other minor cleanup. 2018-03-19 16:05:24 -04:00
William Schaefer cc9016e4c1 3562 add missing comments for Zip Password changes 2018-03-19 15:45:48 -04:00
Brian Carrier 4be6c38a55 more codacy/pmd rule changes 2018-03-19 14:29:36 -04:00
Richard Cordovano 03e99cd719 Merge remote-tracking branch 'upstream/develop' into 2103-ingest-task-sched-concurrency 2018-03-19 14:12:15 -04:00
Brian Carrier c1df939b6b more codacy/pmd rule changes 2018-03-19 14:10:49 -04:00
William Schaefer 59bf2c1584 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3562-ZipPasswordUse 2018-03-19 13:52:37 -04:00
Eugene Livis 3618a69082 Modified comments 2018-03-19 13:47:01 -04:00
Eugene Livis 9e57e36ee3 /LocalDiskDSProcessor no longer implements AutoIngestDataSourceProcessor interface 2018-03-19 13:44:32 -04:00
Eugene Livis 4bbe5afc5c Changes to AutoIngestDataSourceProcessor 2018-03-19 13:41:05 -04:00
Ann Priestman d2536e83d5 Fix doxygen warnings 2018-03-19 13:40:04 -04:00
Brian Carrier 4d9594e65a clean up codacy 2018-03-19 13:37:50 -04:00
William Schaefer 816580b2e0 3562 further zip password cleanup changes 2018-03-19 13:34:14 -04:00
Richard Cordovano 1a847a4158 Merge pull request #3573 from APriestman/recentActivityInit
Make sure the Extract init() method is always called
2018-03-19 13:20:05 -04:00
William Schaefer 861baa343c 3562 comment method added to FileTypeDetector to allow mime type update 2018-03-19 13:16:10 -04:00
Ann Priestman 8c207a9bf9 Make sure the Extract init() method is always called 2018-03-19 13:13:37 -04:00
Brian Carrier 68f224aea3 Merge pull request #3553 from markmckinnon/url_viewer
Allow http reports to be viewed when clicked
2018-03-19 13:06:09 -04:00
William Schaefer d939f93f04 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3562-ZipPasswordUse 2018-03-19 12:03:27 -04:00
William Schaefer cc2be85662 3562 - clean up remove unused methods and temporary output 2018-03-19 12:02:51 -04:00
Richard Cordovano 7d2657ff70 Fix IngestTasksScheduler, IngestManager concurrency issues 2018-03-19 10:27:19 -04:00
U-BASIS\dgrove e79060da89 Synchronizing enable/disable of components with job events. 2018-03-19 10:12:41 -04:00
U-BASIS\dgrove 55cd716b02 Merge remote-tracking branch 'upstream/develop' into 3595_DeclutterLocalDiskPanel 2018-03-19 10:07:30 -04:00
U-BASIS\dgrove 86ffca318a Finished functionality. 2018-03-19 10:06:32 -04:00
rishwanth1995 5c5cde20c8 Revert "modified swing components in InjestProfileSelectionPanel.java"
This reverts commit 2260dcdc3f.
2018-03-19 09:09:50 -04:00
rishwanth1995 2d6a4e22ef change build.type to development 2018-03-19 09:00:55 -04:00
rishwanth1995 85c8baa9b8 resolved conflict in build.xml 2018-03-19 08:55:20 -04:00
rishwanth1995 1ce0fe7458 Merge branch 'preinstall_script' into develop-merge 2018-03-19 08:46:09 -04:00
Richard Cordovano ed31dd4168 Merge pull request #3537 from zhhl/2229-Part27UsegetOpenCaseInsteadOfgetCurrentCase
2229 Part 27 use getOpenCase() instead of getCurrentCase()
2018-03-18 07:32:18 -04:00
William Schaefer 428fe5190f 3562 fix for incorrect keys on directory contents 2018-03-16 19:27:57 -04:00
U-BASIS\zhaohui 55d5827404 2229: Log the exception in the constructor rather than propagate. 2018-03-16 17:39:58 -04:00
Richard Cordovano ce61d1b4b8 Merge pull request #3569 from rishwanth1995/preinstall_script
added disable experimental module script to build-zip target
2018-03-16 16:56:07 -04:00
Richard Cordovano 55bafabaf1 Merge pull request #3522 from dgrove727/3537_CorrelationEngineSettingsPanel
3537 correlation engine settings panel
2018-03-16 16:50:16 -04:00
William Schaefer bbdae0d962 3562 fixes for uniqueness of map key for unpacking 2018-03-16 16:48:22 -04:00
U-BASIS\zhaohui 34e01f3847 Merge branch 'develop' into 3191-AddRunningIngestToIngestFileFilterTest 2018-03-16 15:00:58 -04:00
William Schaefer 9c93b6bb5a Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3562-ZipPasswordUse 2018-03-16 13:53:43 -04:00
U-BASIS\dgrove 759387de72 Merge remote-tracking branch 'upstream/develop' into 3537_CorrelationEngineSettingsPanel 2018-03-16 13:02:32 -04:00
U-BASIS\dgrove 7f503055e1 Added additional commentary for setFlagNotableItems() call. 2018-03-16 13:01:24 -04:00
U-BASIS\zhaohui 27f3fa4adf 3178: Avoid short variable name. 2018-03-16 12:14:54 -04:00
U-BASIS\zhaohui 130686fded 3178: Remove unused imports 2018-03-16 12:12:33 -04:00
Richard Cordovano 9ce7c3ddff Merge pull request #3566 from APriestman/3620_addDataSourceDeviceID
3620 Use device ID instead of data source name in CorrelationAttributeInst…
2018-03-16 11:06:21 -04:00