Commit Graph
24378 Commits
Author SHA1 Message Date
U-BASIS\dsmyda 3040976ab8 Made only unpackstream wrap an encodedfileoutputstream 2018-11-08 15:55:11 -05:00
U-BASIS\dsmyda f76967969d Merge remote-tracking branch 'upstream/develop' into Appropriate_SevenZipExtractor_Memory_Fix 2018-11-08 15:43:44 -05:00
U-BASIS\dsmyda 3f2a748d9d Fixing unncessary class indirection 2018-11-08 15:43:32 -05:00
William Schaefer 67a2dbb294 4354 add NON-NLS comment to database opperations 2018-11-08 15:40:27 -05:00
William Schaefer 0ebb679778 4354 make upgrade code succeed when object_id column already exists 2018-11-08 15:29:19 -05:00
U-BASIS\dsmyda 1fd7ba7f7c Added param comment to method header 2018-11-08 15:22:27 -05:00
U-BASIS\dsmyda 550874ead6 added try catch around close function, tested to make sure not SQLiteTableReader changes that got merged in broke anything 2018-11-08 15:13:38 -05:00
U-BASIS\dsmyda 1e1ceeae3d Merged in the updated and commented SQLiteTableReader 2018-11-08 14:49:37 -05:00
U-BASIS\dsmyda 7cc9fc6b78 Minor changes 2018-11-08 14:47:42 -05:00
U-BASIS\dsmyda f0998c7a02 Fixed a bug with clicking the same table name 2018-11-08 14:45:57 -05:00
Eugene Livis d071a155ad Merge branch 'develop' of github.com:sleuthkit/autopsy into case_uco_1889 2018-11-08 14:45:40 -05:00
Eugene Livis 7a0d31c31b Added UI warnings on errors 2018-11-08 14:45:15 -05:00
U-BASIS\dsmyda 711ed7a388 Close now throws exception, so had to wrap it here 2018-11-08 14:29:39 -05:00
U-BASIS\dsmyda 11943c3923 Merge branch '4388-implement-sqlite-streaming-design' into 4389-sqlite-stream-impl 2018-11-08 14:13:54 -05:00
U-BASIS\dsmyda 7199f0e955 Commented and refactored the solution, need to test nothing is broken 2018-11-08 14:11:08 -05:00
William Schaefer 3f637e12bf Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4354-AddObjectIdToCR 2018-11-08 13:41:25 -05:00
William Schaefer 819cf99f9e 4354 adjust comments regarding objectID 2018-11-08 13:41:12 -05:00
Richard Cordovano 6777d80711 Merge pull request #4263 from raman-bt/timeline-event-mgr
1089: Catch and log Runtime exception when publishing events remotely.
2018-11-08 13:29:54 -05:00
Richard Cordovano 7c534810ff Merge pull request #4250 from wschaeferB/4305-NewCorrelationAttrs
4305 new correlation attrs
2018-11-08 13:26:40 -05:00
Ann Priestman 6b3fb0ec29 Add code to verify hashes 2018-11-08 12:47:04 -05:00
U-BASIS\dsmyda 5a2de8a02c Bug fix on empty table display 2018-11-08 12:27:51 -05:00
dannysmyda 97b2f6ca81 Merge branch 'develop' into 4389-sqlite-stream-impl 2018-11-08 11:47:40 -05:00
U-BASIS\dsmyda b4cf1a0470 Added a few more comments 2018-11-08 11:36:07 -05:00
U-BASIS\dsmyda 03e851a341 Deleted SqliteUtil and fixed a log message 2018-11-08 11:31:58 -05:00
U-BASIS\dsmyda ac4565f42f Refactored some code to make it more readable and added comments 2018-11-08 11:27:42 -05:00
William Schaefer 516cc2fb0c Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4354-AddObjectIdToCR 2018-11-08 11:21:54 -05:00
Richard Cordovano dd4a29b456 Merge pull request #4270 from wschaeferB/20181108ChangeToDevelop
Change the build type back to DEVELOPMENT
2018-11-08 11:21:37 -05:00
millmanorama 826ff47e24 cleanup merge 2018-11-08 16:37:27 +01:00
William Schaefer b907d6db0e Change the build type back to DEVELOPMENT 2018-11-08 10:25:32 -05:00
millmanorama 1bbee98a78 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/FirefoxExtractor.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
2018-11-08 16:23:54 +01:00
U-BASIS\dsmyda b13736b67c Added license back in 2018-11-08 10:07:57 -05:00
U-BASIS\dsmyda 422e6a7250 Commented and cleaned up the code for the text extractor 2018-11-08 10:04:03 -05:00
millmanorama 6be0b109db cleanup, comments 2018-11-08 15:08:43 +01:00
millmanorama e1b593c099 move mime-type lists into FilterUtils and implement 'Other' FileTypeFilter 2018-11-08 15:03:15 +01:00
Ann Priestman 7368a7e64b Added support for new hash columns.
Started on reworking E01 module.
2018-11-08 08:17:26 -05:00
William Schaefer 0a788d14bc 4354 merge in changes from 4305 to 4354 2018-11-07 17:59:43 -05:00
William Schaefer a694e78701 4305 allow version to be updated if schema changes already present 2018-11-07 17:50:53 -05:00
William Schaefer 37d048bc59 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4305-NewCorrelationAttrs 2018-11-07 16:51:15 -05:00
Eugene Livis 6fe00f312e Added relationships between traces. Lots of bug fixes 2018-11-07 16:43:31 -05:00
Eugene Livis 46f51c2c18 Saving data soirce imfo in CASE/UCO format 2018-11-07 15:13:00 -05:00
William Schaefer f78ac99197 4305 remove changes for flag items global setting 2018-11-07 15:04:04 -05:00
Richard Cordovano 8d7fcf13a4 Merge pull request #4260 from APriestman/4357_moveExtractDomain
4357 Move extractDomain into coreutils
2018-11-07 14:53:40 -05:00
U-BASIS\dsmyda fa2548f919 Merge remote-tracking branch 'upstream/develop' into 4282-streaming-design-implementation 2018-11-07 13:31:13 -05:00
U-BASIS\dsmyda fbed670a4b Fixed text extractor using streaming impl 2018-11-07 13:30:51 -05:00
U-BASIS\dsmyda aac459f4b5 Made content viewer impl new streaming sqlite class 2018-11-07 13:29:32 -05:00
Richard Cordovano 1f469ee112 Merge pull request #4248 from dgrove727/4335_ExtensionMismatchViewer
Using Application tab as the default.
2018-11-07 13:02:49 -05:00
U-BASIS\dsmyda d3f6678f8b Bug fixes and file rename 2018-11-07 11:28:38 -05:00
William Schaefer 547e1001f0 4354 add comment to explain why object_id query for correlation attr might fail 2018-11-07 11:27:56 -05:00
millmanorama 3f4b04aa2d rework file type filtering to use predefined groups of mime types 2018-11-07 17:27:55 +01:00
Richard Cordovano f4d5c2903f Merge pull request #4246 from dgrove727/4365_SortTimeZones
4365 sort time zones
2018-11-07 11:27:11 -05:00