17588 Commits

Author SHA1 Message Date
Richard Cordovano
90667719ed
Merge pull request #3627 from sleuthkit/custom-release-march-2018
Merge in Custom release march 2018
2018-03-27 20:16:13 -04:00
Richard Cordovano
00ccf6aed1
Merge pull request #3626 from rcordovano/custom-release-march-2018
Restore file typing to embedded file extraction, avoid NPEs
2018-03-27 20:15:33 -04:00
Richard Cordovano
3445dca94a Restore filetyping to embedded file extraction, avoid NPEs 2018-03-27 20:14:25 -04:00
Richard Cordovano
eaed2ce261
Merge pull request #3625 from sleuthkit/custom-release-march-2018
Merge in custom release march 2018
2018-03-27 19:36:10 -04:00
Richard Cordovano
6aa628e5b4
Merge pull request #3624 from rcordovano/custom-release-march-2018
Remove stray developer TODO from IngestTasksScheduler.java
2018-03-27 19:35:41 -04:00
Richard Cordovano
124d9a7fc6 Remove stray developer TODO from IngestTasksScheduler.java 2018-03-27 19:34:57 -04:00
Richard Cordovano
3a36bb3a71
Merge pull request #3623 from sleuthkit/custom-release-march-2018
Merge in Custom release march 2018
2018-03-27 19:31:22 -04:00
Richard Cordovano
68e96ddf7a
Merge pull request #3617 from dgrove727/3663_ContentViewerDefaultTab
3663 content viewer default tab
2018-03-27 19:30:44 -04:00
Richard Cordovano
d9bb5810a1
Merge pull request #3622 from sleuthkit/custom-release-march-2018
Custom release march 2018
2018-03-27 18:51:19 -04:00
Richard Cordovano
845bc449fb
Merge pull request #3621 from rcordovano/ingest-performance-fix
Make virtual files pass through ingest file filter
2018-03-27 18:50:53 -04:00
Richard Cordovano
b3ba926705 Make virtual files pass through ingest file filter 2018-03-27 18:48:59 -04:00
Richard Cordovano
417b6ea526
Merge pull request #3620 from sleuthkit/custom-release-march-2018
Merge in custom release march 2018
2018-03-27 18:23:32 -04:00
Richard Cordovano
1e7e491b32
Merge pull request #3619 from rcordovano/ingest-performance-fix
Fix DataSourceIngestJob handling of file ingest only
2018-03-27 16:25:14 -04:00
Richard Cordovano
a94ac9d669 Fix DataSourceIngestJob handling of file ingest only 2018-03-27 16:22:47 -04:00
Richard Cordovano
b6fd61377e
Merge pull request #3616 from wschaeferB/3667-ResultsViewerTableResizing
3667 results viewer table now resizes center column height correctly
2018-03-27 15:27:47 -04:00
Richard Cordovano
bd16957aaa
Merge pull request #3618 from rcordovano/ingest-performance-fix
Ingest tasks scheduler fixes
2018-03-27 15:24:10 -04:00
Richard Cordovano
be78b35d26 INgest task scheduler fixes 2018-03-27 15:18:52 -04:00
U-BASIS\dgrove
a4a2ebb83e Merge remote-tracking branch 'upstream/custom-release-march-2018' into 3663_ContentViewerDefaultTab 2018-03-27 13:52:37 -04:00
U-BASIS\dgrove
b6c63607cb Added logic to check which node the content viewer uses. 2018-03-27 13:51:48 -04:00
Richard Cordovano
f07e95a12b Merge remote-tracking branch 'upstream/custom-release-march-2018' into ingest-performance-fix 2018-03-27 13:38:23 -04:00
Richard Cordovano
2862fdf712 Merge remote-tracking branch 'upstream/develop' into ingest-performance-fix 2018-03-27 13:14:55 -04:00
William Schaefer
96c42bd974 3667 results viewer table now resizes center column height correctly 2018-03-27 13:11:33 -04:00
Richard Cordovano
0caf99c9d4
Merge pull request #3599 from wschaeferB/3632-IngestAfterUnzip
3632 ingest after unzip
2018-03-27 13:04:16 -04:00
Richard Cordovano
907a400474
Merge pull request #3614 from APriestman/3626_reportIndex
Update list of what keyword search indexes
2018-03-27 12:57:22 -04:00
Ann Priestman
e7db68c590 Fix list on cvt page 2018-03-27 12:42:35 -04:00
Ann Priestman
45d9abe3a6 Update list of what keyword search indexes 2018-03-27 12:23:35 -04:00
Richard Cordovano
fc27bbfa96
Merge pull request #3613 from millmanorama/disable-CVT
Disable CVT
2018-03-27 10:14:51 -04:00
millmanorama
9d4c1c21af Merge remote-tracking branch 'upstream/custom-release-march-2018' into disable-CVT 2018-03-27 11:11:41 +02:00
Richard Cordovano
68a19f8aaa
Merge pull request #3592 from zhhl/3191-AddRunningIngestToIngestFileFilterTest
3191 add running of ingest to ingest file filter test
2018-03-26 16:49:02 -04:00
Richard Cordovano
54ba2678fe
Merge pull request #3612 from dgrove727/3665_SharedConfigBackwardsCompatibility
Added conditional logic to 'createFileIngestModule()'.
2018-03-26 16:44:28 -04:00
U-BASIS\dgrove
55e29d0c62 Added conditional logic to 'createFileIngestModule()'. 2018-03-26 16:22:28 -04:00
Richard Cordovano
5b055c5b86 Merge remote-tracking branch 'upstream/develop' into ingest-performance-fix 2018-03-26 15:44:59 -04:00
U-BASIS\zhaohui
5215b1e474 3191: cleanup 2018-03-26 15:42:09 -04:00
Richard Cordovano
ebb279b650 Rsolve merge conflict in VisualizationPanel.java 2018-03-26 15:39:11 -04:00
U-BASIS\zhaohui
b2dc85d4c0 3191: Delete the unuseful test methods. Test method uses getDataSources from open case instead of using a private callBack member to get datasource. 2018-03-26 15:14:47 -04:00
Richard Cordovano
54482c8752
Merge pull request #3611 from sleuthkit/custom-release-march-2018
Custom release march 2018
2018-03-26 14:25:41 -04:00
Richard Cordovano
ec4116b757
Merge pull request #3610 from sleuthkit/tags_and_cr_integration
Tags and cr integration
2018-03-26 14:24:23 -04:00
wschaeferB
c613ff744b
Merge branch 'custom-release-march-2018' into 3632-IngestAfterUnzip 2018-03-26 14:13:35 -04:00
Richard Cordovano
94291d1712
Merge pull request #3609 from sleuthkit/custom-release-march-2018
Custom release march 2018
2018-03-26 14:02:40 -04:00
Richard Cordovano
371f5683aa
Merge pull request #3608 from sleuthkit/report-search
Report search
2018-03-26 14:01:29 -04:00
Richard Cordovano
b3ddbd8e2f
Merge pull request #3607 from sleuthkit/custom-release-march-2018
Merge custom-release-march-2018
2018-03-26 13:59:11 -04:00
Richard Cordovano
166aee2e2d
Merge branch 'develop' into custom-release-march-2018 2018-03-26 13:58:45 -04:00
Richard Cordovano
2ae2356fff
Merge pull request #3606 from APriestman/custom-release-march-2018
Don't set the data source as the Report parent
2018-03-26 13:56:45 -04:00
Ann Priestman
e4858a1ad5 Don't set the data source as the Report parent 2018-03-26 13:48:46 -04:00
Richard Cordovano
9e458ced2c
Merge pull request #3605 from esaunders/develop
Python syntax error fix.
2018-03-26 13:35:48 -04:00
esaunders
9851ac4415 Python syntax error fix. 2018-03-26 13:33:38 -04:00
Richard Cordovano
7a0ac16bd3
Merge pull request #3603 from esaunders/develop
Fix for issue where the parent of an artifact is a report which does …
2018-03-26 13:31:20 -04:00
Richard Cordovano
5063f861a1
Merge pull request #3602 from APriestman/3671_preventEmptyImage
Don't allow the user to select a directory for Volatility module
2018-03-26 13:30:36 -04:00
Richard Cordovano
770cb9ec5b
Merge pull request #3601 from APriestman/3669_stringOOB
Fix string out of bounds error in Volatility DSP
2018-03-26 13:29:11 -04:00
Richard Cordovano
6ffbeceaf0
Merge pull request #3593 from eugene7646/file_filter_fix
File filter fix
2018-03-26 12:56:29 -04:00