Commit Graph
20607 Commits
Author SHA1 Message Date
William Schaefer 03ceae4c97 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3830-FixEventBusUnregisterCalls 2018-05-08 17:32:10 -04:00
William Schaefer 8ba0d716a3 3752 resolve merge conflict regarding getCurrentCaseThrows fix 2018-05-08 17:28:09 -04:00
esaunders 791d5bfd39 Merge pull request #3752 from wschaeferB/ChangeGetOpenCaseInTest
Fix merge error, updating getOpenCase to getCurrentCaseThrows
2018-05-08 17:25:15 -04:00
esaunders 70fae68153 Merge pull request #3753 from wschaeferB/ChangeGetOpenCaseInTest-Develop
Fix merge error, updating getOpenCase to getCurrentCaseThrows
2018-05-08 17:24:37 -04:00
Andrew Ziehl 664984102f PR fixes. 2018-05-08 14:19:30 -07:00
U-BASIS\zhaohui 76f26b90da Merge remote-tracking branch 'upstream/develop' into 3779-addDSFilterToFileSearchByattributes 2018-05-08 17:16:17 -04:00
rishwanth1995 fdd68cea37 disable vhdi and vmdk from filechooser 2018-05-08 16:51:54 -04:00
esaunders 9cfb2ac560 Attempt to get a wait cursor and fix for case deletion events not being handled. 2018-05-08 16:45:37 -04:00
William Schaefer 650de50969 fix additional test related merge refactoring issues 2018-05-08 16:37:34 -04:00
William Schaefer 7c96bc0713 3752 change calls to getOpenCase to getCurrentCaseThrows 2018-05-08 16:31:10 -04:00
William Schaefer a06cfb3c0c Fix merge error, updating getOpenCase to getCurrentCaseThrows in encryption detection test 2018-05-08 16:22:06 -04:00
William Schaefer 2f443ca6d3 Fix merge error, updating getOpenCase to getCurrentCaseThrows in encryption detection test 2018-05-08 16:20:26 -04:00
William Schaefer 49926828d4 3830 call eventbus.unregister on object given as arg instead of 0 2018-05-08 15:31:14 -04:00
William Schaefer 7446e82e3e 3752 remove comment about disabled test now that it is not disabled 2018-05-08 15:13:18 -04:00
William Schaefer 3965adbc97 Merge branch 'custom-release-may-2018' of https://github.com/sleuthkit/autopsy into 3752-EncryptedPartitionTest 2018-05-08 15:11:29 -04:00
William Schaefer 58b6f2da85 3752 enable Veracrypt test because of sleuthkit changes in 3820 2018-05-08 15:11:10 -04:00
U-BASIS\zhaohui 784383e728 3779: cleanup UI data settings 2018-05-08 15:06:38 -04:00
U-BASIS\zhaohui d17199fe3f 3779: Update log message. 2018-05-08 14:59:47 -04:00
U-BASIS\zhaohui 1a8b6aa305 3779: cleanup 2018-05-08 13:40:32 -04:00
U-BASIS\zhaohui ba7420d837 3779: cleanup 2018-05-08 13:39:04 -04:00
U-BASIS\zhaohui 6474b1b901 3779: Change rawtype to JList<String> 2018-05-08 13:29:59 -04:00
Eugene Livis fcbd0109e7 Merge develop 2018-05-08 12:52:09 -04:00
Eugene Livis 31695a9ad8 Merge branch 'develop' of github.com:sleuthkit/autopsy into ocr_via_tika_3760 2018-05-08 12:51:34 -04:00
esaunders 225406905f Fix equality check. 2018-05-08 12:02:14 -04:00
esaunders 2d8d5126cd Merge branch 'custom-release-may-2018' of github.com:sleuthkit/autopsy into 3738_job_cancellation 2018-05-08 11:11:38 -04:00
esaunders 89f9d88ac2 Merge pull request #3748 from esaunders/custom-release-may-2018
Fix clean target.
2018-05-08 11:10:32 -04:00
esaunders b64c75656e Fix clean target. 2018-05-08 11:08:48 -04:00
esaunders 8051b726ed Added case deletion support to dashboard and fixed bug in reprocessJob. 2018-05-08 11:07:09 -04:00
Ann Priestman c876721903 Merge branch 'custom-release-may-2018' into 3613_dashboard_gridLayout 2018-05-08 11:01:25 -04:00
Ann Priestman 5f4149901c Merge branch 'custom-release-may-2018' into 3613_dashboard_gridLayout 2018-05-08 10:55:42 -04:00
Richard Cordovano 7a6c8d8a8f Merge pull request #3715 from esaunders/3737_ain_pause_resume
3737 Added pause/resume/shutdown functionality to AID
2018-05-08 10:50:38 -04:00
U-BASIS\zhaohui 75ec49ba8d 3779: Add data source filter to file search by attributes 2018-05-08 10:31:49 -04:00
Brian Carrier a96f56511e minor updates autopsy-4.7.0 2018-05-08 10:20:12 -04:00
Brian Carrier 4d129a3c7b removed known_issues, which was very out of date 2018-05-08 10:11:00 -04:00
esaunders 5febae4bef Merge branch 'custom-release-may-2018' of github.com:sleuthkit/autopsy into 3738_job_cancellation 2018-05-08 10:01:30 -04:00
Richard Cordovano 60a679a813 Merge pull request #3746 from briangsweeney/common-files-sql-fix
Fix for postgres String handling of mime_type query
2018-05-08 09:29:44 -04:00
Andrew Ziehl d3de276cfc Comment out Panel call to CR matches builder. Build metadata list of only intercase matches. 2018-05-07 21:55:47 -07:00
Andrew Ziehl 5e40c87a94 Extend CommonFilesMetadataBuilder to query for all filtered md5s, add dead else case to Panel for when UI logic triggers CR common files lookup. 2018-05-07 21:43:17 -07:00
Andrew Ziehl 87b16c25bd Add CorrelationAttributeCommonInstance which maintains md5 for common files search. Modify lookup to produce new type, continue WIP MetadatBuilder method. 2018-05-07 21:23:55 -07:00
Andrew Ziehl 204b24f0c2 WIP intercase correlation changes. Needs abstraction and some refactoring. Also need a new class based on CorrelationAttributeInstance, which includes the value (md5) returned from the EamDB as part of the query results. 2018-05-07 20:17:54 -07:00
Brian Carrier 208b668231 Merge pull request #3747 from sleuthkit/buid_clean
Added clean step for release process
2018-05-07 21:51:41 -04:00
Brian Carrier 2cee592939 Added clean step for release process 2018-05-07 21:50:13 -04:00
Andrew Ziehl bc00fc95fd Fix for postgres String handling of mime_type query 2018-05-07 17:43:06 -06:00
Richard Cordovano b187f43076 Merge branch 'custom-release-may-2018' into develop 2018-05-07 17:45:40 -04:00
Richard Cordovano 19dd0a0ca7 Change project back from RELEASE to DEVELOPMENT 2018-05-07 17:43:44 -04:00
Richard Cordovano 356ca9e1c3 Merge in custom-release-may-2018 branch and resolve conflicts 2018-05-07 16:08:40 -04:00
Andrew Ziehl 4261b8c031 Fix for postgres String handling of mime_type query 2018-05-07 12:44:39 -07:00
Richard Cordovano 523c2929f9 Merge in custom-release-may-2018 branch and resolve conflicts 2018-05-07 15:24:55 -04:00
Richard Cordovano 2c500be5bb Merge in release 4.7.0 branch 2018-05-07 15:17:26 -04:00
Richard Cordovano 2738ebfbea Merge in release-4.7.0 branch and resolve conflicts 2018-05-07 14:14:12 -04:00