Commit Graph
8715 Commits
Author SHA1 Message Date
Jeff Wallace 78d44473f8 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into encryption
Conflicts:
	Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
2013-12-13 13:03:50 -05:00
Jeff Wallace 6bd183995b Changed default setting for showing keyword search snippets to true. 2013-12-13 10:19:24 -05:00
Samuel H. Kenyon 0d1d674780 FileExtMismatchIngestModule now has its own artifact type. Also moved file type id detector up in the pipeline. 2013-12-12 18:57:46 -05:00
Samuel H. Kenyon 74f1b21019 Added more allowed plaintext filename extensions. 2013-12-12 18:01:28 -05:00
Jeff Wallace 3f2e8d4fa2 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into newMboxParser
Conflicts:
	Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java
2013-12-12 15:34:33 -05:00
Jeff Wallace 947e4372b7 Fixed change that was missed during merge 2013-12-12 15:14:27 -05:00
Jeff Wallace 7290b1f052 line endings 2013-12-12 15:13:48 -05:00
Jeff Wallace d11df43a1d Merge branch 'develop' of https://github.com/sleuthkit/autopsy into ewfVerifyIngest
Conflicts:
	Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
	nbproject/project.properties
2013-12-12 14:58:21 -05:00
Jeff Wallace 183c333e28 line endings 2013-12-12 14:54:33 -05:00
Jeff Wallace d414130570 line endings 2013-12-12 14:53:45 -05:00
Jeff Wallace 5b7f705682 Merge branch 'master' of https://github.com/sleuthkit/autopsy into testing
Conflicts:
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/docs/keywordsearch-about.html
	test/script/regression.py
	test/script/srcupdater.py
2013-12-12 14:40:51 -05:00
Jeff Wallace c9b92a6f9f Add thumbnails for content and blackboard artifact tags for the html report. 2013-12-12 14:30:55 -05:00
Richard Cordovano 58f428085e Merge pull request #366 from jawallace/sqliteJarUpdate
Sqlite jar update
2013-12-12 10:59:59 -08:00
Richard Cordovano 8b5ddb11bd Merge pull request #395 from jawallace/content_viewer_window_focus
Bring the floating content viewer to the front when the 'View in new window' action is called.
2013-12-12 10:59:46 -08:00
Richard Cordovano 4e2c794115 Merge pull request #381 from jawallace/proxy_options
Show proxy options
2013-12-12 10:57:49 -08:00
Richard Cordovano 4503280fbc Merge pull request #374 from jawallace/compiler_warnings
Compiler warnings
2013-12-12 10:55:05 -08:00
Jeff Wallace 20b093a022 Extracted thumbnail generation to a utility class. 2013-12-12 11:04:49 -05:00
Richard Cordovano c842c11119 Merge pull request #396 from rcordovano/report_fix_merge
Report performance improvements merge from master
2013-12-11 14:54:21 -08:00
Richard Cordovano 175e4eea6b Finish merge cleanup 2013-12-11 17:36:44 -05:00
Jeff Wallace a635f9fc85 Removed stopwatch and debug printlns.
Conflicts:

	Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
2013-12-11 17:34:33 -05:00
Jeff Wallace 60ae393da2 Moved methods only used by ArtifactData into the ArtifactData class. Cache rowData for each ArtifactData.
Conflicts:

	Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
2013-12-11 17:31:32 -05:00
Jeff Wallace 32be04828f Performance improvement for artifact sorting.
Conflicts:

	Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
2013-12-11 16:45:29 -05:00
Jeff Wallace d31ed4a82d line endings. 2013-12-11 15:57:19 -05:00
Jeff Wallace ab7dc6ebd2 Updated html file size limit for jericho parser to 50mb 2013-12-11 15:49:11 -05:00
Jeff Wallace 2adae5b08b Bring the floating content viewer to the front when the 'View in new window' action is called. 2013-12-11 15:42:48 -05:00
Jeff Wallace c6dcc8daa5 Bypass jericho on files larger than 10 mb 2013-12-11 12:46:57 -05:00
raman-bt 2dd64c940d Display Interesting Items (Interesting Files, Interesting Artifacts) directly in the "Results" tree instead of under "Extracted Content". 2013-12-11 12:41:10 -05:00
Richard Cordovano a64a6d26f4 Merge pull request #393 from jawallace/deleted_file_limit
Updated limit of deleted files to 10000
2013-12-11 07:54:42 -08:00
Jeff Wallace f1bc3098fe Bypass tika for true type font files to avoid out of memory error. Added notes text file. 2013-12-11 10:22:39 -05:00
Jeff Wallace fd8828fb7a Updated limit of deleted files to 10000 2013-12-10 16:45:14 -05:00
Jeff Wallace bc4705cbd4 Fixed regression test that was broken by the change of a label on a checkbox. 2013-12-10 15:33:15 -05:00
Richard Cordovano 565cac3af8 Merge pull request #392 from rcordovano/hashdb_config_update_backup
Notify user, make backup during hashdb config file format update
2013-12-10 08:32:38 -08:00
Richard Cordovano 0cb7f57a69 Notify user, make backup during hashdb config file format update
Added code to the HashDbManager class to make a back up copy of old format/schema hash database configuration files. A message box is displayed to the user to let the user know the back up has occurred and where the back up file is located.
2013-12-10 11:27:53 -05:00
Richard Cordovano f807eedb02 Merge pull request #391 from rcordovano/lazy_nodes_fix
Fix DataResultViewerTable lazy node creation bugs
2013-12-10 06:12:36 -08:00
Richard Cordovano 6fd4eb8b68 Fix DataResultViewerTable lazy node creation bugs 2013-12-10 09:08:34 -05:00
Richard Cordovano bf407436a6 Merge remote-tracking branch 'upstream/master' 2013-12-10 09:07:32 -05:00
Richard Cordovano ba60ced898 Merge pull request #390 from rcordovano/lazy_props
Fix DataResultViewerTable lazy node creation bugs
2013-12-10 06:00:45 -08:00
Richard Cordovano 53cbe9ca61 Merge pull request #389 from rcordovano/case_wizard
Adapt hashdb, keywordsearch config panels for wider use
2013-12-10 05:53:08 -08:00
Richard Cordovano f4bab2d8bc Fix DataResultViewerTable lazy node creation bugs 2013-12-09 17:48:20 -05:00
Brian Carrier 40e55a4f64 Merge pull request #387 from jawallace/hex_viewer
Fix string out of bounds exception on non-windows.
2013-12-09 10:27:08 -08:00
Richard Cordovano 49374b5354 Adapt hashdb, keywordsearch config panels for wide use
Made these core configuration mechanisms uniform in support for wider use.
The simple and advanced config panels are now all public with public load/store methods.
2013-12-08 08:54:48 -05:00
Samuel H. Kenyon f39ca5e573 Added some more video formats to SigTypeToExtMap. 2013-12-06 18:18:03 -05:00
Jeff Wallace eb908737ee minor cleanup 2013-12-06 16:14:44 -05:00
Jeff Wallace 0b29c3eee5 cleanup of createKeys 2013-12-06 16:10:02 -05:00
Jeff Wallace d9ca04e476 Don't get a character that's out of range. 2013-12-06 16:01:03 -05:00
Jeff Wallace c88ea02a07 Added option to show keyword snippets or not. 2013-12-06 15:45:36 -05:00
Jeff Wallace 67d2f81252 more performQuery cleanup 2013-12-06 15:28:01 -05:00
Jeff Wallace 23ec64c459 Cleaned up performQuery 2013-12-06 15:19:22 -05:00
Jeff Wallace ec24c347bc Only perform one query to solr for hits and snippets 2013-12-06 14:47:53 -05:00
Samuel H. Kenyon 97e20f799e Added another extension (.milk == winamp viz config file). 2013-12-06 12:31:17 -05:00