raman-bt
|
52a2e90559
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
|
2013-12-20 16:34:04 -05:00 |
|
raman-bt
|
236e1bcfec
|
Addressing review comments to "Interesting Artifacts" related changes earlier.
Mainly:
- Renamed InterestingItems* to InterestingHits*
- Renamed artifact TSK_INTERESTING_ARTIFACT to TSK_INTERESTING_ARTIFACT_HIT
|
2013-12-20 16:33:46 -05:00 |
|
Richard Cordovano
|
c62923ecd5
|
Merge pull request #399 from jawallace/encryption
Encryption
|
2013-12-20 13:23:11 -08:00 |
|
raman-bt
|
dbca90e7c0
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
|
2013-12-20 10:56:47 -05:00 |
|
Brian Carrier
|
ceaf070d4b
|
Merge branch 'develop' of github.com:sleuthkit/autopsy into develop
|
2013-12-20 10:55:54 -05:00 |
|
Brian Carrier
|
9cf5efbf1e
|
catch calls to complete() and return to old approach of calling init() on each module
|
2013-12-20 10:55:42 -05:00 |
|
raman-bt
|
e1efc7b1d2
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
|
2013-12-20 09:24:19 -05:00 |
|
Jeff Wallace
|
2bb02a3266
|
moved jpeg header check method to public image utils class.
|
2013-12-19 13:23:50 -05:00 |
|
Richard Cordovano
|
cc1a7f7f47
|
Merge pull request #398 from jawallace/thumbnail_reporting
Thumbnail reporting
|
2013-12-19 09:01:18 -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 |
|
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 |
|
Jeff Wallace
|
2c7eb4ce88
|
Link to content in HTML reports for blackboard artifact tags that refer to image files.
|
2013-12-13 16:22:55 -05:00 |
|
raman-bt
|
be83a65e2e
|
Content viewer displays the "associated artifact", in case the selected node has an artifact with ASSOCAITED_ARTIFACT attribute.
|
2013-12-13 15:48:55 -05:00 |
|
Jeff Wallace
|
199c347a79
|
Updated attributes associated with encryption artifact.
|
2013-12-13 13:28:17 -05:00 |
|
raman-bt
|
eae37fdc76
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
|
2013-12-13 13:17:28 -05:00 |
|
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
|
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
|
c9b92a6f9f
|
Add thumbnails for content and blackboard artifact tags for the html report.
|
2013-12-12 14:30:55 -05:00 |
|
Jeff Wallace
|
20b093a022
|
Extracted thumbnail generation to a utility class.
|
2013-12-12 11:04:49 -05: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 |
|
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
|
f4bab2d8bc
|
Fix DataResultViewerTable lazy node creation bugs
|
2013-12-09 17:48:20 -05:00 |
|
Jeff Wallace
|
5fac795587
|
Updated name of encrption artifact.
|
2013-12-05 12:09:25 -05:00 |
|
Richard Cordovano
|
4451064cfd
|
Merge branch 'develop-rc1' into merge_in_develop-rc1
|
2013-12-05 10:37:40 -05:00 |
|
Richard Cordovano
|
eed57063c7
|
Fix for scheduling of derived files
|
2013-12-04 20:46:53 -05: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 |
|
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 |
|
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 |
|
Jeff Wallace
|
1c78e0c896
|
Merge branch 'master' of https://github.com/sleuthkit/autopsy into ie_bookmark_parsing
|
2013-12-02 15:45:43 -05:00 |
|
Jeff Wallace
|
fdcf2655f3
|
Added comments to clarify multiple ViewContextActions added to BlackboardArtifactNodes
|
2013-12-02 15:42:44 -05:00 |
|
Brian Carrier
|
d3ed01e1d3
|
surround firepropertychange listeners in IngestManager with try/catch
|
2013-11-27 09:21:17 -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 |
|
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 |
|
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 |
|