12867 Commits

Author SHA1 Message Date
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
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 557fc43ee024dbef7db99aab3bc6cac0e5777daa, reversing
changes made to 53a03681fa5b29d4abde2256604bc07cbc9091c3.
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
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
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
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
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
Joe Ho
75f8b44f8b Fix codacy errors 2019-06-12 18:56:54 -04:00
Joe Ho
8100e5e635 Update changes for PR 2019-06-12 18:16:56 -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
Joe Ho
dd27e6cb28 changes after develop build 2019-06-12 17:05:41 -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
dd529b0def
Merge pull request #4880 from wschaeferB/5019-PopulateOccurrencesColumn
5019 populate occurrences column
2019-06-12 15:36:21 -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
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