6231 Commits

Author SHA1 Message Date
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
Sophie Mori
69b8535dc6 Merge branch 'develop' into AUT-2106_tags_table_view 2016-11-11 16:52:22 -05:00
William Schaefer
f45b0b642b 1917 Mime Tree fixed when updating from empty to contents 2016-11-11 16:13:46 -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
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
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
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
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
Sophie Mori
e730d55597 Merge branch 'develop' into AUT-1849_persistent_table_column_reordering 2016-11-08 09:23:57 -05:00
Ann Priestman
5959ef0ed6 No longer store mime type in the gen info artifact 2016-11-08 08:56:38 -05:00
Ann Priestman
3df5c2330d Merge remote-tracking branch 'upstream/develop' into slackSpace 2016-11-08 08:43:31 -05:00
Richard Cordovano
4c0d2d59c1 Merge pull request #2396 from wishdasher/develop
Remove internal IDs from content viewer windows
2016-11-07 17:54:13 -05:00
Richard Cordovano
f9d100fd24 Merge pull request #2391 from zhhl/2031-rawDataSourceProcessor
2031 raw data source processor
2016-11-07 17:43:58 -05:00
Richard Cordovano
d07ef6d3a0 Merge pull request #2398 from wishdasher/AUT-2245_report_race_condition
Fix race condition between report completion and GUI state
2016-11-07 17:34:15 -05:00
Sophie Mori
3302c61283 Correct version number of virtual machine extractor module 2016-11-07 14:22:01 -05:00
U-BASIS\zhaohui
1cc1cd5a7b remove the PropertyChangeSupport instance and call super class method directly 2016-11-07 13:49:20 -05:00
Sophie Mori
17b3615976 Fix race condition between report completion and GUI state 2016-11-07 13:33:23 -05:00
U-BASIS\zhaohui
8a43f62e4b adjust the panel to make it looks similar to the other adding data source page. 2016-11-07 11:47:03 -05:00
U-BASIS\zhaohui
ebbac8a4ce cleanup PropertyChangeListener and deprecated enum value FOCUS_NEXT. 2016-11-07 11:12:20 -05:00
U-BASIS\zhaohui
d6ef38ad39 more uses of @Messages instead of hard coded for internationalization and more cleanup. 2016-11-07 10:58:01 -05:00
Ann Priestman
d0ffab6caa Setup up context menu for slack files.
Don't skip slack files in file type ID
2016-11-07 09:45:50 -05:00
Sophie Mori
9dbf189403 Remove unused imports 2016-11-07 09:42:45 -05:00
U-BASIS\zhaohui
dcc5a93278 use @Messages instead of hard coded for internationalization. Use UUID for deviceId. more cleanup 2016-11-07 09:06:32 -05:00
Sophie Mori
4fd347423d Revert "Remove internal ID and artifact ID from content viewer windows"
This reverts commit 1036e3eb29010ccf2a35378a2dfc7016a0ed3943.
2016-11-04 16:06:16 -04:00
Sophie Mori
4d8481b6a4 Allow logical files panel to handle files with commas 2016-11-04 15:45:52 -04:00
U-BASIS\zhaohui
cd247c8acb 2031: use 'Unallocated Space Image File' instead of 'Raw Data Source' for data source type 2016-11-04 13:09:24 -04:00
Sophie Mori
01a2f08250 merging develop 2016-11-04 11:32:31 -04:00
Sophie Mori
1036e3eb29 Remove internal ID and artifact ID from content viewer windows 2016-11-04 11:24:28 -04:00
U-BASIS\zhaohui
d50a6f7f3d 2031: clean up and change access level of the class/methods 2016-11-04 10:11:45 -04:00
U-BASIS\zhaohui
aa45df82f4 Merge remote-tracking branch 'upstream/develop' into 2031-rawDataSourceProcessor 2016-11-04 09:07:59 -04:00
Sophie Mori
6ce43540fc Add column key for file and keyword search result tables 2016-11-03 17:33:36 -04:00
Sophie Mori
a11db1244c Change column width sizing to get potential widths for first 100 rows 2016-11-02 17:56:43 -04:00