Commit Graph
18120 Commits
Author SHA1 Message Date
Raman bcad232ee6 Added JIRA number for a TBD 2018-05-10 11:15:17 -04:00
Raman 140989d9c6 Resolving conflicts after stash pop 2018-05-10 08:51:00 -04:00
Raman 8b92a52b1b 3802: Group by datasource
Build the top level tree using new RootContentChildrenFactory
2018-05-10 08:45:45 -04:00
Raman c8bd4abf40 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3802_group_tree_by_datasource 2018-05-10 07:20:29 -04:00
Richard Cordovano 4eefd2deeb Merge pull request #3750 from rishwanth1995/disable_vmdkfiles_mac
Disable vmdkfiles in ImageFilePanel's filechooser mac
2018-05-09 17:13:21 -04:00
Richard Cordovano cfb84568ba Merge remote-tracking branch 'upstream/custom-release-may-2018' into develop 2018-05-09 17:12:46 -04:00
Richard Cordovano 8f7fd27bc0 Merge pull request #3716 from rishwanth1995/release-4.7.0
added a generic settings file for python modules
2018-05-09 17:07:37 -04:00
Richard Cordovano 6982f05cbc Merge pull request #3751 from wschaeferB/3830-FixEventBusUnregisterCalls
3830 call eventbus.unregister on object given as arg instead of 0
2018-05-09 16:18:01 -04:00
Richard Cordovano cb4745854b Merge pull request #3739 from dgrove727/3803_EncryptionSuspectedTskComment
TSK_COMMENT added.
2018-05-09 16:06:33 -04:00
U-BASIS\dgrove c393569ab2 Merge. 2018-05-09 14:02:32 -04:00
U-BASIS\dgrove ba6e2dbd0c Merge remote-tracking branch 'upstream/develop' into 3803_EncryptionSuspectedTskComment 2018-05-09 13:49:37 -04:00
William Schaefer 03ceae4c97 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3830-FixEventBusUnregisterCalls 2018-05-08 17:32:10 -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
rishwanth1995 fdd68cea37 disable vhdi and vmdk from filechooser 2018-05-08 16:51:54 -04:00
William Schaefer 650de50969 fix additional test related merge refactoring issues 2018-05-08 16:37:34 -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
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
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
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
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
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
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
Richard Cordovano e5955ac542 Case.getCurrentOpenCase => getCurrentCaseThrows 2018-05-07 10:46:24 -04:00
Richard Cordovano b7fd3cfef8 Merge pull request #3742 from rcordovano/3812-content-panel-stack-overflow
3812 content panel stack overflow
2018-05-07 10:09:54 -04:00
Richard Cordovano bedcaf6251 Restore ability to have a result view panel with no content view (Codacy fixes) 2018-05-04 18:42:04 -04:00
Richard Cordovano 82d9482f8c Restore ability to have a result view panel with no content view 2018-05-04 17:52:08 -04:00
Richard Cordovano 5cf5159ff9 Restore ability to have a result view panel with no content view 2018-05-04 17:49:38 -04:00
Richard Cordovano d84bdf2c50 Restore ability to have a result view panel with no content view 2018-05-04 17:47:11 -04:00
Richard Cordovano 4a0e5ea092 Restore ability to have a result view panel with no content view 2018-05-04 17:36:35 -04:00
Richard Cordovano 7f452ab4ea Restore ability to have a result view panel with no content view 2018-05-04 17:35:01 -04:00
U-BASIS\dgrove f7f4ad5882 Fixed bug with missing entropy value. 2018-05-04 16:59:14 -04:00
Brian Carrier 96646192ae Merge pull request #3740 from rishwanth1995/opencv_message
added opencv messagebox to show failure on linux
2018-05-04 14:01:00 -04:00
Brian Carrier 9204fc5a98 Update ImageUtils.java 2018-05-04 14:00:43 -04:00
rishwanth1995 5c79f6faf2 opencv messagebox 2018-05-04 13:43:57 -04:00
Richard Cordovano 12a0a01087 Merge branch 'release-4.7.0' of github.com:sleuthkit/autopsy into release-4.7.0 2018-05-04 13:30:49 -04:00
Brian Carrier a59649318d updated limitations 2018-05-04 12:46:18 -04:00
Richard Cordovano bb02bb0eb7 Initial changes to Case get case APIs 2018-05-04 12:23:51 -04:00
U-BASIS\dgrove b4a5bf5cb8 TSK_COMMENT added. 2018-05-04 12:10:46 -04:00