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
|
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 |
|
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 |
|
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 |
|
Ann Priestman
|
22763e2d48
|
Added section on choosing user for solr service.
Reformatting.
|
2019-06-13 11:48:39 -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
|
1d9fdbcc28
|
Merge remote-tracking branch 'upstream/release-4.12.0' into ig-deadlock-fix
|
2019-06-12 20:24:44 -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
|
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 |
|
Richard Cordovano
|
7342c502af
|
Eliminate IG accesses to drawables DB after case closed
|
2019-06-12 20:07:32 -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 |
|
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 |
|
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
|
31faf80e44
|
Merge pull request #4886 from kellykelly3/message-threads
Merge develop into message-threads
|
2019-06-12 15:58:47 -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 |
|