Commit Graph
23573 Commits
Author SHA1 Message Date
Joe Ho eeb85baa89 Fix a bug during end-to-end test. Test for .vhd file instead of sparse_image.vhd 2019-06-17 08:52:39 -04:00
Joe Ho 5078652f70 Resovle conflicts 2019-06-14 14:32:39 -04:00
Joe Ho a76aee9651 Revert all the Bundle.properties-MERGED file not related to this JIRA 2019-06-14 14:26:56 -04:00
Joe Ho 25d822f593 Fix PR comments 2019-06-14 14:05:28 -04:00
Joe Ho e0259007d1 Update Bundle.properties-MERGED 2019-06-13 17:27:13 -04:00
Joe Ho 21afac69b7 Remove unused parameters 2019-06-13 17:14:33 -04:00
Joe Ho cf01ea8326 Add initial code. 2019-06-13 17:07:57 -04:00
Richard Cordovano e45e385cf7 Update bundle.properties.MERGED files 2019-06-13 14:59:03 -04:00
Joe Ho 75cb75f430 Merge remote-tracking branch 'upstream/develop' into develop 2019-06-13 14:37:01 -04:00
Richard Cordovano b261e2d9bd Merge pull request #4895 from sleuthkit/release-4.12.0
Merge release 4.12.0 branch into develop branch
2019-06-13 14:21:28 -04:00
Richard Cordovano 51de6079ac Merge pull request #4856 from APriestman/5133_displayMIME
5133 Show custom mime types in main panel
2019-06-13 14:19:24 -04:00
Richard Cordovano a7d841e1c5 Merge pull request #4857 from APriestman/5137_disableFields
5137 Disable appropriate fields when loading panel.
2019-06-13 14:07:26 -04:00
Richard Cordovano dc09cf365c Merge pull request #4860 from APriestman/5135_regexWarning
5135  Warn user if a comma is present in an extension regex
2019-06-13 12:42:23 -04:00
Richard Cordovano f29ffe5db9 Merge remote-tracking branch 'upstream/develop' into release-4.12.0 2019-06-12 20:23:54 -04:00
Richard Cordovano 45d783348a Merge remote-tracking branch 'upstream/release-4.12.0' into develop 2019-06-12 20:22:58 -04:00
Richard Cordovano f96ef19943 Merge remote-tracking branch 'upstream/develop' into release-4.12.0 2019-06-12 20:22:27 -04:00
Richard Cordovano efbddf770c Merge pull request #4846 from jkho/5073-Improve-Logical-Imager-DSP-panel
5073 improve logical imager dsp panel
2019-06-12 17:55:52 -04:00
Joe Ho df6e7b8a10 Merge remote-tracking branch 'upstream/develop' into develop 2019-06-12 17:49:47 -04:00
Richard Cordovano 4a99c9c8c8 Merge pull request #4891 from sleuthkit/release-4.12.0
Merge release 4.12.0 branch into develop branch
2019-06-12 17:08:09 -04:00
Richard Cordovano 9ef2cb0098 Merge pull request #4890 from sleuthkit/develop
Merge develop branch into release-4.12.0 branch
2019-06-12 17:07:18 -04:00
Joe Ho dd27e6cb28 changes after develop build 2019-06-12 17:05:41 -04:00
Richard Cordovano 19eef0ff2b Merge pull request #4889 from sleuthkit/release-4.12.0
Merge release 4.12.0 branch into develop branch
2019-06-12 17:05:25 -04:00
Richard Cordovano ea16e17e31 Merge pull request #4879 from wschaeferB/AddMissingMergedBundleProperties
Add a merged files which have new bundle properties
2019-06-12 17:03:47 -04:00
Richard Cordovano 7c91b6ffa1 Merge pull request #4875 from wschaeferB/5138-SubstringIsConfusing
5138 substring is confusing
2019-06-12 16:36:45 -04:00
William Schaefer b0b7010116 5138 change interest files set rule dialog title 2019-06-12 16:02:10 -04:00
Richard Cordovano 3150d7c23c Merge pull request #4885 from sleuthkit/revert-4883-message-threads
Revert "Merge develop into message-threads"
2019-06-12 15:50:05 -04:00
Richard Cordovano 6d30854e0d Revert "Merge develop into message-threads" 2019-06-12 15:48:36 -04:00
Richard Cordovano d6a0e29c8e Merge pull request #4884 from sleuthkit/release-4.12.0
Merge release 4.12.0 branch into develop branch
2019-06-12 15:37:05 -04:00
Richard Cordovano dd529b0def Merge pull request #4880 from wschaeferB/5019-PopulateOccurrencesColumn
5019 populate occurrences column
2019-06-12 15:36:21 -04:00
Richard Cordovano db6ac785a3 Merge pull request #4883 from kellykelly3/message-threads
Merge develop into message-threads
2019-06-12 14:58:43 -04:00
Kelly Kelly 0e0dd710f2 Merge remote-tracking branch 'upstream/develop' into message-threads 2019-06-12 14:48:25 -04:00
Richard Cordovano cae62f4174 Merge pull request #4882 from sleuthkit/release-4.12.0
Merge release 4.12.0 branch into develop branch
2019-06-12 13:55:29 -04:00
Richard Cordovano 13d21d187f Merge pull request #4878 from raman-bt/5105-spaces-around-casename
5105: Erroneous "new case" wizard behavior if case name ends with emp…
2019-06-12 13:54:50 -04:00
Richard Cordovano 94674d2e20 Merge pull request #4881 from sleuthkit/release-4.12.0
Merge release 4.12.0 branch into develop branch
2019-06-12 13:21:07 -04:00
Richard Cordovano 6d1f258e96 Merge pull request #4871 from kellykelly3/1261-fix-accountbrowser-aoob
1261 - Fixed accoutbrowswer aoob exception
2019-06-12 13:20:22 -04:00
Richard Cordovano 510c24eb7c Merge pull request #4869 from kellykelly3/1259-cvt-fiterpane
1259 Cleaned up cvt FilterPane layout
2019-06-12 12:55:11 -04:00
William Schaefer 0c15fc1404 Add a merged files which have new bundle properties 2019-06-12 11:30:26 -04:00
Raman 1684b62823 5105: Erroneous "new case" wizard behavior if case name ends with empty space character 2019-06-12 11:28:28 -04:00
William Schaefer bc1eb08350 5019 use correlation value and type independent of correlation attributes existence 2019-06-11 19:03:31 -04:00
William Schaefer 30a36c2a08 5019 fix intra case search results O column displaying count 2019-06-11 18:35:06 -04:00
Richard Cordovano 3fe8700af9 Merge pull request #4868 from kellykelly3/1260-thumbnail-layout
1260 Thumbnail Button bar resize issue
2019-06-11 16:52:20 -04:00
Richard Cordovano 3b29c6050b Merge pull request #4865 from wschaeferB/5166-MatiseHtmlViewerIssues
5166 matise html viewer issues
2019-06-11 16:33:40 -04:00
Richard Cordovano 4188338f8a Merge pull request #4863 from esaunders/5120-disable-spinner-edit
Disable editing of max results spinner.
2019-06-11 16:33:10 -04:00
Richard Cordovano 474ee87b34 Merge pull request #4861 from raman-bt/5059-group-by-ds
5059: tree view did not work per Group By Datasource setting
2019-06-11 16:32:36 -04:00
Richard Cordovano 02974a410f Merge pull request #4859 from wschaeferB/5055-OccurrencesColumForArtifacts
5055 occurrences column for artifacts
2019-06-11 16:31:00 -04:00
Richard Cordovano 1c4c3b2524 Merge pull request #4836 from esaunders/5120-view-file-in-dir
Use asynchronous node creation for directory tree to support view fil…
2019-06-11 16:29:16 -04:00
Richard Cordovano 4f59002735 Merge pull request #4853 from dannysmyda/5066-image-tags-in-HTML-report
5066 image tags in html report
2019-06-11 16:28:27 -04:00
Richard Cordovano 8b13fbfdf9 Merge pull request #4864 from dannysmyda/5071-Strings-Content-Viewer-Bug
5071 Strings CV missing characters
2019-06-11 16:27:43 -04:00
Richard Cordovano 8afd5322ee Merge pull request #4876 from raman-bt/5108-npe
5108: NPE in LuceneQuery.postKeywordHitToBlackboard
2019-06-11 16:25:47 -04:00
Raman cb0d58ee43 5108: NPE in LuceneQuery.postKeywordHitToBlackboard 2019-06-11 15:34:50 -04:00