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 |
|
Richard Cordovano
|
252c4d324b
|
Merge remote-tracking branch 'upstream/release-4.12.0' into develop
|
2019-06-14 14:24:41 -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 |
|
Kelly Kelly
|
d7082a8da2
|
Update with code review comments from Brian
|
2019-06-14 13:41:13 -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 |
|
Richard Cordovano
|
a7fc8d4cc5
|
Assorted clean up for IG deadlocks fix
|
2019-06-14 11:25:52 -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
|
10aa4245c6
|
Merge remote-tracking branch 'upstream/message-threads' into 1250-message-threader
|
2019-06-14 10:37:38 -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 |
|
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 |
|
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 |
|
Eugene Livis
|
041e5172f8
|
Got basic UI working
|
2019-06-13 15:31:55 -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
|
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 |
|
Eugene Livis
|
e7e4d84f0f
|
Testing case creation, database, deletion
|
2019-06-13 14:38:58 -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
|
641bf73e40
|
Restore some formatting in ImageGalleryOptionsPanel.java for easy diffing
|
2019-06-13 14:26:34 -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 |
|
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 |
|
Ann Priestman
|
7ef56d16e4
|
Addressing review comments
|
2019-06-13 13:45:10 -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
|
e59985966e
|
Add IG controller null check to open action
|
2019-06-13 12:09:38 -04:00 |
|
Eugene Livis
|
e8a8149851
|
Merge branch 'release-4.12.0' of github.com:sleuthkit/autopsy into diagnostics_tool_5119
|
2019-06-13 12:01:05 -04:00 |
|
Ann Priestman
|
22763e2d48
|
Added section on choosing user for solr service.
Reformatting.
|
2019-06-13 11:48:39 -04:00 |
|