Commit Graph
13377 Commits
Author SHA1 Message Date
Richard Cordovano 2d2c1db850 Repair merge errors 2017-02-08 20:26:51 -05:00
Richard Cordovano 32a457808a Merge in develop branch 2017-02-08 20:13:19 -05:00
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 e908001ee5 Merge pull request #2514 from esaunders/ip_addr_kws_fix
Modified IP address regex so that it picks up addresses ending in 3 d…
2017-02-08 17:41:20 -05:00
esaunders 9a07bec10b Modified IP address regex so that it picks up addresses ending in 3 digits correctly. 2017-02-08 17:26:37 -05:00
Richard Cordovano 764c01e820 Merge pull request #2513 from esaunders/2290-store-doc-ids
Add document ids and search type to keyword hit artifacts
2017-02-08 16:59:24 -05:00
esaunders 5b348fce97 Merge branch 'search_improvements' of github.com:sleuthkit/autopsy into 2290-store-doc-ids 2017-02-08 16:11:58 -05:00
esaunders 0e81aba4ab Add document ids to keyword hit artifacts. 2017-02-08 16:11:36 -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
Richard Cordovano 3e72fd2228 Merge pull request #2512 from millmanorama/2260-cancel
cancel the future if something goes wrong.
2017-02-08 12:10:44 -05:00
millmanorama 8f0b71e639 cancel the future if something goes wrong. 2017-02-08 16:55:33 +01:00
millmanorama ed46fd5498 remove bottom gap and make scroll pane vertically resizable. 2017-02-08 13:11:17 +01:00
Richard Cordovano 405e4598a6 Merge pull request #2506 from esaunders/remove-hit-trimming
Remove hit trimming
2017-02-07 16:26:10 -05:00
esaunders 57d1b42350 Merge branch 'search_improvements' of github.com:sleuthkit/autopsy into remove-hit-trimming 2017-02-07 16:04:07 -05:00
esaunders 2147162db0 Removed trimming of keyword hits. 2017-02-07 16:03:44 -05:00
esaunders 3d67b0aeb0 Modified message displayed when we are unable to retrieve text for highlighting. 2017-02-07 16:03:06 -05:00
Richard Cordovano 5ba2efbf9d Merge pull request #2505 from millmanorama/TermsComponentQuery-text-field
2281- change the solr field that TermsComponentQuery searches on from content_ws to text.
2017-02-07 09:14:11 -05:00
millmanorama 733ce64d6d change the solr field that TermsComponentQuery searches on from content_ws to text. 2017-02-07 00:18:33 +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 f9c2bcadc6 Merge pull request #2502 from millmanorama/2259-sanitize-utf16-with-Charset-encoder
2259 sanitize utf16 with charset encoder
2017-02-06 10:22:34 -05:00
millmanorama 0747ae3642 cleanup and comments 2017-02-03 16:15:22 +01:00
millmanorama 5482fb4979 first pass at sanitizing the utf-16 as we read it. 2017-02-03 15:03:47 +01:00
Richard Cordovano 3f92ff0411 Merge pull request #2497 from millmanorama/2258-look-at-content-and-filename-seperately
2258 look at content and filename seperately
2017-02-02 12:00:42 -05:00
millmanorama 7b60e10235 look at file name even if the indexed text is 0 bytes. fix seperation of file name and content. 2017-02-02 15:18:41 +01:00
millmanorama 7dea03bf59 allow regex queries to match at start and end of content. fix seperation of file name and content 2017-02-02 15:12:40 +01: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
millmanorama 3f9b161a71 look at the values of content_str field separately: title/content 2017-02-01 16:48:52 +01: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
Richard Cordovano 92d27e0838 Merge pull request #2493 from eugene7646/dialogs
Solr 4 to 6 index upgrade bug fix
2017-01-30 17:51:52 -05:00
William Schaefer d7eab852ed 1903 - Bug fix for file Ingest Filters 2017-01-30 17:43:07 -05:00
Eugene Livis 09df4e6956 Removed unused code to copy config set 2017-01-30 17:18:03 -05:00
Eugene Livis 447aa0a960 Commented out createReferenceConfigSetCopy() and created a note as to why 2017-01-30 13:00:42 -05:00