Commit Graph
17331 Commits
Author SHA1 Message Date
U-BASIS\zhaohui bb06c2d5b8 Merge branch 'develop' into 3191-AddRunningIngestToIngestFileFilterTest 2018-03-20 10:18:33 -04:00
Richard Cordovano b952e4351f Merge pull request #3574 from APriestman/3626_doxygenUpdates
Fix doxygen warnings
2018-03-19 22:19:40 -04:00
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
Richard Cordovano 03e99cd719 Merge remote-tracking branch 'upstream/develop' into 2103-ingest-task-sched-concurrency 2018-03-19 14:12:15 -04:00
Ann Priestman d2536e83d5 Fix doxygen warnings 2018-03-19 13:40:04 -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
Ann Priestman 8c207a9bf9 Make sure the Extract init() method is always called 2018-03-19 13:13:37 -04:00
Richard Cordovano 7d2657ff70 Fix IngestTasksScheduler, IngestManager concurrency issues 2018-03-19 10:27:19 -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
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
U-BASIS\zhaohui 34e01f3847 Merge branch 'develop' into 3191-AddRunningIngestToIngestFileFilterTest 2018-03-16 15:00:58 -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
rishwanth1995 c5994bd407 added disable experimental module script to build-zip target 2018-03-16 09:43:09 -04:00
Richard Cordovano c06e7713e4 Merge pull request #3565 from millmanorama/959-cvt-closeing-exception
959 cvt closing exception
2018-03-16 09:30:23 -04:00
Richard Cordovano 58e7149817 Merge branch 'develop' into 959-cvt-closeing-exception 2018-03-16 09:30:15 -04:00
Richard Cordovano f3982aadb5 Merge pull request #3564 from millmanorama/940-AccountsBrowser-design_view
940 accounts browser design view
2018-03-16 09:28:41 -04:00
Richard Cordovano 8c855b2562 Merge pull request #3563 from millmanorama/codacy_fixes
Codacy fixes
2018-03-16 09:12:45 -04:00
Richard Cordovano c89cbade53 Merge pull request #3560 from dgrove727/3618_PhotoRecSettingsCasting
Added compatibility checks to getIngestJobSettingsPanel().
2018-03-16 09:11:38 -04:00
Richard Cordovano bf7e441bd1 Merge pull request #3556 from sleuthkit/report_doc
Added report indexing to dev docs
2018-03-16 09:10:35 -04:00
Richard Cordovano 7e055af1e8 Merge pull request #3559 from rcordovano/3616-ingest-api-for-files
3604 3616 Correctly support ingest of a subset of files from data source
2018-03-16 08:14:34 -04:00
Richard Cordovano 8c74c1e241 Fix PMD issue in RunIngestModulesAction.java 2018-03-16 08:13:32 -04:00
Richard Cordovano a842c67c2d Merge pull request #3554 from APriestman/restoreDocs
Restore live triage docs and some changes to other images.
2018-03-16 08:02:24 -04:00
Richard Cordovano 5eb397476a Remove file size check from RunIngestModulesAction 2018-03-16 07:52:36 -04:00
U-BASIS\dgrove 6f75e3d953 Store flagging value in DataAddedTask. 2018-03-16 00:23:35 -04:00
U-BASIS\zhaohui 2312c89006 3178: Refactoring final staic names. 2018-03-15 17:51:42 -04:00
U-BASIS\zhaohui 6bd3a28a80 Merge branch '3178-addDataSourcetoFileFiltersunitest' of github.com:zhhl/autopsy into 3178-addDataSourcetoFileFiltersunitest 2018-03-15 16:49:38 -04:00
U-BASIS\zhaohui 13574a54be 3178: Add data source to file filters unit test class 2018-03-15 16:33:27 -04:00
Ann Priestman 390ac36836 Use device ID instead of data source name in CorrelationAttributeInstance.toString() 2018-03-15 14:21:31 -04:00
U-BASIS\dgrove 735b47198d Merge remote-tracking branch 'upstream/develop' into 3537_CorrelationEngineSettingsPanel 2018-03-15 12:32:33 -04:00
U-BASIS\dgrove 9522e7930f Added restrictions on when flagging can be disabled. 2018-03-15 12:31:55 -04:00
millmanorama 24446029b4 only close open TopComponenets 2018-03-15 15:56:12 +01:00
millmanorama ead7d952b0 replace deprecated Case.getCurrentCase() with Case.getOpenCase() 2018-03-15 14:08:37 +01:00
millmanorama 1e33c70132 fix opening AccountsBrowser in the Netbeans Design View 2018-03-15 14:06:44 +01:00