23032 Commits

Author SHA1 Message Date
Richard Cordovano
f32ea86a7a
Merge pull request #4771 from kellykelly3/1239-relationships-package
1239 relationships package
2019-05-09 11:09:05 -04:00
Kelly Kelly
1f8a71d933 fixed merge conflicts 2019-05-08 21:44:52 -04:00
Richard Cordovano
9b26c4eca3
Merge pull request #4769 from kellykelly3/1236-account-summary-view
1236 account summary view
2019-05-08 15:28:29 -04:00
Kelly Kelly
7ab5fa6493 Fixed merge issues from cvt branch 2019-05-08 09:22:47 -04:00
Kelly Kelly
97d53efbdc Updated based on review comments 2019-05-07 15:03:36 -04:00
Richard Cordovano
c040d41b75
Merge pull request #4749 from kellykelly3/1232-thumbnail-view
1232 thumbnail view
2019-05-07 12:17:16 -04:00
Kelly Kelly
e96868240b moved relationship browser code into its own package 2019-05-06 14:45:43 -04:00
Kelly Kelly
83f6f1ff84 Removed not needed exceptions and changed a panel title. 2019-05-06 10:45:10 -04:00
Kelly Kelly
b5fa09b5f6 new account summary panel for communications window. 2019-05-06 10:07:31 -04:00
Kelly Kelly
686632fab8 Merge branch 'cvt-contacts-view' into 1236-account-summary-view 2019-05-02 12:51:28 -04:00
Kelly Kelly
c8e41658f9 Updated based on comments from Richard and Will, added constructor to DataResultFilterNode that doesn't take an explorermanger 2019-05-02 12:49:04 -04:00
Kelly Kelly
d52b9cfc4d Revert "inital commit with a message of a merge from my other branch"
This reverts commit 806eb76f7fd0933ba98b93cba41912f902cdfda7.
2019-05-02 12:15:58 -04:00
Kelly Kelly
806eb76f7f inital commit with a message of a merge from my other branch 2019-05-02 11:43:04 -04:00
Kelly Kelly
fd483b1e1d Merge remote-tracking branch 'upstream/cvt-contacts-view' into 1232-thumbnail-view 2019-05-02 10:17:54 -04:00
Kelly Kelly
3f3e8f8591 Updated code fixing issues found in review by Will 2019-05-02 09:18:42 -04:00
Kelly Kelly
e082f128a1 Merge branch 'cvt-contacts-view' into 1232-thumbnail-view 2019-05-01 15:09:09 -04:00
Richard Cordovano
111e8fe477
Merge pull request #4765 from kellykelly3/cvt-contacts-view
Merging develop into my local cvt-contact-view branch
2019-05-01 15:07:57 -04:00
Kelly Kelly
e54f0aed9e Merged in develop 2019-05-01 15:00:24 -04:00
esaunders
a2f93f8b1b
Merge pull request #4763 from dannysmyda/Fix-Desync-Between-KWS-Props-and-XML
Repair Project Properties and XML for KWS
2019-04-30 18:06:00 -04:00
esaunders
3d7fc23304
Merge branch 'develop' into Fix-Desync-Between-KWS-Props-and-XML 2019-04-30 18:05:42 -04:00
esaunders
40f15bb574
Merge pull request #4762 from dannysmyda/Fix-Tika-Upgrade-Bug
Missing Override statement in KWS
2019-04-30 18:04:40 -04:00
U-BASIS\dsmyda
f0fb45cc51 Removed references that netbeans failed to clean up 2019-04-30 17:48:59 -04:00
U-BASIS\dsmyda
a56c5c116a Fixed old references hanging around from bad merge in Tika 1.20 branch 2019-04-30 17:42:59 -04:00
U-BASIS\dsmyda
c1ab782cbc Readded override statement that was lost in Tika 1.20 upgrade 2019-04-30 16:45:47 -04:00
Richard Cordovano
d1705ee327
Merge pull request #4761 from sleuthkit/revert-4753-4972-Remove-Javadocs
Revert "4972 - Remove Javadocs from release"
2019-04-30 16:35:46 -04:00
Richard Cordovano
bcb5987430
Revert "4972 - Remove Javadocs from release" 2019-04-30 16:35:26 -04:00
Richard Cordovano
85ae667873
Merge pull request #4753 from dannysmyda/4972-Remove-Javadocs
4972 - Remove Javadocs from release
2019-04-30 15:05:21 -04:00
Kelly Kelly
6658ca44d5 Removed comment from ThumbnailChildren and initalization of the keys to addNotify 2019-04-30 12:26:56 -04:00
Kelly Kelly
01ec2f56af Merge branch 'cvt-contacts-view' into 1236-account-summary-view 2019-04-30 10:02:14 -04:00
U-BASIS\dsmyda
f1883d8539 Fixing merge errors 2019-04-30 10:01:01 -04:00
Richard Cordovano
c27f980c6b
Merge pull request #4746 from kellykelly3/1233-fix-contact-artifact-issues
1233 fix contact artifact issues
2019-04-30 09:13:31 -04:00
U-BASIS\dsmyda
a85de05659 Reverted confs back that are no longer needed 2019-04-30 08:36:05 -04:00
U-BASIS\dsmyda
f40c0dc982 Merged in develop 2019-04-30 08:30:21 -04:00
Kelly Kelly
ad6c84bc85 Updated based on review comment 2019-04-30 08:08:12 -04:00
Kelly Kelly
6deb2f526f Updated based on review comments on contact code 2019-04-29 17:53:35 -04:00
U-BASIS\dsmyda
01065c269d Changed the solution to a one-liner rather than explicitly excluding javadoc on each configuration 2019-04-29 17:06:41 -04:00
Richard Cordovano
237ea66025
Merge pull request #4511 from dannysmyda/4367-Upgrade-Tika-1.20
4367 - upgrade to tika 1.20
2019-04-26 17:05:49 -04:00
Richard Cordovano
16561298e9
Merge pull request #4720 from kellykelly3/1231-contacts-visualizationpane
1231 Add new MessageBrowser to Visualization Pane
2019-04-26 13:44:28 -04:00
Richard Cordovano
75bf67616d
Merge pull request #4683 from kellykelly3/1218-communications-history
1218 communications history
2019-04-26 13:39:11 -04:00
Richard Cordovano
c7974e4273
Merge pull request #4736 from sleuthkit/translation_docs2
Added section about translating the UI
2019-04-26 13:38:50 -04:00
Kelly Kelly
bf9c815359 Updated code with propogating lookups and default sorting on size. 2019-04-26 11:32:26 -04:00
Richard Cordovano
fa61f044ae
Merge pull request #4739 from APriestman/4699_triageDoc
4699 triage doc
2019-04-25 18:43:04 -04:00
U-BASIS\dsmyda
dee5022bb6 Removed javadoc from being pulled down from Maven repo, renamed configurations to more closely match their parent NBM, and took sources jars off of the classpath 2019-04-25 15:46:43 -04:00
Richard Cordovano
0368f07f8d
Merge pull request #4727 from dannysmyda/4867-Add-Tika-Log-Statement
4867 Add Tika Log Statement
2019-04-25 13:51:42 -04:00
Kelly Kelly
849ca42c04 Final cleanup 2019-04-24 13:18:20 -04:00
Kelly Kelly
682f153c30 Mucked with all three viewer make sure everything is sizing correctly. Added horizontal scroll pane to RelationshipBrowser. 2019-04-23 15:24:37 -04:00
Kelly Kelly
6554fe819d committing current changes before playing with thumbnail viewer layout 2019-04-23 14:20:12 -04:00
Ann Priestman
813f01e94e Fixed typo 2019-04-23 09:38:25 -04:00
U-BASIS\dsmyda
eae8425e07 Removed non-needed overrides and redundant jar references 2019-04-22 17:05:48 -04:00
U-BASIS\dsmyda
d37dc80da9 Removed the unused sqlite jdbc references 2019-04-22 12:31:23 -04:00