Commit Graph
8715 Commits
Author SHA1 Message Date
Samuel H. Kenyon ccd01c2242 Update pipeline config file to force the order of FileTypeIdIngestModule before FileExtMismatchIngestModule. 2013-12-05 18:48:09 -05:00
Samuel H. Kenyon 860575fe7e Add some more extensions that are often plaintext. 2013-12-05 14:40:56 -05:00
Samuel H. Kenyon 3406d93bd6 Treat plaintext extension config file as a resource when opening, not as a file. 2013-12-05 14:39:48 -05:00
Samuel H. Kenyon 03397b2d58 Hopefully this ensures that the file id and mismatch modules will run in the correct ord.er 2013-12-05 13:44:15 -05:00
Jeff Wallace ef61965acf Fixed string out of bounds exception in hex viewer on os x. 2013-12-05 13:16:05 -05:00
Jeff Wallace 5fac795587 Updated name of encrption artifact. 2013-12-05 12:09:25 -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 b42091541b Merge remote-tracking branch 'upstream/master' 2013-12-05 10:33:53 -05:00
Richard Cordovano eed57063c7 Fix for scheduling of derived files 2013-12-04 20:46:53 -05:00
Brian Carrier 1f932aca22 Merge pull request #383 from jawallace/report_hang
Fixed report hang
2013-12-04 14:29:42 -08:00
Samuel H. Kenyon 800c14e7d5 New more extensive plaintext file extension list. 2013-12-04 17:07:31 -05:00
Samuel H. Kenyon 60d5f9f5aa Load plaintext extensions from a file. 2013-12-04 16:34:37 -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
Jeff Wallace e5e2c0fc2f Updated uses of new encryption artifact. 2013-12-04 15:58:54 -05:00
Richard Cordovano dd9cae8c5b Merge remote-tracking branch 'upstream/master' 2013-12-04 15:37:27 -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
Jeff Wallace a6858d969e minor cleanup 2013-12-04 13:46:20 -05:00
Jeff Wallace 26d8c60102 Removed another println 2013-12-04 13:36:15 -05:00
Jeff Wallace 6dab171f21 Removed stopwatch and debug printlns. 2013-12-04 13:33:10 -05:00
Jeff Wallace 129f6fb16c Moved methods only used by ArtifactData into the ArtifactData class. Cache rowData for each ArtifactData. 2013-12-04 13:30:59 -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
Jeff Wallace 15de072e71 Performance improvement for artifact sorting. 2013-12-04 11:41:49 -05: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 00347715af Added license header to a couple of files. 2013-12-03 13:15:40 -05:00
Jeff Wallace 9400fd9103 Unhid netbeans general (proxy) options. Changed General options panel to Display 2013-12-03 13:14:38 -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 a95144a5ae Merge remote-tracking branch 'upstream/master' 2013-12-03 10:12:46 -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
Richard Cordovano 7ba22bae16 Fixed bug introduced in recently improved version of HashDbManager.addHashDatabase() 2013-12-02 18:03:22 -05:00
Jeff Wallace dc0551be16 Fixed runtime exception due to casting error. 2013-12-02 17:35:49 -05:00
Brian Carrier 4a6ac42282 Merge pull request #372 from jawallace/ie_bookmark_parsing
Recent Activity Improvments
2013-12-02 14:29:07 -08:00
Richard Cordovano abc9558668 Merge pull request #375 from rcordovano/develop-rc1
Ensure uniqueness of hash set names, single import of hash databases, misc bug fixes
2013-12-02 14:24:19 -08:00
Richard Cordovano 1c21692352 Fixed error in implementation of HashDbManager.closeDatabases() 2013-12-02 17:14:00 -05:00
Jeff Wallace 9c663587ff Merge branch 'master' of https://github.com/sleuthkit/autopsy into compiler_warnings 2013-12-02 16:53:57 -05:00
Jeff Wallace 1fa72336e4 Suppressed warnings where appropriate 2013-12-02 16:50:06 -05:00