24459 Commits

Author SHA1 Message Date
William Schaefer
6c434baea2 Merge branch '5372-VideoThumbnailViewer-List' of https://github.com/wschaeferB/autopsy into 5369-ShowDuplicatesUI 2019-09-05 12:59:40 -04:00
William Schaefer
a89db1bdd8 Merge branch 'file-search' of https://github.com/sleuthkit/autopsy into 5372-VideoThumbnailViewer-List 2019-09-05 12:59:05 -04:00
Richard Cordovano
8e7dce5146
Merge pull request #5157 from sleuthkit/develop
Merge develop branch into the file-search feature branch
2019-09-05 12:57:48 -04:00
William Schaefer
4b927b3596 5369 resolve merge conflict 2019-09-04 13:05:15 -04:00
William Schaefer
69420a0c09 5372 remove unused code 2019-09-04 13:03:41 -04:00
William Schaefer
a6421fe1ad 5369 resolve merge conflicts 2019-09-04 12:55:27 -04:00
William Schaefer
81c1326b16 5372 allow videos to preserve ordering 2019-09-04 12:42:39 -04:00
William Schaefer
d9c954d0cb 5369 fix typo in word number 2019-09-03 17:43:29 -04:00
Richard Cordovano
6a80718236
Merge pull request #5145 from kellykelly3/extract-registry-issue
1329 - Removed double postArtifact calls
2019-09-03 12:40:15 -04:00
William Schaefer
9587a6f420 Merge branch '5372-VideoThumbnailViewer-List' of https://github.com/wschaeferB/autopsy into 5369-ShowDuplicatesUI 2019-08-29 11:07:07 -04:00
William Schaefer
c3e57475bb Merge branch 'file-search' of https://github.com/sleuthkit/autopsy into 5372-VideoThumbnailViewer-List 2019-08-29 11:05:32 -04:00
Brian Carrier
43cd23a839
Merge pull request #5134 from wschaeferB/5369-DedupingCodeChanges
5369 deduping code changes
2019-08-29 11:00:19 -04:00
Kelly Kelly
6beb640beb Removed double postArtifact calls 2019-08-28 14:38:49 -04:00
eugene7646
80ff04b90c
Merge pull request #5080 from wschaeferB/5118-cleanupSoutCalls
5118 cleanup sout calls
2019-08-28 11:08:51 -04:00
William Schaefer
02642400a9 Merge branch 'file-search' of https://github.com/sleuthkit/autopsy into 5369-DedupingCodeChanges 2019-08-28 11:06:05 -04:00
Brian Carrier
0c77695e9b
Merge pull request #5110 from wschaeferB/5370-AddFileSearchCaching
5370 add file search caching
2019-08-28 11:02:49 -04:00
William Schaefer
0a4cba4498 5118 resolve merge conflicts 2019-08-28 10:53:59 -04:00
William Schaefer
91ebd76a17 5369 remove non-functional wait cursor, will be easy to fix when this is a top component 2019-08-27 17:42:21 -04:00
William Schaefer
5a7571933c 5369 fix typo and warning 2019-08-27 17:19:20 -04:00
William Schaefer
6b39e0e22c 5369 add wait cursor fix reset of instances list 2019-08-27 17:06:58 -04:00
William Schaefer
f4708ab2fc 5369 minor clean up, update bundle files 2019-08-27 14:14:55 -04:00
William Schaefer
ac4895103c 5369 change info displayed on VideoThumbnailPanel 2019-08-27 14:10:20 -04:00
William Schaefer
62b71db68e 5369 update title of instances panel 2019-08-27 13:53:24 -04:00
William Schaefer
be6015771e 5369 change concept of duplicates to being one of instances 2019-08-27 13:27:38 -04:00
William Schaefer
3d55186491 Merge branch '5370-AddFileSearchCaching' of https://github.com/wschaeferB/autopsy into 5369-DedupingCodeChanges 2019-08-22 15:50:22 -04:00
William Schaefer
1fe55425f4 5370 fix comment' 2019-08-22 15:49:14 -04:00
William Schaefer
ae0235b422 5369 add panel to view files with same MD5 2019-08-22 15:33:35 -04:00
William Schaefer
ac2a84f0d1 5372 resolve merge conflict 2019-08-22 10:17:24 -04:00
William Schaefer
068851f8c0 Merge branch '5370-AddFileSearchCaching' of https://github.com/wschaeferB/autopsy into 5369-DedupingCodeChanges 2019-08-21 18:23:52 -04:00
William Schaefer
f2ccbb776e 5370 fix type bug 2019-08-21 18:22:35 -04:00
William Schaefer
af3686aa4a Merge branch '5370-AddFileSearchCaching' of https://github.com/wschaeferB/autopsy into 5369-DedupingCodeChanges 2019-08-21 17:38:05 -04:00
William Schaefer
c5ddee390c 5370 address codacy complaint 2019-08-21 17:37:26 -04:00
William Schaefer
70c7f2cb8b 5372 update MERGED file 2019-08-21 17:15:11 -04:00
William Schaefer
bda249e2ed 5372 clean up and add comments in preperation of PR 2019-08-21 17:09:22 -04:00
esaunders
478f735a4b
Merge pull request #5130 from dannysmyda/5374-Case-Uco-Portable-Case
5374 case uco portable case
2019-08-21 19:23:35 +00:00
William Schaefer
6f79f6bed5 5372 remove typo 2019-08-21 14:03:11 -04:00
William Schaefer
b0010f48d3 5372 add helper method for creating empty image list 2019-08-21 13:45:57 -04:00
William Schaefer
3e13c3e4d2 5372 adjust text under video thumbnails 2019-08-21 13:01:34 -04:00
William Schaefer
84c355994d 5372 working thumbnail viewer for videos 2019-08-21 11:31:00 -04:00
William Schaefer
ad27caa9ff Merge branch '5369-DedupingCodeChanges' of https://github.com/wschaeferB/autopsy into 5372-VideoThumbnailViewer-List 2019-08-20 16:38:44 -04:00
William Schaefer
d12f84ad9b Merge branch '5370-AddFileSearchCaching' of https://github.com/wschaeferB/autopsy into 5369-DedupingCodeChanges 2019-08-20 16:28:53 -04:00
William Schaefer
7297c71572 Merge branch 'file-search' of https://github.com/sleuthkit/autopsy into 5370-AddFileSearchCaching 2019-08-20 16:15:48 -04:00
esaunders
8504babe78
Merge pull request #5109 from wschaeferB/5367-DiscoverPaging
5367 discover paging
2019-08-20 20:05:36 +00:00
William Schaefer
2faf84201a Merge branch '5367-DiscoverPaging' of https://github.com/wschaeferB/autopsy into 5370-AddFileSearchCaching 2019-08-20 14:47:24 -04:00
William Schaefer
1ef3d2fb47 5367 fix merge error 2019-08-20 14:40:42 -04:00
William Schaefer
cdd61fb6aa Merge branch 'file-search' of https://github.com/sleuthkit/autopsy into 5367-DiscoverPaging 2019-08-20 14:37:19 -04:00
William Schaefer
017c0a5b46 5367 address additional codacy complaints 2019-08-20 14:37:07 -04:00
esaunders
6eb6156a95
Merge pull request #5035 from dannysmyda/4930-OOB-Case-Opening
4930 OOB Exception on Case Opening
2019-08-19 19:42:45 +00:00
esaunders
ed331c92e8
Merge pull request #5129 from sleuthkit/kw_docs
Better document which fields are used
2019-08-19 15:42:34 +00:00
esaunders
98383b6617
Merge pull request #5131 from dannysmyda/Fix-For-Jenkins-Failure
Fix bug in tskdbdiff
2019-08-19 14:51:12 +00:00