19380 Commits

Author SHA1 Message Date
Brian Sweeney
398b82a217 Merge branch '3776-intra-case-tests' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation
# Conflicts:
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IngestedWithHashAndFileType.java
2018-05-24 09:30:00 -06:00
Brian Sweeney
b7d1c6678b Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation 2018-05-24 09:28:16 -06:00
William Schaefer
0fca4ebe4f 3845 move OpenCv library to corelibs 2018-05-24 11:00:54 -04:00
Brian Sweeney
cc2f4aeeac Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3776-intra-case-tests 2018-05-24 08:44:36 -06:00
Brian Sweeney
faa15d698a codacy and other code quality stuff 2018-05-24 08:43:51 -06:00
Raman
4dc742f29b Fixed the missing Reports node in "Group by data source" view. 2018-05-24 08:57:32 -04:00
Raman
a32004ec0a Removed unused import. 2018-05-24 08:17:52 -04:00
Raman
0201df71d7 Addressed Codacy comments. 2018-05-24 08:00:13 -04:00
Brian Sweeney
19d6d25e1f removed polymorphism in favor of encapsulation 2018-05-23 22:34:26 -06:00
Brian Sweeney
c3e6927e29 Merge branch '3776-intra-case-tests' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation 2018-05-23 16:08:33 -06:00
Brian Sweeney
d9454e9689 unused imports 2018-05-23 16:00:08 -06:00
Brian Sweeney
8adf71a9b9 getDataSourceByIndex changed to getDataSourceByName 2018-05-23 15:52:57 -06:00
William Schaefer
0549b46568 3845- add comments to helper methods added for folder creation 2018-05-23 17:07:13 -04:00
William Schaefer
093d9c531d 3845 adjust comments to clarify object detection module 2018-05-23 16:53:31 -04:00
William Schaefer
82d45af1b9 3845 - fix image utils condition for checking if ffmpeg is loaded 2018-05-23 16:38:55 -04:00
William Schaefer
837c084d2a 3845 - changes to image utils for loading of opencv library 2018-05-23 16:35:51 -04:00
William Schaefer
282b71b3b8 3845 working implementation of object detection module 2018-05-23 16:35:14 -04:00
Andrew Ziehl
1609463334 Merge branch '3788-intercase-correlation' of https://github.com/briangsweeney/autopsy into 3788-intercase-correlation 2018-05-23 13:29:45 -07:00
Andrew Ziehl
9cfcaaa51c Add null check on values, add CR tests for new query method. 2018-05-23 13:28:58 -07:00
Raman
85ccbde870 Merge branch '3802_group_tree_by_datasource' of https://github.com/raman-bt/autopsy into 3802_group_tree_by_datasource 2018-05-23 15:16:31 -04:00
Raman
81cde0ec7d Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3802_group_tree_by_datasource 2018-05-23 15:16:12 -04:00
Brian Carrier
ce24d2c505
Update README.txt 2018-05-23 13:13:25 -04:00
Raman
f5a95d37c6 3763: Group Results by data source
- Refactored previously added APIs to move from Sleuthkitcase to Blackboard.
2018-05-23 13:01:55 -04:00
Brian Sweeney
14215f25fd documentation / renaming 2018-05-23 10:40:19 -06:00
Richard Cordovano
2f16a197b1 Merge remote-tracking branch 'upstream/custom-release-may-2018' into develop 2018-05-23 12:35:39 -04:00
Richard Cordovano
26468595a9
Merge pull request #3803 from wschaeferB/MergeInMayRelease
Merge in may release
2018-05-23 12:32:10 -04:00
William Schaefer
60b71c5434 Fix merge conflicts with merging release into develop 2018-05-23 12:22:02 -04:00
Richard Cordovano
ba43fbdcbb
Merge pull request #3802 from esaunders/audit_logging_for_remote_events
Audit logging for remote events
2018-05-23 12:15:38 -04:00
Richard Cordovano
add87b03eb
Merge pull request #3786 from sleuthkit/supress_stacktrace
remove stack traces from log that are occuring during regression tests
2018-05-23 12:13:52 -04:00
Richard Cordovano
4a3cd46e8f
Merge pull request #3801 from wschaeferB/RemoveDuplicateComment-may
Remove duplicate comment adding from flagFile in encryptionDetection …
2018-05-23 12:03:21 -04:00
Richard Cordovano
be92dc6733
Merge pull request #3800 from wschaeferB/RemoveDuplicateComment
Remove duplicate comment adding from flagFile in encryptionDetection …
2018-05-23 12:00:46 -04:00
William Schaefer
5386c936f2 Remove duplicate comment adding from flagFile in encryptionDetection module 2018-05-23 11:57:47 -04:00
William Schaefer
92c35e38ad Remove duplicate comment adding from flagFile in encryptionDetection module 2018-05-23 11:56:41 -04:00
esaunders
bd26a92f0e Merge branch 'custom-release-may-2018' of github.com:sleuthkit/autopsy into audit_logging_for_remote_events 2018-05-23 10:02:35 -04:00
Richard Cordovano
e8b2dc820e
Merge pull request #3799 from esaunders/jobs_table_refresh_fix
Jobs table refresh fix
2018-05-23 10:00:16 -04:00
Brian Sweeney
638d6f644a simplified code 2018-05-23 07:44:14 -06:00
Brian Sweeney
e7bf655da2 tests - wip 2018-05-23 07:20:21 -06:00
Ann Priestman
c0ea7776e5 Testing map lookup before using query to get hasVisibleContentChildren 2018-05-23 09:11:52 -04:00
Raman
5da21f94da 3762: Group Tags by data source 2018-05-23 06:47:45 -04:00
Raman
d74cd1bfae Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3762_tags_by_datasource 2018-05-23 06:47:00 -04:00
Brian Sweeney
d95f8c5352 exception handling catches up to metadatabuilders api change 2018-05-22 15:00:52 -06:00
esaunders
1f9cb570d2 Added logging of remote control events for auditing purposes. 2018-05-22 16:47:49 -04:00
William Schaefer
00b13e0d0e 3845 load opencv libraries in manner that works for object detection module 2018-05-22 16:44:58 -04:00
esaunders
1a254bf7c2
Merge pull request #3797 from wschaeferB/FixBadMergeEncryptionTest
Add sqlcipher test image download back to build.xml
2018-05-22 16:27:23 -04:00
esaunders
075df52fe5
Merge pull request #3798 from wschaeferB/2018-22-05-NightlyBuildFix
Add sqlcipher test image download back to build.xml
2018-05-22 16:27:07 -04:00
William Schaefer
c9a3b590dc Add sqlcipher test image download back to build.xml 2018-05-22 15:27:52 -04:00
esaunders
5ed75e2f88 Merge branch 'custom-release-may-2018' of github.com:sleuthkit/autopsy into jobs_table_refresh_fix 2018-05-22 15:25:07 -04:00
esaunders
3fd5a526db Fix snapshot refresh issues by passing latest job state along with each event. 2018-05-22 15:24:48 -04:00
William Schaefer
c072fe57ae Add sqlcipher test image download back to build.xml 2018-05-22 15:24:06 -04:00
Brian Sweeney
d1456cd68c trivial code cleanup 2018-05-22 11:31:33 -06:00