Commit Graph
13099 Commits
Author SHA1 Message Date
Eugene Livis f609cfc8b1 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2017-01-31 09:29:34 -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
U-BASIS\zhaohui 03a639c3da Merge remote-tracking branch 'upstream/develop' into 2093-parameterizeRegressionPythonScript 2017-01-23 16:16:33 -05:00
Richard Cordovano 5f13b2fe9f Merge pull request #2474 from millmanorama/PushbackReader
Pushback reader
2017-01-23 11:52:49 -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
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 be8483efca 1903 - create new file ingest fitler will now always be last option in jcombobox 2017-01-20 13:28:37 -05:00
William Schaefer 8bf973a1ee 1903-Removed manipulation of process unallocated checkbox from regression test 2017-01-20 13:15:59 -05:00
William Schaefer e45dfea90a 1903 updated error message for PhotoRecCarver when ignore unallocated is enabled 2017-01-20 12:52:31 -05:00
William Schaefer c09ebd99aa 1903 renamed FilesSetsSerializable to FileSetsDefinitions, added read write methods to it 2017-01-20 12:32:04 -05:00
William Schaefer 1d82336c81 1903 added class for serializing filesSets other than interesting ones 2017-01-20 10:49:17 -05:00
millmanorama 363b5c2cce comments and some minor refactoring 2017-01-20 14:17:34 +01:00
millmanorama d490dfc44b fix window overlapping 2017-01-20 13:59:55 +01:00
millmanorama 851c0721ed correct size calculations 2017-01-20 13:59:54 +01:00
millmanorama 23afb4515e refactor exception handling of Chunker 2017-01-20 13:59:31 +01:00
millmanorama 506a3037a4 finish PushbackReader implementation of Chunker, introduce TextExtractorException 2017-01-20 13:59:26 +01:00
jmillman 104cbd4dc4 restore space in "Keyword Search" 2017-01-20 13:59:24 +01:00
millmanorama 0a7af485f2 return instead of just break to stop infinite loop 2017-01-20 13:59:22 +01:00
millmanorama 76797f3c8a move Chunker to its own file; replace BufferedReader with PushbackReader 2017-01-20 13:59:20 +01:00
William Schaefer d745830415 1903 surpress warning from unchecked cast of FilesSets map 2017-01-19 19:34:20 -05:00
William Schaefer 4c3d050b9b 1903 removed class to serialize FileIngestFilters when back to raw map 2017-01-19 19:33:01 -05:00
William Schaefer 89fff3813a 1903 added wrapper for serialization of FileIngestFilters to avoid unchecked casting warning 2017-01-19 19:17:54 -05:00
William Schaefer 9530b7978a Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1903-IngestSetFilter 2017-01-19 19:05:39 -05:00
William Schaefer 773f5c2549 1903 removed some unused imports 2017-01-19 19:03:56 -05:00
William Schaefer 0753f545db 1903 - removed notes to self 2017-01-19 18:38:38 -05:00
William Schaefer 7e4e459d75 1903-FileSetXML functionality moved to InterestingItemsFilesSetSettings, FileIngestFilters serialized as map 2017-01-19 18:20:41 -05:00
Richard Cordovano 836413f781 Merge pull request #2471 from esaunders/snippet_fix
Snippet fix
2017-01-19 17:36:37 -05:00
William Schaefer ca7e1b2e49 1903 returned InterestingItemsFilesSetSettings to its necessary form 2017-01-19 17:28:30 -05:00
esaunders d4a4542d04 Modified filterResults() to return the hits for the lowest chunk associated with an object, assuming we haven't seen a hit for the keyword in the object before. 2017-01-19 17:27:46 -05:00
esaunders b1c0815c4f Made KeywordHit implement Comparable so that lists of hits can be sorted. 2017-01-19 17:20:43 -05:00
esaunders 2217eb0f98 Removed getOneHitPerObject() since Searcher.filterResults() guarantees that we will get a single hit per object (for the lowest numbered chunk). 2017-01-19 17:20:02 -05:00
William Schaefer b42759405e 1903-partial fix to FilesSetsManager, removed unneeded methods 2017-01-19 17:16:31 -05:00
William Schaefer db3e4678d6 1903-Changes to FilesSet to to decouple from FileIngestFilter and fix name of ignoreUnallocated flag 2017-01-19 16:04:23 -05:00
William Schaefer 55d158e422 1903-Fixes to InjestJobSettingsPanel regarding file ingest filters 2017-01-19 14:30:53 -05:00
William Schaefer b001d6bc36 1903 - fixes to IngestJobSettings, default filters moved to FilesSetsManager 2017-01-19 12:12:57 -05:00
William Schaefer 242aae597e 1903-fixed name issues with default filters 2017-01-19 11:18:50 -05:00
William Schaefer 916109e9b9 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1903-IngestSetFilter 2017-01-19 10:58:29 -05:00
Richard Cordovano 444a54ea5a Merge pull request #2469 from esaunders/snippet_fix
Snippet fix
2017-01-18 23:33:59 -05:00
esaunders fdf83c751e Merge branch 'develop' of github.com:sleuthkit/autopsy into snippet_fix 2017-01-18 17:37:01 -05:00
esaunders 4bf5988c40 Modified filterResults() to only return a a single hit per keyword per object where a hit for that keyword on that object has not been seen before. 2017-01-18 17:31:50 -05:00
Brian Carrier 4e3bbe644f merged release 2017-01-18 16:13:53 -05:00