22966 Commits

Author SHA1 Message Date
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
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
U-BASIS\dsmyda
f1883d8539 Fixing merge errors 2019-04-30 10:01:01 -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
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
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
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
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
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
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
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
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
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
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
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
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