momo
3b76ec80a9
removed commented code
2015-09-09 14:04:03 -04:00
momo
bc73e4db39
fix closing if statement
2015-09-09 13:50:07 -04:00
momo
e4e46067db
keeping only three makernotes with face detect tags
2015-09-09 13:33:14 -04:00
Richard Cordovano
1e5d66332a
Merge remote-tracking branch 'upstream/develop' into collaborative
2015-09-09 10:14:29 -04:00
Richard Cordovano
350fc355c0
Merge pull request #1556 from robertolarcher/develop
...
Email Parser: NegativeArraySizeException patch
2015-09-09 10:12:34 -04:00
Richard Cordovano
114aa2870a
Merge pull request #1560 from mhmdfy/7zipfix
...
adding different child classes for each size cases
2015-09-08 16:53:06 -04:00
momo
871d0d30cc
refactor duplication and names
2015-09-08 16:49:25 -04:00
momo
6f19fc7726
adding different child classes for each size cases
2015-09-08 14:39:40 -04:00
Brian Carrier
1b413e0ea1
Sort methods in API docs
2015-09-08 09:22:21 -04:00
Richard Cordovano
401a9a2078
Merge pull request #1558 from sleuthkit/revert-1539-turn_on_IG
...
Revert "turn on IG"
2015-09-04 11:19:42 -04:00
Richard Cordovano
813994e0f3
Revert "turn on IG"
2015-09-04 11:19:35 -04:00
Richard Cordovano
27649f3fbe
Image Gallery module disabled by default
2015-09-04 11:14:51 -04:00
Richard Cordovano
5f9078d082
Merge pull request #1555 from esaunders/curator
...
Replaced ZooKeeper with Curator
2015-09-04 11:10:28 -04:00
Roberto Larcher
3c0a34d1b2
Further analysis
...
The problem seems to be in java-libpst.
Sometimes getFileInputStream() returns an InputStream, but at the first
InputStream.read(buffer) the method returns -1. Further analysis is
needed to isolate the problem in java-libpst.
To patch this an IOException is thrown
2015-09-04 11:23:24 +02:00
esaunders
764e5c08e0
Replaced ZooKeeper with Curator
2015-09-03 16:56:32 -04:00
Richard Cordovano
6577d163aa
Merge pull request #1552 from karlmortensen/newlockmethod
...
new lock method using zookeeper
2015-09-01 12:45:26 -04:00
Richard Cordovano
07d9215c17
Merge pull request #1551 from esaunders/solr_schema_change
...
Solr schema change
2015-09-01 11:23:05 -04:00
Roberto Larcher
c501c643f7
NegativeArraySizeException patch
...
This excepion is raised when the attachment size is a multiple of 8176
(the buffer size).
InputStream read methos return -1 if there is no more data because the
end of the stream has been reached
A simple check if result != -1 is added
refs:
http://forum.sleuthkit.org/viewtopic.php?f=6&t=2563
http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html#read()
2015-09-01 16:51:03 +02:00
esaunders
e9812f5569
Merge branch 'collaborative' of github.com:sleuthkit/autopsy into solr_schema_change
2015-09-01 10:23:04 -04:00
esaunders
9386edb434
Added _version_ field to schema for Solr Cloud deployments.
2015-09-01 10:22:39 -04:00
Roberto Larcher
36a9017c03
Merge remote-tracking branch 'sleuthkit/develop' into develop
2015-09-01 16:09:26 +02:00
Richard Cordovano
457146601b
Merge pull request #1549 from millmanorama/temp_merge
...
merge develop => collaborative
2015-08-31 14:58:40 -04:00
jmillman
2e61b0434e
Merge branch 'temp_merge' into collaborative
...
Conflicts:
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
2015-08-31 14:46:21 -04:00
jmillman
478522ba3a
use null check that works in SQLite and PostgreSQL
2015-08-31 14:38:56 -04:00
jmillman
f2e00216e9
WIP Merge remote-tracking branch 'upstream/develop' into temp_merge
...
Conflicts:
Core/src/org/sleuthkit/autopsy/timeline/datamodel/FilteredEventsModel.java
2015-08-31 13:48:50 -04:00
Richard Cordovano
46e12105b4
Merge pull request #1548 from millmanorama/IG_sql_fix
...
fix broken SQL query.
2015-08-31 13:31:35 -04:00
jmillman
288da5aee8
fix broken SQL query.
2015-08-31 13:22:36 -04:00
Richard Cordovano
10324bb068
Merge pull request #1546 from millmanorama/IG_cleanup
...
Image Gallery cleanup
2015-08-31 10:34:24 -04:00
Richard Cordovano
f131f9c751
Merge pull request #1540 from millmanorama/tags_filter
...
Tags filter
2015-08-31 10:34:05 -04:00
jmillman
362084e8bc
don't reselct when tree changes; use proper logging
2015-08-28 17:24:59 -04:00
jmillman
048530e61c
fix bug in sql query; remove unneccesary runLater
2015-08-28 17:24:54 -04:00
jmillman
a08611e8b7
reduce unneeded synchronization
2015-08-28 17:24:50 -04:00
jmillman
7b4216cd4f
minor cleanup
2015-08-28 17:24:47 -04:00
jmillman
1f495546f7
synchonizization fix and comment
2015-08-28 17:24:37 -04:00
Karl Mortensen
612a5595cb
new lock method using zookeeper
2015-08-28 16:15:24 -04:00
Richard Cordovano
5deb4bc829
Merge pull request #1545 from APriestman/sharedConfig
...
Added public getSavedModuleSettingsFolder to IngestJobSettings
2015-08-28 15:04:58 -04:00
Ann Priestman
6460a9bffb
Added public getSavedModuleSettingsFolder to IngestJobSettings
2015-08-28 14:20:36 -04:00
Richard Cordovano
9ec19fd0f1
Merge pull request #1525 from sidheshenator/extract_archive_unknown_size
...
extract unknown size file content from archives
2015-08-28 13:16:18 -04:00
jmillman
4428d077ba
Merge remote-tracking branch 'upstream/develop' into tags_filter
...
Conflicts:
Core/src/org/sleuthkit/autopsy/timeline/Bundle.properties
Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
Core/src/org/sleuthkit/autopsy/timeline/db/EventsRepository.java
2015-08-28 13:14:47 -04:00
Richard Cordovano
b1d27128fb
Merge in develop and resolve conflicts
2015-08-28 13:00:50 -04:00
Richard Cordovano
fda7ea3f3d
Merge pull request #1509 from millmanorama/timeline_threading_review
...
Timeline threading review and cleanup
2015-08-28 11:23:41 -04:00
Richard Cordovano
d9ed48afa0
Merge pull request #1539 from millmanorama/turn_on_IG
...
turn on IG
2015-08-28 11:02:49 -04:00
Richard Cordovano
7f97eafe37
Merge pull request #1537 from sidheshenator/face_detect_makernotes_exif
...
face detection feature added
2015-08-28 10:10:13 -04:00
Richard Cordovano
05ddb67865
Merge pull request #1538 from sidheshenator/patch-1
...
Passed timeZone param to getDate()
2015-08-28 10:07:28 -04:00
jmillman
0289c333df
turn on IG
2015-08-28 10:07:02 -04:00
Sidhesh Mhatre
e47fbafc52
Time zone parameter added to getDate()
2015-08-28 09:58:04 -04:00
Sidhesh Mhatre
b41c1c4175
Passed timeZone param to getDate()
2015-08-28 01:29:09 -04:00
sidheshenator
2ba62e440e
face detection feature added
2015-08-27 16:28:20 -04:00
Richard Cordovano
9a72726a93
Merge pull request #1536 from sidheshenator/face_detect_makernotes_exif_collab
...
explicitly provide timezone information
2015-08-27 15:46:35 -04:00
sidheshenator
36f9c94f5b
explicitly provide timezone information
2015-08-27 15:38:41 -04:00
momo