23032 Commits

Author SHA1 Message Date
Richard Cordovano
8161759226
Merge pull request #4747 from sleuthkit/master
Merge pull request #4742 from sleuthkit/release-4.11.0
2019-04-22 11:31:01 -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
Richard Cordovano
7f8617b50f
Merge pull request #4742 from sleuthkit/release-4.11.0
Merge in release 4.11.0 branch
2019-04-19 14:55:19 -04:00
Richard Cordovano
5c14390212
Merge pull request #4741 from sleuthkit/release-4.11.0
Merge in release 4.11.0 branch
2019-04-19 14:53:04 -04:00
Kelly Kelly
bdada70ce9 Merge branch 'cvt-contacts-view' into 1231-contacts-visualizationpane 2019-04-19 14:10:37 -04:00
Kelly Kelly
5b90fed261 Merge branch 'cvt-contacts-view' of https://github.com/sleuthkit/autopsy into cvt-contacts-view 2019-04-19 14:09:49 -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
b6be032d77
Merge pull request #4740 from sleuthkit/revert-4721-timeline-event-mgr
Revert "merge develop into Timeline event mgr"
2019-04-19 13:16:54 -04:00
Richard Cordovano
2afc59ee39
Revert "merge develop into Timeline event mgr" 2019-04-19 13:16:26 -04:00
Ann Priestman
511d6c5dbf Added profile select image and Paladin info. 2019-04-18 18:05:29 -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
Ann Priestman
e8489fb377 Added intro 2019-04-18 14:42:50 -04:00
Brian Carrier
e61d519538
Merge pull request #4737 from APriestman/switchSlashes
Switch to forward slashes for images
2019-04-18 14:16:20 -04:00
Ann Priestman
dbf13e6d05 Changed more slashes 2019-04-18 14:14:54 -04:00
Kelly Kelly
19dc00bde8 Merge branch '1231-contacts-visualizationpane' into 1232-thumbnail-view 2019-04-18 14:14:36 -04:00
Ann Priestman
100761be13 Changed slashes 2019-04-18 14:13:37 -04:00
Ann Priestman
b7960e4e86 Adding triage.dox 2019-04-18 14:05:57 -04:00
Ann Priestman
d7e98c5295 Switch to forward slashes for images 2019-04-18 14:01:31 -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
Brian Carrier
6a7cc3313b Added section about translating the UI 2019-04-18 13:58:31 -04:00
Ann Priestman
fdb22719f4 Adding triage doc 2019-04-18 13:56:39 -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
55ddc03ee1 Toggle build.type to after release 4.11.0 2019-04-17 16:51:24 -04:00
Richard Cordovano
8d5d35fa00
Merge pull request #4735 from sleuthkit/release-4.11.0
Merge in release 4.11.0 branch
2019-04-17 16:49:29 -04:00
Brian Carrier
90ffdb46c8 made case lowercase 2019-04-17 16:33:00 -04:00
Brian Carrier
848e366808 reorganized NEWS 2019-04-17 16:31:10 -04:00
Richard Cordovano
02137cb9b2
Merge pull request #4734 from sleuthkit/release-4.11.0
Merge in release 4.11.0 branch
2019-04-17 16:09:06 -04:00
Richard Cordovano
b008eed1e1 Fix typos in portable case doc 2019-04-17 16:02:04 -04:00
Richard Cordovano
17e3102e4a
Merge pull request #4719 from sleuthkit/portable_docs
expanded portable case docs a bit
2019-04-17 15:48:07 -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
Richard Cordovano
38798f96f5
Merge pull request #4732 from rcordovano/release-notes-update
Update NEWS for release 4.11.0
2019-04-17 15:08:23 -04:00
rcordovano
7838daede7 Update NEWS for release 4.11.0 2019-04-17 15:06:22 -04:00
Richard Cordovano
ac51bc49cd
Merge pull request #4730 from rcordovano/version-number-updates
Update module dependencies for release 4.11.0
2019-04-17 12:57:50 -04:00
rcordovano
6aab496d6b Update module dependencies for release 4.11.0 2019-04-17 12:54:17 -04:00
Richard Cordovano
35efd0013e
Merge pull request #4729 from rcordovano/version-number-updates
Toggle to build.type RELEASE for release 4.11.0
2019-04-17 12:27:55 -04:00
rcordovano
16de0b9bbe Toggle to build.type RELEASE for release 4.11.0 2019-04-17 12:26:43 -04:00
Richard Cordovano
dca375ffa6
Merge pull request #4728 from rcordovano/version-number-updates
Module versioning updates
2019-04-17 12:24:07 -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