18156 Commits

Author SHA1 Message Date
Richard Cordovano
72fd1eb015 Repair Core/build.xml 2018-05-14 12:38:32 -04:00
Richard Cordovano
162bd4de8b
Merge branch 'develop' into custom-release-may-2018 2018-05-14 12:10:25 -04:00
Richard Cordovano
7903ad0710
Merge pull request #3768 from sleuthkit/release-4.7.0
Minor updates to documentation
2018-05-14 10:25:19 -04:00
Richard Cordovano
bb150ed295
Merge pull request #3755 from dgrove727/3784_BitlockerDetection
3784 bitlocker detection
2018-05-11 18:37:05 -04:00
Richard Cordovano
6ce3e7f3cf
Merge pull request #3758 from zhhl/3827-updateTestScript
3827: Update regression.py to take care of the new platform structure.
2018-05-11 11:35:38 -04:00
Brian Carrier
a0dba7a232
Merge pull request #3764 from rishwanth1995/setupsleuthkitbranch_ci
added python script to setup sleuthkit branch in appveyor and travis
2018-05-11 11:22:42 -04:00
Brian Carrier
5dbe8469b4
Updated comments. 2018-05-11 11:22:24 -04:00
rishwanth1995
496875b8d5 changed algorithm for sleuthkit branches 2018-05-11 10:12:41 -04:00
Brian Carrier
804682b34b
Merge pull request #3761 from rishwanth1995/launch_Script_bootable
cleanup bootable script
2018-05-10 16:54:37 -04:00
rishwanth1995
c1e8df66d5 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into setupsleuthkitbranch_ci 2018-05-10 16:43:38 -04:00
rishwanth1995
d1e7dd3ec0 cleanup bootable script 2018-05-10 16:39:41 -04:00
U-BASIS\zhaohui
c32b4f5dc0 3827: Update regression.py to take care of the new platform structure. 2018-05-10 15:28:29 -04:00
U-BASIS\dgrove
7554815580 Merge remote-tracking branch 'upstream/develop' into 3784_BitlockerDetection 2018-05-10 14:35:11 -04:00
Brian Carrier
d3948ae87d modified script a bit and moved it 2018-05-10 12:25:51 -04:00
Brian Carrier
ddb6c5a65a
Merge pull request #3745 from rishwanth1995/configdir_paladins
Used Dialog to prompt user about where to write config data for Linux Boot CD
2018-05-10 11:52:58 -04:00
U-BASIS\dgrove
fdb725188c Fixed Codacy issue with appending String literals. 2018-05-10 11:43:17 -04:00
Richard Cordovano
01995825d0 Fix merge error in AutoIngestManager.java 2018-05-10 11:28:39 -04:00
U-BASIS\dgrove
9c4cbae4c4 Fixed Codacy issues. 2018-05-10 11:21:15 -04:00
U-BASIS\dgrove
702f46d911 Merge remote-tracking branch 'upstream/develop' into 3784_BitlockerDetection 2018-05-10 10:49:28 -04:00
Richard Cordovano
43a313253f
Merge pull request #3743 from wschaeferB/3752-EncryptedPartitionTest
3752 encrypted partition test
2018-05-09 17:26:59 -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
William Schaefer
7f69c1176c 3752 update .gitignore to ignore data dir 2018-05-09 16:24:24 -04:00
William Schaefer
7aefbcbfe6 3752 remove local_files_test.zip 2018-05-09 16:19:19 -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
b72439141c 3752 remove empty setup method for Encrypted partition test 2018-05-09 12:47:16 -04:00
rishwanth1995
8df35680ed added python script to setup sleuthkit branch in appveyor and travis 2018-05-09 10:28:46 -04:00
rishwanth1995
029d040cb0 added setupconfigdirectory script 2018-05-09 09:35:39 -04:00
U-BASIS\dgrove
1a0ab488f1 Merge. 2018-05-08 23:22:20 -04:00
U-BASIS\dgrove
b8ec65adbc Bitlocker detection implemented. 2018-05-08 18:22:08 -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
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
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
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
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