Commit Graph
18776 Commits
Author SHA1 Message Date
Sophie Mori b3549a2c3f Add radio button/checkbox format for fileextmismatch settings 2016-11-14 13:41:31 -05:00
William Schaefer ec2e548f2b Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1917-MimeTypeView-NewTree-2nd 2016-11-14 13:09:27 -05:00
William Schaefer e8f7029a0f 1917-Comments added and other minor clean up, emptyNode removed 2016-11-14 13:05:23 -05:00
Richard Cordovano 66358cb265 Merge pull request #2407 from APriestman/dbDiff
Use the last end parentheses in normalize_db_entry instead of the fir…
2016-11-14 09:53:07 -05:00
Ann Priestman efdbc58501 Use the last end parentheses in normalize_db_entry instead of the first occurrence.
Fixes bug for file names containing parentheses.
2016-11-14 09:46:44 -05:00
Sophie Mori 757f880675 Change display type to make it cleaner 2016-11-11 17:03:28 -05:00
Sophie Mori 69b8535dc6 Merge branch 'develop' into AUT-2106_tags_table_view 2016-11-11 16:52:22 -05:00
Sophie Mori 12156cf226 Clean up code 2016-11-11 16:40:54 -05:00
Sophie Mori edaf49774d Add substring option to keyword lists, modify xml config read and write 2016-11-11 16:30:52 -05:00
William Schaefer f45b0b642b 1917 Mime Tree fixed when updating from empty to contents 2016-11-11 16:13:46 -05:00
U-BASIS\zhaohui 0e123d55ef 2050: add more info for the error msg for KeywordSearchResultFactory 2016-11-11 15:12:12 -05:00
U-BASIS\zhaohui e0473bce63 2050: add more info for the error msg 2016-11-11 15:08:39 -05:00
U-BASIS\zhaohui f3f800e138 2050: KeyworkSearchException is handled at the caller level of performQuery 2016-11-11 14:51:21 -05:00
Ann Priestman c48b73b232 Fixing NPE 2016-11-11 14:19:29 -05:00
William Schaefer cfeae34850 1917 - Mime Type tree added - still needs clean up and null case 2016-11-11 13:55:47 -05:00
Ann Priestman 34ba3ad0d2 Merge in progress 2016-11-11 13:50:57 -05:00
Richard Cordovano 4a3242f92f Merge pull request #2404 from wishdasher/file_parent_node_column_homogeneity
Give parent nodes of files consistent column ordering, fix index collision behavior
2016-11-11 10:27:53 -05:00
millmanorama f97183fc9f cleanup RegexQuery; find all hits not just first 2016-11-11 12:55:38 +01:00
millmanorama 30a3d007b7 use initial snippet if available 2016-11-11 12:52:44 +01:00
millmanorama 5a8163236f increase MAX_SOLR_MEM_MB to 1024 from 512 2016-11-11 12:51:50 +01:00
millmanorama 9732172bfd use [] range notation for digits instead of \d character class; 2016-11-11 12:51:23 +01:00
Sophie Mori 1f9f60dbc6 Fix unexpected behavior when two columns come to share the same index 2016-11-10 16:32:29 -05:00
Sophie Mori d6db5a7160 Give nodes that are parents of file-like objects the same key 2016-11-10 11:28:02 -05:00
Ann Priestman d21bbcfaea Cycle through each DSP with non-zero confidence in decreasing order of confidence. 2016-11-10 11:17:44 -05:00
millmanorama 5ea7d72755 begin buildout of RegexQuery to parse the hits from content returned by solr 2016-11-10 10:30:13 +01:00
millmanorama 139fd29509 add string field to schema 2016-11-10 10:29:28 +01:00
Richard Cordovano 467e84c350 Merge pull request #2386 from wishdasher/AUT-2237_open_report_external_viewer
Modified ExternalViewerAction to accommodate opening reports
2016-11-09 18:02:56 -05:00
Sophie Mori b3b2b37235 Fix bundle message 2016-11-09 17:40:43 -05:00
Richard Cordovano f21e7c44a1 Merge branch 'solr_6_upgrade' into develop 2016-11-09 17:10:08 -05:00
Richard Cordovano c2eceffe12 Increase regression test sleep durations during report generation 2016-11-09 17:08:29 -05:00
esaunders 04c8216553 Merge branch 'solr_6_upgrade' of github.com:sleuthkit/autopsy into solr6_standalone 2016-11-09 16:18:53 -05:00
Richard Cordovano 299ebbe4dd Merge pull request #2403 from wishdasher/column_key_value_conflict
Make column order loading robust against identical position values
2016-11-09 16:05:58 -05:00
Sophie Mori 7ef40946f0 Make column order loading robust against identical position values 2016-11-09 15:53:22 -05:00
esaunders a4b8431779 Initial stab at getting Solr 6 to start in standalone mode. 2016-11-09 13:57:23 -05:00
Sophie Mori 1efcfe3dc5 Add a few more basic mode MIME types 2016-11-09 13:34:02 -05:00
Sophie Mori 80eea3d420 Fix alignment of elements in file ext ingest settings panel 2016-11-09 13:33:43 -05:00
Richard Cordovano 9a57153e18 Merge pull request #2402 from eugene7646/solr6_merge_develop
Updates to use Solr 6.2.1
2016-11-09 13:31:51 -05:00
Eugene Livis 3274de11c1 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into solr6_merge_develop 2016-11-09 12:40:53 -05:00
Sophie Mori 5052d62133 Clean up code 2016-11-09 10:32:58 -05:00
Sophie Mori b957ebd795 Resolve merge conflict between columns reordering and tag column color 2016-11-09 10:23:55 -05:00
Sophie Mori e0b1d719cc Merge branch 'develop' into AUT-1849_persistent_table_column_reordering 2016-11-09 09:44:29 -05:00
Sophie Mori 8ebe87e8e2 Merge branch 'develop' into AUT-1849_persistent_table_column_reordering 2016-11-09 09:43:20 -05:00
Sophie Mori 041186873b Format MIME types better 2016-11-09 09:43:08 -05:00
William Schaefer a309bbb6e0 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1917-MimeTypeView-NewTree-2nd 2016-11-08 17:48:26 -05:00
Richard Cordovano 57bdbc4792 Merge pull request #2356 from wishdasher/AUT-1849_persistent_table_column_reordering
Fixed and added to implementation for persistent table column reorderings
2016-11-08 17:38:50 -05:00
William Schaefer 5242566ea0 1917 Added Node Level between Views and (Files by Ext AND Files by MIME) 2016-11-08 17:30:48 -05:00
Sophie Mori 541a5a1c11 Add file ext mismatch basic mode that checks only img and exe 2016-11-08 17:05:47 -05:00
Ann Priestman 0be6b1c3dc Merge remote-tracking branch 'upstream/develop' into mergeTest
Conflicts:
	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
2016-11-08 13:08:58 -05:00
Sophie Mori 7194ff676a Clean up three data source type panels 2016-11-08 10:28:29 -05:00
Ann Priestman d9c8cb4cbe Cleanup 2016-11-08 09:57:32 -05:00