Commit Graph
9261 Commits
Author SHA1 Message Date
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
Richard Cordovano e36f48a3d2 Merge pull request #1527 from sidheshenator/face_detect_makernotes_exif_collab
Face detect makernotes exif collab
2015-08-26 16:58:56 -04:00
sidheshenator 80aa874a1d Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into face_detect_makernotes_exif_collab 2015-08-26 16:57:15 -04:00
sidheshenator 50b19d8909 remove tika-core-1.2 from collab 2015-08-26 16:35:36 -04:00
Richard Cordovano 66821bbbbb Merge pull request #1533 from rcordovano/merge-develop-8-14-15
Merge in develop branch
2015-08-26 16:30:50 -04:00
Richard Cordovano fc7bd2c70c Merge remote-tracking branch 'upstream/develop' into merge-develop-8-14-15 2015-08-26 15:35:12 -04:00
Richard Cordovano 29d7fea50e Merge in upstream/collaborative, resolve conflict 2015-08-26 15:34:53 -04:00
Sidhesh Mhatre 1ba94d905c Replace ArrayList.removeAll() by ArrayList.clear() 2015-08-26 15:26:57 -04:00
Richard Cordovano 0bb6154990 Merge pull request #1531 from mhmdfy/sqlite-and-url-update
upgrade sqlite to 3.8 and change url to updates.netbeans
2015-08-26 15:06:40 -04:00
momo 316a27b59d upgrade sqlite to 3.8 and change url to updates.netbeans 2015-08-26 14:46:47 -04:00
Richard Cordovano 0e7222dabb Merge develop->collaborative, resolve merge conflict, compile errors 2015-08-26 14:39:59 -04:00
Richard Cordovano c60aace6c8 Merge pull request #1530 from sleuthkit/revert-1517-netbeans-on-collab
Revert "Netbeans on collab"
2015-08-26 14:36:50 -04:00
Richard Cordovano f14bb5a667 Revert "Netbeans on collab" 2015-08-26 14:36:41 -04:00
Richard Cordovano 1625a925c2 Merge pull request #1529 from sleuthkit/revert-1528-jelly-bean
Revert "removing jellybeans from disabled modules"
2015-08-26 14:35:58 -04:00
Richard Cordovano 326fc7a972 Revert "removing jellybeans from disabled modules" 2015-08-26 14:35:49 -04:00
Richard Cordovano 950f8a84a6 Merge pull request #1528 from mhmdfy/jelly-bean
removing jellybeans from disabled modules
2015-08-26 11:35:08 -04:00
momo 9a58814ba6 removing jellybeans from disabled modules 2015-08-26 11:26:08 -04:00
sidheshenator a4e3e5c2c3 icon added for TSK_FACE_DETECTED artifact 2015-08-26 11:10:38 -04:00
sidheshenator f78b508efd add TSK_FACE_DETECTED BB artifact when face makernote data is available 2015-08-26 11:10:22 -04:00
sidheshenator 034c5e0ca1 exif makernotes data used to flags images with faces 2015-08-26 11:09:55 -04:00
Richard Cordovano 5ec2fc4e5c Merge pull request #1517 from mhmdfy/netbeans-on-collab
Netbeans on collab
2015-08-25 16:27:16 -04:00
momo 24fb63fa40 removing uneeded menu items from toolbar 2015-08-25 15:28:31 -04:00
Richard Cordovano b07e8e600e Merge pull request #1513 from karlmortensen/make_postgres_default
make postgres TSK the default
2015-08-25 12:54:02 -04:00
momo 95ab2b3c30 Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into netbeans-on-collab 2015-08-25 10:54:39 -04:00
Richard Cordovano f40776c322 Merge pull request #1523 from sleuthkit/revert-1505-extract_unknown_size_archive_content
Revert "extract content from archive having unknown size - sevenzipex…
2015-08-24 18:01:06 -04:00
Richard Cordovano 762d622ad9 Revert "extract content from archive having unknown size - sevenzipextractor" 2015-08-24 17:59:27 -04:00
jmillman f3e40e5289 Merge remote-tracking branch 'upstream/develop' into timeline_threading_review 2015-08-24 10:45:57 -04:00
Brian Carrier fe5e353b72 Merge pull request #1520 from sidheshenator/exif_mimetypes
Update ExifParserFileIngestModule.java
2015-08-24 09:46:46 -04:00
Sidhesh Mhatre 94431e06fa Update ExifParserFileIngestModule.java
Added the missed type param.
2015-08-24 09:39:42 -04:00
Brian Carrier 7a034e452d Merge pull request #1519 from sidheshenator/report_unalloc_tagged
tagged unallocated space reported
2015-08-22 21:47:40 -04:00
sidheshenator 5ed3809ab8 tagged unallocated space reported 2015-08-21 17:41:37 -04:00
momo eca8c3ec9b Merge branch 'collaborative' of https://github.com/mhmdfy/autopsy into netbeans-on-collab 2015-08-21 10:18:31 -04:00
Brian Carrier 43b30b8649 Merge pull request #1516 from sidheshenator/exif_mimetypes
include tiff, wav along with existing jpeg as exif supported mimetypes
2015-08-20 14:02:34 -04:00
sidheshenator f637783fa3 include tiff, wav along with existing jpeg as exif supported mimetypes 2015-08-20 13:48:12 -04:00
Brian Carrier bdd4920875 Merge pull request #1515 from sidheshenator/exclude_virtual_files
exclude virtual files from file type search
2015-08-20 13:17:00 -04:00
sidheshenator de5463f68a exclude virtual files from file type search 2015-08-20 12:19:02 -04:00
Brian Carrier 7a84eb21ec Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2015-08-19 23:48:40 -04:00
Brian Carrier 743b360d60 Added more specific exception handling to python example 2015-08-19 23:47:59 -04:00
Karl Mortensen 781f81274f make postgres TSK the default 2015-08-18 13:39:52 -04:00
momo b4a3878451 sqlite 3.8 2015-08-17 16:41:47 -04:00