 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 |
|
|
Richard Cordovano
|
301090a886
|
Merge remote-tracking branch 'upstream/master'
|
2013-11-20 10:24:36 -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 |
|
|
Richard Cordovano
|
de9a676a64
|
Merge remote-tracking branch 'upstream/master'
|
2013-11-19 17:47:29 -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 |
|
|
Samuel H. Kenyon
|
5a032099e6
|
Merge remote-tracking branch 'upstream/develop' into hashsetview
|
2013-11-19 12:00:14 -05:00 |
|
|
Samuel H. Kenyon
|
4207869db9
|
Revert Autopsy regression test of JNI HashDB which is now tested in the TSK JNI unit test.
|
2013-11-18 18:35:03 -05:00 |
|
|
Richard Cordovano
|
caef10a69b
|
Added code to AddContentTagAction to handle current and parent directory entries
|
2013-11-18 18:04:53 -05:00 |
|
|
Richard Cordovano
|
ec72bb7a81
|
Added code to AddContentTagAction to handle current and parent directory entries
|
2013-11-18 17:36:39 -05:00 |
|
|
Brian Carrier
|
930aaece4b
|
Merge pull request #345 from rcordovano/hashdb_comments
Added ability to comment hashes stored in hash databases
|
2013-11-18 13:27:30 -08:00 |
|
|
Richard Cordovano
|
7147cbce15
|
Fixed hang of GetTagNameDialog when user types in an existing tag name
|
2013-11-18 15:40:20 -05:00 |
|
|
Richard Cordovano
|
91c9bd2036
|
Removed superfluous import from AddContentToHashDbAction
|
2013-11-18 15:25:31 -05:00 |
|
|
Richard Cordovano
|
630bf46074
|
Updated HashDb for chnage in hash datbases API (accepting nulls in place of empty strings)
|
2013-11-18 15:04:41 -05:00 |
|
|
Richard Cordovano
|
01bc909c20
|
Updated the labels in KnownStatusSearchPanel fro multiple known databases
|
2013-11-18 14:43:46 -05:00 |
|
|
Richard Cordovano
|
f3fcfd180a
|
Merge branch 'develop' into hashdb_comments
|
2013-11-18 13:39:44 -05:00 |
|
|
Richard Cordovano
|
fc85137165
|
Merge remote-tracking branch 'upstream/master'
|
2013-11-17 22:05:37 -05:00 |
|