 Richard Cordovano
|
7fd4a9ae9d
|
Merge pull request #4899 from jkho/5165-Logical-Imager-DSP-to-support-multiple-drives
5165 logical imager dsp to support multiple drives
|
2019-06-17 17:24:19 -04:00 |
|
|
Joe Ho
|
34987d050d
|
Merge remote-tracking branch 'upstream/release-4.12.0' into 5165-Logical-Imager-DSP-to-support-multiple-drives
|
2019-06-17 15:02:24 -04:00 |
|
|
Joe Ho
|
b501c38f03
|
Merge remote-tracking branch 'upstream/release-4.12.0' into 5165-Logical-Imager-DSP-to-support-multiple-drives
|
2019-06-17 14:55:47 -04:00 |
|
|
Joe Ho
|
20687ff5fa
|
Fix NPE
|
2019-06-17 14:55:18 -04:00 |
|
|
Richard Cordovano
|
06b4730837
|
Merge pull request #4843 from jkho/5035-for-PR
5035 make ui to configure logical image
|
2019-06-17 14:48:40 -04:00 |
|
|
Joe Ho
|
6ccd395f54
|
Fix compile warning
|
2019-06-17 14:35:41 -04:00 |
|
|
Joe Ho
|
c340f99bb3
|
Fix codacy error
|
2019-06-17 13:34:09 -04:00 |
|
|
Joe Ho
|
0da0ba8619
|
Test multiple VHDs in a folder
|
2019-06-17 13:26:45 -04:00 |
|
|
Joe Ho
|
e0aa07891f
|
Fix compile error TextPrompt
|
2019-06-17 13:07:51 -04:00 |
|
|
Joe Ho
|
116a79f004
|
Update Bundle.properties-MERGED
|
2019-06-17 11:50:35 -04:00 |
|
|
Joe Ho
|
6c98fa702d
|
Revert un-needed changes
|
2019-06-17 11:48:19 -04:00 |
|
|
Joe Ho
|
9cf2f8b56c
|
Revert TextPrompt.java
|
2019-06-17 11:13:05 -04:00 |
|
|
Joe Ho
|
338f8bb9e2
|
Update ContentViewerTagManager.java
|
2019-06-17 11:10:59 -04:00 |
|
|
Joe Ho
|
1d3c846fa1
|
Revert un-needed change
|
2019-06-17 11:09:18 -04:00 |
|
|
Joe Ho
|
3d5d4b4c1d
|
Fix radiobuttons in edit rule panel. Remove unused methods.
|
2019-06-17 10:37:41 -04:00 |
|
|
Joe Ho
|
6dc7c0d1a4
|
Update Bundle.properties-MERGED
|
2019-06-17 08:53:11 -04:00 |
|
|
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
|
87c181d427
|
revert the revert
|
2019-06-14 15:59:01 -04:00 |
|
|
Joe Ho
|
404a7ce40d
|
Merge remote-tracking branch 'upstream/release-4.12.0' into 5035-for-PR
|
2019-06-14 14:51:24 -04:00 |
|
|
Joe Ho
|
0115aab8da
|
Builder uses getter methods
|
2019-06-14 14:49:23 -04:00 |
|
|
Joe Ho
|
de71dc281e
|
Revert "Merge remote-tracking branch 'upstream/release-4.12.0' into 5035-for-PR"
This reverts commit 557fc43ee0, reversing
changes made to 53a03681fa.
|
2019-06-14 14:42:14 -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 |
|
|
Richard Cordovano
|
34d765dd0f
|
Merge remote-tracking branch 'upstream/release-4.12.0' into message-threads
|
2019-06-14 14:24:16 -04:00 |
|
|
Richard Cordovano
|
bdb64419db
|
Merge pull request #4901 from APriestman/doxygenFix_061419
Remove parameters that were causing doxygen warnings.
|
2019-06-14 14:09:23 -04:00 |
|
|
Joe Ho
|
25d822f593
|
Fix PR comments
|
2019-06-14 14:05:28 -04:00 |
|
|
Ann Priestman
|
b5c6c6c647
|
Remove parameters that were causing doxygen warnings.
|
2019-06-14 12:57:47 -04:00 |
|
|
Joe Ho
|
557fc43ee0
|
Merge remote-tracking branch 'upstream/release-4.12.0' into 5035-for-PR
|
2019-06-14 11:59:32 -04:00 |
|
|
Joe Ho
|
53a03681fa
|
Added Symantec Encryption Desktop aka PGP
|
2019-06-14 11:53:53 -04:00 |
|
|
Joe Ho
|
f78e0d87f6
|
Add GnuPG
|
2019-06-14 11:16:04 -04:00 |
|
|
Joe Ho
|
39f4669ea6
|
Fix Codacy exception problem
|
2019-06-14 10:58:43 -04:00 |
|
|
Richard Cordovano
|
f40a87334e
|
Merge pull request #4896 from wschaeferB/develop
Update message threads branch with develop changes
|
2019-06-14 09:02:03 -04:00 |
|
|
Joe Ho
|
3bf5026cf8
|
Piggybacking 5162 here
add more Encryption programs.
|
2019-06-13 17:35:51 -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
|
5e059871dd
|
Merge branch 'release-4.12.0' into message-threads
|
2019-06-13 15:26:00 -04:00 |
|
|
Richard Cordovano
|
028f6eef36
|
Merge remote-tracking branch 'upstream/release-4.12.0' into develop
|
2019-06-13 15:00:04 -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 |
|
|
Joe Ho
|
62524163f1
|
Address PR comments. Fix logic error.
|
2019-06-13 12:51:02 -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 |
|
|
Joe Ho
|
7eb575ecca
|
add @SuppressWarnings("PMD.SingularField")
|
2019-06-13 09:22:27 -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 |
|
|
Joe Ho
|
75f8b44f8b
|
Fix codacy errors
|
2019-06-12 18:56:54 -04:00 |
|