13208 Commits

Author SHA1 Message Date
Richard Cordovano
255029104f Merge pull request #2409 from wishdasher/AUT-2251_regripper_report_hive
Change if else ladders to switch statements in ExtractRegistry
2016-11-16 16:40:25 -05:00
Richard Cordovano
2d6b6d1056 Merge pull request #2408 from wishdasher/AUT-2253_internal_python_module_folder
Update README in InternalPythonModules folder
2016-11-16 16:30:08 -05:00
Ann Priestman
6071a57a7b Merging 2016-11-16 14:24:15 -05:00
Richard Cordovano
e159bdfeb3 Remove unnecessary warning suppresion from ReportWizardAction 2016-11-16 14:23:45 -05:00
Richard Cordovano
30deb77736 Fix warning for erroneous argument to InstalledFileLocator.locateAll in JythonModuleLoader 2016-11-16 14:22:37 -05:00
Ann Priestman
3b9fc65c55 Merge remote-tracking branch 'upstream/develop' into autoIngestMove 2016-11-16 11:28:12 -05:00
Richard Cordovano
e8ce4f7782 Merge pull request #2400 from APriestman/slackSpace
Add slack file support
2016-11-16 08:44:20 -05:00
William Schaefer
2bab13a1f2 1917 Null Case Implemented for MIME tree, and clean up 2016-11-15 16:48:58 -05:00
Sophie Mori
9348b7d42e Revert "Add hive path to name of recent activity report"
This reverts commit 4f7643219ec1882aee2e19307277149d41155db4.
2016-11-15 15:09:41 -05:00
Sophie Mori
4f7643219e Add hive path to name of recent activity report 2016-11-15 14:45:16 -05:00
Sophie Mori
15315132ba Change if else ladders to switch statements 2016-11-15 14:44:45 -05:00
Ann Priestman
bb00f9491f Added getItemType() 2016-11-15 10:06:13 -05:00
Ann Priestman
5b860abb44 Merge remote-tracking branch 'upstream/develop' into slackSpace
Conflicts:
	Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
2016-11-15 08:58:33 -05:00
Ann Priestman
6017af8adb Merging 2016-11-15 08:54:54 -05:00
Sophie Mori
d689f4861e Clean up code 2016-11-14 16:11:02 -05:00
Sophie Mori
25ee3d762b Update README in InternalPythonModules folder 2016-11-14 15:27:30 -05:00
William Schaefer
0a15b431c0 1917 minor comment fixes to denote some NON-NLS text 2016-11-14 13:43:22 -05:00
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
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
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
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
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
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