Commit Graph
13132 Commits
Author SHA1 Message Date
William Schaefer 7c88dca3e9 Merge from stashed changes 2017-02-01 15:40:14 -05:00
William Schaefer eae04f4474 merge from FilterBugFix Branch resolution 2017-02-01 15:35:26 -05:00
William Schaefer 124eeffb4e Fixed count of files for mime tree when slack files hidden 2017-02-01 14:42:38 -05:00
William Schaefer f29a0ee154 mime type tree now able display the existing slack file nodes 2017-02-01 13:56:59 -05:00
William Schaefer 3548aa3e9c Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2198-RunIngestModuleWizard 2017-01-31 18:29:32 -05:00
William Schaefer 8140486b9d Modified FilesSet rules to use same isFile() comparrison as sleuthkit 2017-01-31 18:07:11 -05:00
William Schaefer 725f0905a8 1903 re-implementation of isFile() check before checking membership 2017-01-31 15:00:56 -05:00
William Schaefer 816725a70b typo with message text 2017-01-31 11:28:06 -05:00
William Schaefer cadac73563 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into FilterBugFix 2017-01-31 11:21:21 -05:00
William Schaefer a6f0766c0a 1903 Fixed bug with top level components not being filtered 2017-01-31 11:21:01 -05:00
Richard Cordovano e419f945fe Add NetBeans IDE Editor settings 2017-01-31 09:55:02 -05:00
Richard Cordovano 17828f6de2 Add IDE formatting settings file 2017-01-31 09:29:43 -05:00
William Schaefer aad6983e75 Minor formatting fix for FilesSetRulePanel.java 2017-01-30 17:59:28 -05:00
William Schaefer d7eab852ed 1903 - Bug fix for file Ingest Filters 2017-01-30 17:43:07 -05:00
William Schaefer 8cf28905d9 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2198-RunIngestModuleWizard 2017-01-30 10:13:30 -05:00
Richard Cordovano 06e075b377 Merge pull request #2491 from stiefel40k/develop
fix copy-paste error
2017-01-29 14:28:57 -05:00
stiefel40k b837959266 fix copy-paste error
fix copy-paste error at setting setting the createdChecked variable
2017-01-28 13:37:02 +01:00
Richard Cordovano e5ebb874f7 Merge pull request #2488 from zhhl/2093-parameterizeRegressionPythonScript
2093 parameterize regression python script
2017-01-27 14:54:20 -05:00
U-BASIS\zhaohui 909dedbb18 2093: clean up 2017-01-27 14:51:59 -05:00
Richard Cordovano 4eba2f2f74 Merge pull request #2489 from zhhl/2213-AntVersionWithUNCPathProblem
2213: ant 1.9.7 passes correct UNC format to Junit, but lower version…
2017-01-27 14:41:49 -05:00
U-BASIS\zhaohui 9be751bd9b 2213: ant 1.9.7 passes correct UNC format to Junit, but lower version has problems 2017-01-27 13:35:06 -05:00
U-BASIS\zhaohui 81369156ac 2093: cleanup 2017-01-27 12:50:34 -05:00
William Schaefer c76f4a7887 2198-Run ingest module wizard added but not connected to profiles 2017-01-25 15:33:36 -05:00
William Schaefer 5920b04557 Merge branch '2197-ProfileOptionsPanel' of https://github.com/wschaeferB/autopsy into 2198-RunIngestModuleWizard 2017-01-24 11:33:59 -05:00
William Schaefer 473b7dc17a 2197 - hiding history button when creating profile as per design doc 2017-01-24 11:33:05 -05:00
William Schaefer 258035a1c3 Merge branch '2197-ProfileOptionsPanel' of https://github.com/wschaeferB/autopsy into 2198-RunIngestModuleWizard 2017-01-24 10:56:59 -05:00
William Schaefer 82a921e27f 2197-changed config profile directory name to match design document 2017-01-24 10:56:25 -05:00
William Schaefer 1cd4634742 Merge branch '2197-ProfileOptionsPanel' of https://github.com/wschaeferB/autopsy into 2198-RunIngestModuleWizard 2017-01-23 16:49:46 -05:00
William Schaefer c1888c88c3 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2197-ProfileOptionsPanel 2017-01-23 16:48:27 -05:00
William Schaefer c67613754c Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2198-RunIngestModuleWizard 2017-01-23 16:48:03 -05:00
William Schaefer 96fb0438c7 2197 added duplicate profile name detection 2017-01-23 16:45:48 -05:00
U-BASIS\zhaohui 03a639c3da Merge remote-tracking branch 'upstream/develop' into 2093-parameterizeRegressionPythonScript 2017-01-23 16:16:33 -05:00
William Schaefer a818e0be7a 2197 documentation fixes 2017-01-23 15:37:18 -05:00
William Schaefer 00e52bd873 2197 removed saving from cancel method of ingest options panel 2017-01-23 12:21:23 -05:00
William Schaefer 80c85daef8 2197-buttons should no longer re-enable before ingest finishes 2017-01-23 12:00:49 -05:00
Richard Cordovano 5f13b2fe9f Merge pull request #2474 from millmanorama/PushbackReader
Pushback reader
2017-01-23 11:52:49 -05:00
William Schaefer 57ef8159d9 2197-enable/disable buttons on file ingest filter tab 2017-01-23 11:22:56 -05:00
William Schaefer 5afe85aaa5 2197-bug fix for when ingest settings tab wasn't last selected 2017-01-23 11:18:17 -05:00
William Schaefer df361b5e53 2197 - remaining text changed to @Messages, disabling during ingest added 2017-01-23 10:48:07 -05:00
millmanorama 10b92b1bf5 Merge remote-tracking branch 'upstream/develop' into PushbackReader 2017-01-23 15:45:53 +01:00
U-BASIS\zhaohui 220c959f55 Merge remote-tracking branch 'upstream/develop' into 2093-parameterizeRegressionPythonScript 2017-01-20 17:40:26 -05:00
William Schaefer 25eb6b44d9 2197 checking to ensure profiles are named now 2017-01-20 17:31:21 -05:00
William Schaefer 4489e48640 2197 allow Filter name box to auto-resize 2017-01-20 16:52:20 -05:00
William Schaefer 1a979b5880 2197 - fixed Bundle properties name for label text 2017-01-20 16:46:29 -05:00
William Schaefer b5cadd0f2d 2197-profile area mostly switched over to having text defined via @Messages 2017-01-20 16:39:39 -05:00
William Schaefer a9c858a3d8 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2197-ProfileOptionsPanel 2017-01-20 14:27:13 -05:00
Richard Cordovano 570282e8c3 Update PhotoRec ingest module startup error message 2017-01-20 14:11:21 -05:00
Richard Cordovano bc3c608b75 Merge pull request #2459 from wschaeferB/1903-IngestSetFilter
1903 File Ingest Filter
2017-01-20 14:01:55 -05:00
U-BASIS\zhaohui e28a604f5e 2093: regression.py updated for testing different product 2017-01-20 14:00:09 -05:00
William Schaefer 247ff02d14 Merge branch '1903-IngestSetFilter' of https://github.com/wschaeferB/autopsy into 2197-ProfileOptionsPanel 2017-01-20 13:31:56 -05:00