jmillman 1e13d5a039 Merge remote-tracking branch 'upstream/collaborative' into new-tag-events-collab ...

Conflicts:
	Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java

2015-07-01 13:12:21 -04:00

..

nbproject

Discovered a dependency on commons io during testing.

2015-04-14 17:43:30 -04:00

release/solr

Removed tempDirectory setting since on a Windows install this ends up being within 'Program Files' and when Solr is started it doesn't have permission to extract content to that location.

2015-04-21 16:15:43 -04:00

src/org/sleuthkit/autopsy/keywordsearch

Merge remote-tracking branch 'upstream/collaborative' into new-tag-events-collab

2015-07-01 13:12:21 -04:00

build.xml

Put SLF4J and servlet jars in the right place for Jetty.

2015-03-25 13:22:10 -04:00

ivy.xml

Added a new dependency on metadata-extractor version 2.7.2. The reason for this is that the version that Tika pulls down (2.6.2) results in a java.lang.NoSuchMethodError exception being thrown.

2015-04-01 12:38:13 -04:00

ivysettings.xml

Added keyword search specific Ivy settings file so that we can get the restlet package.

2015-03-09 14:05:45 -04:00

manifest.mf

Updated NBM module version numbers

2015-03-04 22:40:01 -05:00