13105 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Richard Cordovano	d18ef89bf1	Merge remote-tracking branch 'upstream/develop-4.3.1' into develop	2017-02-08 19:57:21 -05:00
Richard Cordovano	34c549615b	Merge pull request #2517 from rcordovano/attrs_with_multiple_sources ... Attrs with multiple sources	2017-02-08 19:50:50 -05:00
Richard Cordovano	7a467d0e91	Improvements to attributes with multiple sources code	2017-02-08 19:48:46 -05:00
Richard Cordovano	3ed67b1df8	Add attribute sources to ArtifactStringContent	2017-02-08 19:06:35 -05:00
Richard Cordovano	332110c003	Merge pull request #2516 from rcordovano/attrs_with_multiple_sources ... Change custom artifact names for test ingest module	2017-02-08 18:12:23 -05:00
Richard Cordovano	2ca451b46e	Change custom artifact names for test ingest module	2017-02-08 18:10:53 -05:00
Richard Cordovano	bc5cd4b31e	Merge pull request #2515 from rcordovano/attrs_with_multiple_sources ... Attrs with multiple sources	2017-02-08 18:03:56 -05:00
Richard Cordovano	f22a453377	Clean and fix ArtifactStringContent	2017-02-08 17:59:18 -05:00
Richard Cordovano	4234d2c82d	Merge pull request #2510 from millmanorama/2249-scroll-thumb ... remove bottom gap and make scroll pane vertically resizable.	2017-02-08 12:12:55 -05:00
millmanorama	ed46fd5498	remove bottom gap and make scroll pane vertically resizable.	2017-02-08 13:11:17 +01:00
Richard Cordovano	45bad108b7	Changes to custom artifacts creation module test class	2017-02-06 17:32:13 -05:00
Richard Cordovano	c6ccff7f22	Merge pull request #2496 from sleuthkit/uniqe_extract ... Dedupe files in the export file action	2017-02-06 10:23:28 -05:00
Richard Cordovano	3e57b6d705	Merge pull request #2494 from wschaeferB/FilterBugFix ... Filter bug fix	2017-02-01 16:47:49 -05:00
Brian Carrier	3cb4a19b2f	Dedupe files in the export file action	2017-02-01 15:17:54 -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	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
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