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 |
|
Raman
|
7ec2b2f239
|
Add //NON-NLS comment.
|
2019-06-14 13:09:01 -04:00 |
|
Raman
|
1515d1ee13
|
5201: Text Summary content viewer does not support mimetype 'application/xhtml+xml'
|
2019-06-14 12:59:12 -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 |
|
Kelly Kelly
|
f9be6c6dd6
|
merged in the latest UI changes and message-threads
|
2019-06-14 10:29:32 -04:00 |
|
Kelly Kelly
|
bf73912a5a
|
Added unthreaded icon
|
2019-06-14 10:25:29 -04:00 |
|
Kelly Kelly
|
64d47e78cf
|
Merge remote-tracking branch 'upstream/message-threads' into 1256-message-thread-ui
|
2019-06-14 10:12:34 -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 |
|
Kelly Kelly
|
0f21a82256
|
Added resetComponent call to setSelectionInfo
|
2019-06-13 15:46:12 -04:00 |
|
William Schaefer
|
b80c7d69c7
|
5184 display name for FileKnown status not enum
|
2019-06-13 15:36:05 -04:00 |
|
Richard Cordovano
|
6f4bd5ea9e
|
Merge remote-tracking branch 'upstream/release-4.12.0' into ig-deadlock-fix
|
2019-06-13 15:26:36 -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 |
|
Kelly Kelly
|
d60052f281
|
modifying message view based on talks with Brian
|
2019-06-13 14:31:12 -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 |
|
U-BASIS\dsmyda
|
db7b519479
|
Removed Accessible Context description
|
2019-06-13 14:11:26 -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 |
|
U-BASIS\dsmyda
|
89d071658d
|
Swapped the TranslationContentPanel to use a JTextPane so that it can display Japanese correctly. Uses the same approach as IndexedText does.
|
2019-06-13 13:55:49 -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 |
|
Richard Cordovano
|
279213a0fe
|
Restore bundle.properties.MERGED files
|
2019-06-13 11:18:58 -04:00 |
|
Joe Ho
|
7eb575ecca
|
add @SuppressWarnings("PMD.SingularField")
|
2019-06-13 09:22:27 -04:00 |
|
Richard Cordovano
|
711b627926
|
Updates to merged files
|
2019-06-12 20:21:22 -04:00 |
|
Richard Cordovano
|
a1afef0193
|
Merged in release-4.12.0 branch
|
2019-06-12 20:11:03 -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 |
|
Kelly Kelly
|
4da9bc79d4
|
Added support for andriod text message
|
2019-06-12 16:36:59 -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 |
|
Kelly Kelly
|
49772123f8
|
Fixed the MessagePanel spliter bar
|
2019-06-12 16:22:41 -04:00 |
|
William Schaefer
|
b0b7010116
|
5138 change interest files set rule dialog title
|
2019-06-12 16:02:10 -04:00 |
|
Kelly Kelly
|
3098c2e47e
|
Merge remote-tracking branch 'upstream/message-threads' into 1256-message-thread-ui
|
2019-06-12 16:01:15 -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
|
7fe05edf5d
|
Merge remote-tracking branch 'upstream/develop' into ig-deadlock-fix
|
2019-06-12 13:23:28 -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 |
|