Commit Graph
4718 Commits
Author SHA1 Message Date
Brian Carrier 709111326c Merge pull request #402 from jawallace/gen_info_shouldnt_refresh_tree
don't refresh directory tree when a module data event fires for the general info artifact.
2013-12-18 13:25:03 -08:00
Jeff Wallace 3eb5cef318 Don't refresh directory tree when a module data event is called for the general info artifact. 2013-12-18 15:02:55 -05:00
Jeff Wallace 258e80d59b Don't refresh tree for general info artifacts. 2013-12-18 15:02:47 -05:00
Richard Cordovano 5a8145cbac Merge pull request #401 from jawallace/minor_cleanup_tasks
Minor cleanup tasks
2013-12-18 10:43:57 -08:00
Jeff Wallace 3eb5453d5f Updated logic in default action for data result nodes.
Conflicts:

	Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
2013-12-18 11:12:48 -05:00
Jeff Wallace 0e4b47dd36 Removed deprecated comment. 2013-12-18 11:11:49 -05:00
Richard Cordovano 9868466d9b Merge pull request #397 from jawallace/newMboxParser
New mbox parser
2013-12-18 07:35:23 -08:00
Richard Cordovano 8e8b05732b Merge pull request #350 from jawallace/filterKnown
Filter known
2013-12-18 07:34:35 -08:00
Richard Cordovano 94ededd14e Merge pull request #349 from jawallace/ewfVerifyIngest
Ewf verify ingest
2013-12-18 07:34:14 -08:00
Brian Carrier 405d1e7413 FileTypeModule: doesn't send events, gets existing GEN_INFO, doesn't ignore known bad 2013-12-18 10:12:42 -05:00
Brian Carrier eb6fb4f786 Cleaned up keyword search code a tiny bit and changed logic so that property change is fired for each keyword and not every 250 if there are lots of hits inside of the keyword 2013-12-17 13:10:23 -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 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
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
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 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
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
Richard Cordovano 95fb091c6b Merge pull request #386 from rcordovano/merge_in_develop-rc1
Merge in develop rc1
2013-12-05 07:41:01 -08:00
Richard Cordovano 4451064cfd Merge branch 'develop-rc1' into merge_in_develop-rc1 2013-12-05 10:37:40 -05:00
Richard Cordovano f3d164b106 Merge remote-tracking branch 'upstream/develop' into develop 2013-12-05 10:34:44 -05:00
Richard Cordovano eed57063c7 Fix for scheduling of derived files 2013-12-04 20:46:53 -05:00
Richard Cordovano 60a241e39c Merge pull request #385 from jawallace/develop-rc1-logical-file-fix
Fixed npe while getting data source name for local files.
2013-12-04 13:20:29 -08:00
Jeff Wallace a7973e6ce6 Fixed npe while getting data source name for local files. 2013-12-04 16:01:44 -05:00
Richard Cordovano bc794f175d Merge pull request #384 from rcordovano/develop-rc1
Corrected handling of always calc hashes flag
2013-12-04 12:33:43 -08:00
Richard Cordovano 509684cebc Corrected handling of always calc hashes flag 2013-12-04 15:31:46 -05:00
Brian Carrier a77444a8d3 Merge branch 'master' into develop 2013-12-04 12:20:51 -05:00
Brian Carrier 705c0e259d Merge pull request #380 from jawallace/data_source_name
Fixed npe while getting data source name for local files.
2013-12-04 09:19:46 -08:00
Richard Cordovano 8b243e8215 Merge pull request #382 from rcordovano/develop-rc1
Added updating of simple hash db config panel
2013-12-03 13:34:41 -08:00
Richard Cordovano 170e9720ef Added updating of simple hash db config panel 2013-12-03 16:30:17 -05:00
Brian Carrier 81230d4f97 resolved merge conflicts 2013-12-03 14:56:44 -05:00
Jeff Wallace 821888da82 Fixed npe while getting data source name for local files. 2013-12-03 12:20:03 -05:00
Brian Carrier 0f97529038 typo changes from Derrick Karpo 2013-12-03 11:07:28 -05:00
Richard Cordovano 98957a49df Merge remote-tracking branch 'upstream/develop' into develop 2013-12-03 10:26:59 -05:00
Brian Carrier e68262fd7c Merge branch 'develop-rc1' into develop 2013-12-03 10:15:22 -05:00
Richard Cordovano c58d5d3bf7 Merge remote-tracking branch 'upstream/develop' into develop 2013-12-03 10:11:51 -05:00
Richard Cordovano d702e0bf53 Merge pull request #378 from rcordovano/develop-rc1
Removed finalize() from HashDbManager
2013-12-02 16:48:40 -08:00
Richard Cordovano 0a0aa564dc Removed finalize() from HashDbManager 2013-12-02 19:47:57 -05:00
Richard Cordovano 6574b5a296 Merge pull request #377 from rcordovano/develop-rc1
Routed hash db indexing through mgr to get index path
2013-12-02 16:08:04 -08:00
Richard Cordovano b80d43a0d0 Routed hash db indexing through mgr to get index path 2013-12-02 19:07:05 -05:00
Richard Cordovano a730dca21f Merge pull request #376 from rcordovano/develop-rc1
Repair to HashDbManager.addHashDatabase()
2013-12-02 15:08:20 -08:00