Commit Graph
15783 Commits
Author SHA1 Message Date
William Schaefer 77b874e075 3199 resolve merge conflicts from 3198 changes 2017-11-15 12:19:30 -05:00
William Schaefer 273434f50f Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3198-TagPropertiesUpdate 2017-11-15 11:59:44 -05:00
William Schaefer c2d0bbb932 3198 comment getTagNameDefinitions 2017-11-15 11:59:10 -05:00
Richard Cordovano 25f6f2657f Rename DataSource => AutoIngestDataSource for clarity 2017-11-15 11:55:52 -05:00
Richard Cordovano 183536c832 Merge pull request #3181 from eugene7646/archive_dsp_v2_3136
Archive DSP (3136)
2017-11-15 10:53:36 -05:00
Richard Cordovano 98b0290959 Merge remote-tracking branch 'upstream/release-4.5.1' into develop 2017-11-15 10:14:19 -05:00
Richard Cordovano 16abf6bf4c Update develpers folder contents 2017-11-15 09:41:08 -05:00
Richard Cordovano 6d23931448 Merge pull request #3202 from dgrove727/3177_Aid10Metrics
3177 aid10 metrics
2017-11-14 16:16:52 -05:00
U-BASIS\dgrove e78980cb6e Merge 2017-11-14 02:45:19 -05:00
U-BASIS\dgrove e64e30181e Typo 2017-11-14 02:26:38 -05:00
U-BASIS\dgrove 22f023002c Fixed merge issue. 2017-11-14 02:24:24 -05:00
U-BASIS\dgrove 8934275246 Merge remote-tracking branch 'upstream/develop' into 3177_Aid10Metrics 2017-11-13 17:31:00 -05:00
U-BASIS\dgrove 556810da0e Fixed merge conflict. 2017-11-13 16:52:19 -05:00
U-BASIS\dgrove e63c7d8723 Cleanup. 2017-11-13 16:28:55 -05:00
U-BASIS\dgrove 5edea4c595 API added for getting data source content size. 2017-11-13 16:26:14 -05:00
Richard Cordovano 48123343cc Merge pull request #3192 from zhhl/3155-waitCursorInIngestInbox
3155: Busy cursor in ingest inbox
2017-11-13 14:31:17 -05:00
Richard Cordovano a241a9a3c0 Merge pull request #3188 from dgrove727/3192_WaitCursor
Wait cursor set for 'Ingest Module Settings' button.
2017-11-13 14:20:18 -05:00
Richard Cordovano bb0f25ae02 Merge pull request #3187 from esaunders/release-4.5.1
Reduce memory consumed by keyword search hits
2017-11-13 13:26:28 -05:00
Richard Cordovano 146dacd541 Merge pull request #3180 from dgrove727/3148_AlertFiles
3148 alert files
2017-11-13 13:22:28 -05:00
U-BASIS\dgrove 2e3fcab59d Fixed for merging. 2017-11-10 16:02:26 -05:00
U-BASIS\dgrove ca64d9a397 Pulling node data to determine case status. 2017-11-10 10:28:47 -05:00
William Schaefer 4a61034b31 3199 merge in changes from 3198 2017-11-09 17:00:41 -05:00
William Schaefer e1770f5fdf 3198 change storage of knownStatus for TagNameDefinition from String to enum 2017-11-09 16:53:29 -05:00
Richard Cordovano fad0383803 Merge pull request #3186 from wschaeferB/FixHeightOfOptionsPanels
Fix height of options panels
2017-11-09 15:55:42 -05:00
William Schaefer 74e9378e8b Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3198-TagPropertiesUpdate 2017-11-09 15:51:58 -05:00
U-BASIS\zhaohui a38763a85f 3155: Busy cursor in ingest inbox 2017-11-09 14:46:33 -05:00
Eugene Livis 3c95a7a70a ArchiveExtractorDSProcessor no longer implements ArchiveExtractorDSProcessor interface 2017-11-09 13:28:00 -05:00
Eugene Livis c1808f4a03 Bug fix 2017-11-09 13:23:58 -05:00
Eugene Livis 3c433fcee3 Optimization for getting, storing, and sorting DSP list only once 2017-11-09 13:13:06 -05:00
Eugene Livis 0c46e2d2d7 Only adding logical file set if there are files remaining. Bug fixes. Optimizations 2017-11-09 12:26:25 -05:00
Eugene Livis cb7a93d081 Added simpler interfaces that require only one method call 2017-11-09 12:25:27 -05:00
Eugene Livis dd34e770d8 Fixed a bug in AIMs use of taskId and data source addition notification 2017-11-09 12:24:29 -05:00
Eugene Livis 64c6a9568f Merge branch 'develop' of github.com:sleuthkit/autopsy into archive_dsp_v2_3136 2017-11-09 09:46:36 -05:00
Richard Cordovano a0f0e3cffc Merge remote-tracking branch 'upstream/release-4.5.1' into develop 2017-11-08 17:48:02 -05:00
Richard Cordovano b4d2cbd447 Update comment in some JPanel subclasses 2017-11-08 17:45:39 -05:00
Richard Cordovano 35ce341372 Workaround for JComponent.addPropertyChangeListener calls in ctor 2017-11-08 17:41:10 -05:00
Richard Cordovano 64a0e83132 Merge in release-4.5.1 branch and resolve conflicts 2017-11-08 12:09:08 -05:00
U-BASIS\dgrove 88d668ffeb Wait cursor set for 'Ingest Module Settings' button. 2017-11-08 00:54:53 -05:00
esaunders 0a6b3bc62b Use String interning instead of our own hashmap to reuse hits. 2017-11-07 16:48:11 -05:00
esaunders ec9d24b4a8 Merge branch 'release-4.5.1' of github.com:sleuthkit/autopsy into release-4.5.1 2017-11-07 16:13:19 -05:00
esaunders e1546bd510 Only create one KeywordHit instance per document for a given hit. 2017-11-07 16:12:06 -05:00
William Schaefer 09f729f92c Merge branch '3198-TagPropertiesUpdate' of https://github.com/wschaeferB/autopsy into 3199-ConsolidateDefaultTags 2017-11-07 15:22:58 -05:00
William Schaefer 4770217954 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3198-TagPropertiesUpdate 2017-11-07 15:22:28 -05:00
Richard Cordovano 2772cdfe19 Merge pull request #3185 from zhhl/3180-UnitTestCreateAndDeleteCase
3180 unit test create and delete case
2017-11-07 14:10:13 -05:00
William Schaefer b85a41b4b9 fixed height of File ext mismatch settings Panel 2017-11-07 13:54:58 -05:00
William Schaefer 635537496a fixed height of External Viewer Global Settings Panel 2017-11-07 13:54:35 -05:00
William Schaefer 59d42a84fe Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3198-TagPropertiesUpdate 2017-11-07 13:52:49 -05:00
U-BASIS\zhaohui 82ec21ac1a 3180: delete unused import 2017-11-07 13:49:19 -05:00
U-BASIS\zhaohui a8648cdbb1 3180: Move unit test to qa-functional test and adding Case creation and deletion 2017-11-07 13:45:21 -05:00
Richard Cordovano af66549f56 Merge pull request #3172 from dgrove727/2942_CrashedJobs
2942 crashed jobs
2017-11-06 18:10:16 -05:00