Commit Graph
24378 Commits
Author SHA1 Message Date
U-BASIS\dgrove a53fc9333d New path; review comments addressed. 2019-02-15 02:50:58 -05:00
Raman 49680e7280 1184: Chrome cache
Allow for finding multiple chrome caches in a data source.
2019-02-14 15:46:18 -05:00
U-BASIS\kelly c4be4806cf Interim committ of History support for Edge browser 1190-edge-history 2019-02-14 13:58:42 -05:00
Richard Cordovano 52df9894ea Revert "Merge branch '1190-basic-edge-module' of https://github.com/kellykelly3/autopsy into improved-case-deletion"
This reverts commit c0d4be3a40, reversing
changes made to b55e97d99b.
2019-02-14 13:00:43 -05:00
Richard Cordovano c0d4be3a40 Merge branch '1190-basic-edge-module' of https://github.com/kellykelly3/autopsy into improved-case-deletion 2019-02-14 12:58:56 -05:00
William Schaefer 7ad7a797d4 4730-Suggested modifications for readability, some minor changes to logic 2019-02-14 12:28:52 -05:00
millmanorama ec47efd206 fix merge errors 2019-02-14 13:41:27 +01:00
millmanorama c45a15e485 Merge remote-tracking branch 'origin/timeline-event-mgr' into 1157-collapse_file_events
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/AllInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/SingleInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
2019-02-14 13:21:21 +01:00
millmanorama 792864e2f9 remove redundant FileTypeUtils.java in coreutils 2019-02-14 13:00:46 +01:00
millmanorama fa6178acd5 remove redundant calls to fireModuleDataEvent 2019-02-14 12:39:08 +01:00
millmanorama a73455fb78 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/casemodule/Case.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/AllInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/SingleInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/coreutils/History.java
#	Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
2019-02-14 11:39:26 +01:00
Ann Priestman 165f22182a Set md5, known, and MIME type when making the local file.
Remove call to closeConnections
2019-02-13 19:09:48 -05:00
Eugene Livis e597f3904e Modified header 2019-02-13 16:27:24 -05:00
Richard Cordovano b55e97d99b Merge pull request #4525 from sleuthkit/update_tsk_version
Update Unix_setup.sh version via script. Not Ant.
2019-02-13 15:47:26 -05:00
Richard Cordovano f10d9cb022 Merge pull request #4539 from sleuthkit/revert-4510-Optimization-Tika-Content-Extraction
Revert "Optimization and Bug fix - Make Tika use AbstractFile mimetype instead of recomputing"
2019-02-13 15:43:23 -05:00
Richard Cordovano 3c3d92f03c Revert "Optimization and Bug fix - Make Tika use AbstractFile mimetype instead of recomputing" 2019-02-13 15:43:04 -05:00
U-BASIS\dsmyda 9599112bfb Ran source code formatter 2019-02-13 15:05:14 -05:00
U-BASIS\dsmyda 9c614379d7 Removed unused import 2019-02-13 15:04:36 -05:00
U-BASIS\dsmyda 6abe277de8 Fixed node selection 2019-02-13 15:03:40 -05:00
U-BASIS\kelly 26376d9f9e Updated ExtractEdge per Brian's comments putting most of the code from process into its own function and cleaning up the copyright info 1190-basic-edge-module 2019-02-13 14:53:05 -05:00
U-BASIS\dgrove dc6628e787 Merge conflict resolved. 2019-02-13 14:15:15 -05:00
Brian Carrier 00c92f5bf6 Fixed line ending 2019-02-13 12:55:58 -05:00
U-BASIS\kelly 6a3348cb53 Final commit for inital Edge support to open and dump WebCacheV01.dat 1190-basic-edge-module 2019-02-13 12:50:35 -05:00
William Schaefer 270d5ef67c 4730 fix incorrect variable name in script 2019-02-13 12:42:59 -05:00
William Schaefer a3bff33fd6 4730 adjust for use case where a branch other than develop is targeted 2019-02-13 12:36:12 -05:00
Raman 065378c274 1188: Web cache artifact. 2019-02-13 11:56:33 -05:00
U-BASIS\kelly ebc6406d8c merged develop branch into 1190-basic-edge-module 2019-02-13 10:19:46 -05:00
William Schaefer e33aa22bea 4730 adjust pull location when owner is origin 2019-02-12 18:23:15 -05:00
William Schaefer 2d2df5212f 4730 manually set branch owner when origin and non-develop branch 2019-02-12 18:05:13 -05:00
William Schaefer 9ac389ac7a 4730 try and fix checkout for origin branches other than develop 2019-02-12 17:47:13 -05:00
William Schaefer ea86a06765 4730 fix equality check for empty string in travis build 2019-02-12 17:31:38 -05:00
William Schaefer 2b2b479f57 4730 adjust logic for getting branch for travis 2019-02-12 17:26:15 -05:00
William Schaefer ef142cfb1b 4730 adjust travis branch determination 2019-02-12 17:13:25 -05:00
William Schaefer f01bf350a0 4730 add temporary prints for debugging purposes 2019-02-12 17:00:56 -05:00
William Schaefer 5eae25cf9e 4730 get default appveyor / travis branch if it isn't develop 2019-02-12 16:48:54 -05:00
William Schaefer 287be8bb5f 4730 change default value for os.getEnv variables to useful default 2019-02-12 16:28:57 -05:00
U-BASIS\kelly b51cbe15fe Inital interim commit 2019-02-12 16:25:47 -05:00
Brian Carrier c4548389ca Copy merged buncles into src folder so that they can be checked in 2019-02-12 15:39:53 -05:00
Ann Priestman 653667da62 Merge remote-tracking branch 'upstream/develop' into 4683_portableCase 2019-02-12 12:30:32 -05:00
Raman 06754545fc - Assign mime type "application/x-brotli" to Brotli compressed files from Chrome cache..
- Sundry cleanup
2019-02-12 11:41:34 -05:00
Richard Cordovano 417659bb84 Merge pull request #4510 from dannysmyda/Optimization-Tika-Content-Extraction
Optimization and Bug fix - Make Tika use AbstractFile mimetype instead of recomputing
2019-02-12 10:20:04 -05:00
Richard Cordovano c9e557a241 Merge pull request #4507 from APriestman/4681_dontStartRelativePathsWithSlash
4681 Remove leading slash and normalize the rest
2019-02-12 10:18:49 -05:00
Eugene Livis cf55794292 Merge branch 'develop' of github.com:sleuthkit/autopsy into command_line_reports_4673 2019-02-12 09:54:53 -05:00
Eugene Livis d5024956c0 Minor chages 2019-02-12 09:53:56 -05:00
U-BASIS\dsmyda 3d0d70b036 removed unused import 2019-02-12 09:29:32 -05:00
Ann Priestman 4132d2a824 Revert CaseDetails changes.
Cleanup
2019-02-12 09:24:45 -05:00
Richard Cordovano f2e61ec0ec Merge pull request #4496 from eugene7646/command_line_4412
Support for running from command line 4412
2019-02-12 09:08:33 -05:00
millmanorama 5e51f5d531 Merge remote-tracking branch 'upstream/develop' into 1157-collapse_file_events
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/casemodule/Case.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/AllInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonpropertiessearch/SingleInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/coreutils/History.java
#	Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
2019-02-12 14:49:24 +01:00
U-BASIS\dsmyda e4f4491148 Added edge case for empty mime type 2019-02-11 16:16:38 -05:00
U-BASIS\dsmyda 1244110ab8 Ran source formatter on code 2019-02-11 13:37:31 -05:00