12369 Commits

Author SHA1 Message Date
Kelly Kelly
1f8a71d933 fixed merge conflicts 2019-05-08 21:44:52 -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
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
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
Kelly Kelly
e54f0aed9e Merged in develop 2019-05-01 15:00:24 -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
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
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
75bf67616d
Merge pull request #4683 from kellykelly3/1218-communications-history
1218 communications history
2019-04-26 13:39:11 -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
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
U-BASIS\dsmyda
eae8425e07 Removed non-needed overrides and redundant jar references 2019-04-22 17:05:48 -04:00
Kelly Kelly
1cfa800e8e Merge branch '1231-contacts-visualizationpane' into 1232-thumbnail-view 2019-04-22 10:53:34 -04:00
Kelly Kelly
ae796dfcb0 Fixed bugs with contact creation 2019-04-22 10:37:56 -04:00
U-BASIS\dsmyda
b511b22942 Updated local branch with origin changes 2019-04-22 10:01:03 -04:00
U-BASIS\dsmyda
992e12ccd9 Merge branch 'develop' of github.com:sleuthkit/autopsy into 4367-Upgrade-Tika-1.20 2019-04-22 09:56:10 -04:00
Kelly Kelly
72b30ea922 Updated after review comments from will 2019-04-19 16:36:36 -04:00
Kelly Kelly
bdada70ce9 Merge branch 'cvt-contacts-view' into 1231-contacts-visualizationpane 2019-04-19 14:10:37 -04:00
Richard Cordovano
0f6151d831 Merge remote-tracking branch 'upstream/develop' into cvt-contacts-view 2019-04-19 14:06:13 -04:00
Richard Cordovano
2afc59ee39
Revert "merge develop into Timeline event mgr" 2019-04-19 13:16:26 -04:00
U-BASIS\dsmyda
be0e2cf059 Removed erroneous Image Gallery project property and manually downloaded the cleartk-ml package in attempt to fix Travis 2019-04-18 17:09:30 -04:00
U-BASIS\dsmyda
59579721b5 Merged in release 4.11.0 branch 2019-04-18 15:29:33 -04:00
Kelly Kelly
19dc00bde8 Merge branch '1231-contacts-visualizationpane' into 1232-thumbnail-view 2019-04-18 14:14:36 -04:00
Kelly Kelly
24c256f3d2 Modified ContactNode so that all attributes are correctly being displayed from vcards and contacts with multiple attrbutes of the same type 2019-04-18 14:00:03 -04:00
Kelly Kelly
d96e9f19d3 Fixed issue displaying contact information for vcards 2019-04-18 10:22:40 -04:00
Kelly Kelly
26c2e76b20 Merge branch 'cvt-contacts-view' into 1231-contacts-visualizationpane 2019-04-18 07:49:48 -04:00
Kelly Kelly
18e8b1e90a Merge branch 'cvt-contacts-view' of https://github.com/sleuthkit/autopsy into cvt-contacts-view 2019-04-18 07:48:38 -04:00
Richard Cordovano
f8e359f0ba
Merge pull request #4721 from millmanorama/timeline-event-mgr
merge develop into Timeline event mgr
2019-04-17 19:04:06 -04:00
Richard Cordovano
d6f2424201
Merge pull request #4717 from kellykelly3/1227-add-contacts-table
1227 add contacts table
2019-04-17 18:37:26 -04:00
Richard Cordovano
2b32ce7fed
Merge pull request #4712 from kellykelly3/1226-add-messageContentViewer
1226 added message content viewer
2019-04-17 18:37:02 -04:00
Richard Cordovano
9bd4112d35
Merge pull request #4704 from kellykelly3/1229-selectioninfo-implementation
1229 selectioninfo implementation
2019-04-17 18:36:41 -04:00
Richard Cordovano
a55643ae03
Merge pull request #4733 from sleuthkit/release-4.11.0
Merge in release 4.11.0 branch
2019-04-17 15:16:47 -04:00
rcordovano
164543ab64 Update module version numbers for 4.11.0 release 2019-04-17 11:32:33 -04:00
Kelly Kelly
475bd75fc8 Inital work on thumbnailViewer 2019-04-17 11:31:08 -04:00
U-BASIS\dsmyda
29f6664257 Added a reference to the Tika log when an exception is encountered during extraction 2019-04-17 09:43:35 -04:00
millmanorama
973c235582 Merge remote-tracking branch 'upstream/timeline-event-mgr' into timeline-event-mgr
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/modules/plaso/Bundle.properties-MERGED
#	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
#	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
2019-04-17 11:49:54 +02:00
rcordovano
b90ee3d22c Public API IngestJobInfoPanel.updateIngestHistoryData -> setDataSource 2019-04-16 19:09:02 -04:00