Commit Graph
5953 Commits
Author SHA1 Message Date
Ann Priestman 3b9fc65c55 Merge remote-tracking branch 'upstream/develop' into autoIngestMove 2016-11-16 11:28:12 -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 c48b73b232 Fixing NPE 2016-11-11 14:19:29 -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
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
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
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
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
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
Sophie Mori 627f71e35e Implement getItemType in Accounts class 2016-11-02 16:37:33 -04:00
Sophie Mori ecd6c254e5 Added comments for column ordering and cleaned up unused methods 2016-11-02 13:22:00 -04:00
Ann Priestman 00a95a272d Merge remote-tracking branch 'upstream/develop' into slackSpace 2016-11-02 13:03:28 -04:00
Richard Cordovano 7df405271b Merge pull request #2390 from millmanorama/2053-accounts-refresh
fix null pointer exception, and index out of bounds exception when re…
2016-11-01 19:17:29 -04:00
Richard Cordovano e692c8d3e2 Merge pull request #2389 from millmanorama/make-accounts-nodes-lazier
improve lazy creation of accounts related nodes
2016-11-01 19:00:23 -04:00
Richard Cordovano 485cbbd37a Merge pull request #2394 from esaunders/vs_2015
Vs 2015
2016-11-01 14:34:33 -04:00
Ann Priestman 0da17bd6cc Adding SlackFileFilterNode.java 2016-11-01 14:01:01 -04:00
Ann Priestman 51d5d28948 Slack file timing testing 2016-11-01 13:55:28 -04:00
Ann Priestman 2da987a22f Add support for slack files 2016-10-31 15:28:57 -04:00
U-BASIS\zhaohui 76055ac8e6 2031: cleanup and let processor cancel(0 to cancel the task 2016-10-28 09:50:16 -04:00
millmanorama 92f5b8a153 improve lazy creation of accounts related nodes 2016-10-27 22:30:17 +02:00
millmanorama b37171e1ac fix null pointer exception, and index out of bounds exception when refreshing the accounts tree 2016-10-27 22:28:10 +02:00
Ann Priestman 9734adb003 Adding support for new SlackFile type 2016-10-27 09:37:07 -04:00
U-BASIS\zhaohui d9606a97f4 2031: add raw data source processor 2016-10-25 16:56:40 -04:00
Richard Cordovano b2f9b1ee75 Exclude set name and Solr doc id from credit card account reports 2016-10-20 11:49:35 -04:00
millmanorama 34f08fa780 don't report on associated artifacts for accounts 2016-10-20 12:52:33 +02:00
Richard Cordovano 39e3a96d0e Merge pull request #2382 from millmanorama/fix-accounts-refresh
refresh accounts when manual search adds results. upgrade to guava 19…
2016-10-19 17:41:31 -04:00