Commit Graph
13409 Commits
Author SHA1 Message Date
Richard Cordovano d81fd4dd84 Merge pull request #4281 from dgrove727/4374_Md5Search
4374 md5 search
2018-11-21 16:13:18 -05:00
Richard Cordovano b420185dab Merge pull request #4283 from wschaeferB/4361-AddDataSourceIdColumn
4361 add data source id column
2018-11-21 16:08:30 -05:00
Eugene Livis 07f98df84e Merged latest develop 2018-11-21 16:02:27 -05:00
William Schaefer eba5d9cebc 4381 change looping conditional in EamArtifactUtil to Switch/Case 2018-11-21 15:32:55 -05:00
millmanorama 0131d3b15d Merge remote-tracking branch 'upstream/develop' into merge-develop-into-timeline
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
2018-11-21 21:11:45 +01:00
millmanorama 91da6b408c Merge branch 'timeline-event-mgr' into merge-develop-into-timeline 2018-11-21 21:10:03 +01:00
William Schaefer 64cf085c14 Merge branch '4381-MacAddressCorrelationAttr' of https://github.com/wschaeferB/autopsy into 4402-FlagPastOccurences 2018-11-21 12:14:01 -05:00
William Schaefer edcb050a25 4381 uncomment correlation attr creation code for new tsk artifacts 2018-11-21 12:13:19 -05:00
esaunders 837e49d541 Added setting to limit number of results displayed. 2018-11-21 11:33:39 -05:00
William Schaefer dc7adb94fb 4402 add ingest module setting for flagging previously seen devices 2018-11-20 17:46:22 -05:00
William Schaefer 3602ad1199 4402 Add code to create device previously existed interesting items 2018-11-20 16:46:27 -05:00
U-BASIS\dgrove 864a89f1ae Merge remote-tracking branch 'upstream/develop' into 4302_DarculaLayoutFixes 2018-11-20 16:35:06 -05:00
William Schaefer dc39465697 Merge branch '4361-AddDataSourceIdColumn' of https://github.com/wschaeferB/autopsy into 4381-MacAddressCorrelationAttr 2018-11-20 14:58:58 -05:00
millmanorama 89b47548fa Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1117-FileTypeUtils
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/timeline/utils/FilterUtils.java
2018-11-20 20:52:28 +01:00
millmanorama ad64be1d0f Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1126-timeline_event_publishing_names
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
#	Core/src/org/sleuthkit/autopsy/timeline/utils/FilterUtils.java
2018-11-20 20:49:57 +01:00
William Schaefer f238e198cb 4361 resolve merge conflicts with develop 2018-11-20 14:21:27 -05:00
U-BASIS\dsmyda cbfeb44559 Merge branch 'develop' into 4389-sqlite-stream-impl 2018-11-20 14:10:33 -05:00
U-BASIS\dsmyda 3a27cd3ffc Merge remote-tracking branch 'upstream/develop' into 4389-sqlite-stream-impl 2018-11-20 14:07:15 -05:00
Richard Cordovano a535883d5b Merge pull request #4292 from dannysmyda/smallFixForSqliteTableReader
Small fix for SqliteTableReader resource closing
2018-11-20 13:10:23 -05:00
esaunders 3283259be7 Merge branch 'develop' of github.com:sleuthkit/autopsy into 4151-remove-columns 2018-11-20 13:09:44 -05:00
esaunders a33ed9124b Resolved merge conflicts. 2018-11-20 13:09:30 -05:00
esaunders b2dc614391 Merge branch 'develop' of github.com:sleuthkit/autopsy into 4151-remove-columns 2018-11-20 13:08:37 -05:00
U-BASIS\dsmyda d3cc7db995 Changed close() to only close connection and not redundantly close table resources 2018-11-20 13:05:35 -05:00
U-BASIS\dsmyda ccc0332987 Removed old functions that caused build error 2018-11-20 12:27:22 -05:00
Richard Cordovano 2dd969f0f8 Merge pull request #4269 from dannysmyda/4390-text-extraction-stream-impl
4390 text extraction stream impl
2018-11-20 11:37:39 -05:00
Richard Cordovano a341c903be Merge pull request #4256 from dannysmyda/4361-SCO-clean-up-and-background-tasks
4361 sco clean up and background tasks
2018-11-20 11:35:18 -05:00
William Schaefer 82104e1235 4361 update comments to reflect changes from device id to ds obj id dependence 2018-11-20 11:16:08 -05:00
William Schaefer 8e31b65934 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4361-AddDataSourceIdColumn 2018-11-20 11:08:34 -05:00
U-BASIS\dgrove ab78771f52 Added missing annotation for Codacy. 2018-11-20 10:44:37 -05:00
dannysmyda 822410a800 Merge branch 'develop' into 4390-text-extraction-stream-impl 2018-11-20 10:25:38 -05:00
dannysmyda 58c1e9b9ce Merge branch 'develop' into 4389-sqlite-stream-impl 2018-11-20 10:21:09 -05:00
Richard Cordovano e691425a5d Reformat class docs in SQLiteTableReader 2018-11-20 10:14:01 -05:00
Richard Cordovano 58024fa29a Reformat class docs in SQLiteTableReader 2018-11-20 10:12:30 -05:00
Richard Cordovano f9a0844cdb Remove unused import in SQLiteTableReader 2018-11-20 10:09:24 -05:00
Richard Cordovano d36546074c Fix Codacy issues in SQLiteTableReader 2018-11-20 10:07:57 -05:00
Richard Cordovano 31f4b420b0 Merge pull request #4272 from dannysmyda/4388-implement-sqlite-streaming-design
4388 implement sqlite streaming design
2018-11-20 09:57:03 -05:00
U-BASIS\dsmyda fdd2038a3d Fixed a comment to reflect changes 2018-11-20 09:30:27 -05:00
U-BASIS\dsmyda 036da13f8f Removed SCO from background task 2018-11-20 09:22:31 -05:00
U-BASIS\dgrove 03af3136ac Fixed column sorting bug; added case count to dialog. 2018-11-20 00:59:29 -05:00
William Schaefer 3f8840f8fd 4380 add correlation attrs for imei, imsi, and iccid 2018-11-19 18:32:51 -05:00
esaunders 4fabe289d1 Removed columns from results table. 2018-11-19 17:58:31 -05:00
William Schaefer 2a00a770cc 4381 comment out partially completed adding of artifacts 2018-11-19 14:57:01 -05:00
William Schaefer d99863e770 4381 loop over keyset for property tables instead of all properties 2018-11-19 14:47:37 -05:00
William Schaefer f687446658 4381 fix issue with looping over null list of correlation attr types 2018-11-19 13:36:10 -05:00
U-BASIS\dgrove 963e528a69 Fixed backwards compatibility. 2018-11-19 11:34:34 -05:00
U-BASIS\dgrove 61f08ad914 Fixed copyright. 2018-11-16 22:42:30 -05:00
U-BASIS\dgrove 03e00edc8e Implemented feature. 2018-11-16 22:35:33 -05:00
William Schaefer 2782c11fef Merge branch '4361-AddDataSourceIdColumn' of https://github.com/wschaeferB/autopsy into 4381-MacAddressCorrelationAttr 2018-11-16 16:39:32 -05:00
William Schaefer ec94b8ecde 4361 remove empty line white space change 2018-11-16 16:34:59 -05:00
William Schaefer 4a0be9ecf8 4361 do not attempt to update CR data sources when case is not present 2018-11-16 16:34:10 -05:00