5296 Commits

Author SHA1 Message Date
Richard Cordovano
5622b9d5cd Reworked hash database create and import dialogs 2013-11-26 18:02:08 -05:00
Samuel H. Kenyon
1629365bdc Move currently-unused FileTypeDetector classes to a directory where Netbeans won't pick them up for compiling. Remove references to the relevant third-party jars. 2013-11-26 15:26:27 -05:00
Samuel H. Kenyon
db4f9a2d9d Fix spelling error in doxygen doc. 2013-11-26 15:11:01 -05:00
Samuel H. Kenyon
ec694204c1 Re-added the new FileTypeId ingest module, set to use Tika. 2013-11-26 15:09:47 -05:00
Samuel H. Kenyon
cc57baba45 Line endings. 2013-11-26 14:46:24 -05:00
Jeff Wallace
b4cc51ce0d Removed regex type drop down from advanced keyword search config. 2013-11-26 12:25:42 -05:00
Jeff Wallace
f022875a04 Merge branch 'master' of https://github.com/sleuthkit/autopsy into viewInContext 2013-11-26 12:15:07 -05:00
Jeff Wallace
499bd61639 Cleaned up ViewContextAction and added more specific documentation. 2013-11-26 12:12:53 -05:00
Brian Carrier
a91b9fd92e Merge pull request #362 from raman-bt/flexiwizard
Display the error message prominently on the Progress Panel, in case of ...
2013-11-26 06:05:58 -08:00
Richard Cordovano
96f23c2079 Normalize line endings 2013-11-25 13:42:59 -05:00
raman-bt
010b58e275 Display the error message prominently on the Progress Panel, in case of critical errors.
Ensure critical error reported from a DSP is propagated to the ProgressPanel.
Remove redundant text ProgressPanel.
Clean up of log messages.
2013-11-25 09:19:02 -05:00
Richard Cordovano
4f4e6da52d Normalize line endings 2013-11-23 06:19:14 -05:00
Brian Carrier
435ded0998 Merge branch 'master' of github.com:sleuthkit/autopsy 2013-11-22 21:45:22 -05:00
Brian Carrier
a4f9bbdd19 fixed extra warning message if no ingest modules were previously selected 2013-11-22 21:45:06 -05:00
Brian Carrier
3ff19311a5 Merge pull request #361 from rcordovano/develop-rc1
Hash database configuration management fixes
2013-11-22 18:24:40 -08:00
Richard Cordovano
b602bdbf46 Hash database configuration management fixes 2013-11-22 16:08:31 -05:00
Brian Carrier
f91e25933a Merge pull request #355 from jawallace/new_lib_loading
New lib loading
2013-11-22 12:41:31 -08:00
Brian Carrier
bfc3ae02ff normalized line endings 2013-11-22 13:51:57 -05:00
Brian Carrier
1d66f7e782 Merge remote-tracking branch 'origin/master' 2013-11-22 13:51:11 -05:00
Brian Carrier
79cae6348b normalized line endings 2013-11-22 13:51:01 -05:00
Brian Carrier
6d35f89656 Fixed error reported in #357 for hex viewer not displaying correct hex values. 2013-11-22 13:46:12 -05:00
Brian Carrier
9f50dd1860 Merge pull request #351 from raman-bt/flexiwizard
Flexiwizard
2013-11-22 09:09:08 -08:00
Brian Carrier
56c529f393 Merge pull request #360 from rcordovano/develop-rc1
Assorted hash database module improvements
2013-11-22 05:47:02 -08:00
Richard Cordovano
2e8444d6a6 Assorted hash database module improvements 2013-11-22 08:05:46 -05:00
Jeff Wallace
ed4fcbc655 Fixed tabs. 2013-11-21 16:24:34 -05:00
Jeff Wallace
e4ddf26809 Merge https://github.com/sleuthkit/autopsy into viewInContext
Conflicts:
	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
2013-11-21 16:20:42 -05:00
Jeff Wallace
fc961cd210 Added documentation. 2013-11-21 16:10:23 -05:00
Jeff Wallace
f15301ed5e Fixed error. 2013-11-21 16:10:17 -05:00
Jeff Wallace
4f07cc3988 Fixed 'view in directory' action. 2013-11-21 16:10:11 -05:00
Brian Carrier
d01ee1506b Merge pull request #353 from SynapticNulship/hashdb_sqlite
Revert temporary Autopsy Regression Test changes.
2013-11-21 11:53:40 -08:00
Jeff Wallace
1e71d7397d Only explicitly load zlib and libewf from windows. 2013-11-21 14:34:02 -05:00
Jeff Wallace
f4d33150f0 Updated crt files. 2013-11-21 14:33:52 -05:00
Jeff Wallace
8bb313d6b1 Load zlib, libewf, and crt from system path. 2013-11-21 14:33:41 -05:00
Samuel H. Kenyon
a939f04b72 Merge remote-tracking branch 'upstream/develop' into hashdb_sqlite 2013-11-20 14:47:33 -05:00
Brian Carrier
3339994322 normalized line endings 2013-11-19 22:04:07 -05:00
Brian Carrier
f6020cf452 merged master into develop 2013-11-19 22:03:14 -05:00
Brian Carrier
f362b82c7c Merge pull request #352 from rcordovano/develop
Normalization of line endings
2013-11-19 18:30:39 -08:00
Richard Cordovano
9ac0c310ea Normalization of line endings 2013-11-19 18:17:34 -05:00
Brian Carrier
cc5ee213f6 Merge pull request #347 from SynapticNulship/hashsetview
Hashsetview
2013-11-19 13:57:15 -08:00
Jeff Wallace
e688a97dbc Merge branch 'develop' of https://github.com/sleuthkit/autopsy into ewfVerifyIngest
Conflicts:
	Core/src/org/sleuthkit/autopsy/datamodel/Tags.java
	Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties
	Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
	HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java
2013-11-19 15:49:13 -05:00
Jeff Wallace
58c912f244 Merge branch 'master' of https://github.com/sleuthkit/autopsy into ewfVerifyIngest 2013-11-19 15:44:55 -05:00
Jeff Wallace
2b9f9454b5 Merge https://github.com/sleuthkit/autopsy into newMboxParser
Conflicts:
	thunderbirdparser/nbproject/project.properties
2013-11-19 14:27:44 -05:00
Jeff Wallace
52724b4272 Line endings. 2013-11-19 14:15:32 -05:00
Brian Carrier
189192e2e9 resolved merge conflict 2013-11-19 13:41:09 -05:00
Brian Carrier
cc85120678 normalized line endings 2013-11-19 13:36:53 -05:00
raman-bt
b1905be061 Merge branch 'develop' into flexiwizard
Conflicts:
	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
2013-11-19 13:33:18 -05:00
Brian Carrier
10c4517a82 Merge pull request #337 from jawallace/macUIFix
minor ui fixes for mac.
2013-11-19 10:05:56 -08:00
Brian Carrier
d7f80f3ca5 Merge pull request #338 from jawallace/uniquePath
Added DataSource column to BlackboardArtifactNodes.
2013-11-19 10:05:15 -08:00
Brian Carrier
09814239a5 Merge pull request #342 from jawallace/newWindowAction
New window action
2013-11-19 10:03:08 -08:00
Brian Carrier
7084dd7dcf Merge pull request #346 from rcordovano/tags_and_hashes_fixes
Tags and hashes fixes
2013-11-19 10:02:43 -08:00