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 |
|
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
|
a95144a5ae
|
Merge remote-tracking branch 'upstream/master'
|
2013-12-03 10:12:46 -05:00 |
|
Jeff Wallace
|
dc0551be16
|
Fixed runtime exception due to casting error.
|
2013-12-02 17:35:49 -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
|
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 |
|
Jeff Wallace
|
ea1c774d63
|
Changed NodeProperty to be generic. Updated references.
|
2013-11-27 13:47:27 -05:00 |
|
Jeff Wallace
|
341db41da6
|
Suppressed some compiler warnings with annotations.
|
2013-11-27 13:46:35 -05:00 |
|
Jeff Wallace
|
757e1ffa97
|
Fixed use of generics to remove compiler warnings.
|
2013-11-27 11:26:30 -05:00 |
|
Jeff Wallace
|
47ebc70435
|
Fixed use of generics to eliminate compiler warnings.
|
2013-11-27 11:00:11 -05:00 |
|
Brian Carrier
|
d3ed01e1d3
|
surround firepropertychange listeners in IngestManager with try/catch
|
2013-11-27 09:21:17 -05:00 |
|
Jeff Wallace
|
9c0ffa953c
|
Fixed compiler warnings.
|
2013-11-26 15:31:16 -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 |
|
Richard Cordovano
|
96da27ed96
|
Merge remote-tracking branch 'upstream/master'
|
2013-11-23 06:16:36 -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
|
f91e25933a
|
Merge pull request #355 from jawallace/new_lib_loading
New lib loading
|
2013-11-22 12:41:31 -08:00 |
|
Brian Carrier
|
1d66f7e782
|
Merge remote-tracking branch 'origin/master'
|
2013-11-22 13:51:11 -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 |
|
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 |
|
Jeff Wallace
|
1e71d7397d
|
Only explicitly load zlib and libewf from windows.
|
2013-11-21 14:34:02 -05:00 |
|
Jeff Wallace
|
8bb313d6b1
|
Load zlib, libewf, and crt from system path.
|
2013-11-21 14:33:41 -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 |
|
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 |
|
Brian Carrier
|
189192e2e9
|
resolved merge conflict
|
2013-11-19 13:41:09 -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 |
|