1315 Commits

Author SHA1 Message Date
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
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
Samuel H. Kenyon
5a032099e6 Merge remote-tracking branch 'upstream/develop' into hashsetview 2013-11-19 12:00:14 -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
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
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
Samuel H. Kenyon
e585d612e7 Populate the In Hashsets column (empty string if there were no hits for that file). 2013-11-15 23:30:12 -05:00
Samuel H. Kenyon
4d0788dc22 Add In Hashset column (no data yet). 2013-11-15 22:50:16 -05:00
Richard Cordovano
630f165c29 Remove adding hashes of virtual directories, other small fixes 2013-11-15 17:28:17 -05:00
Richard Cordovano
b7c12a154e Updated Tags sub-tree nodes to populate path area of DataResultTopComponent 2013-11-15 13:50:12 -05:00
Richard Cordovano
9f7cb9098f Changed icons for tags 2013-11-15 11:27:37 -05:00
Brian Carrier
3a57096556 normalized web attributes, reworded keyword ingest labels 2013-11-14 21:40:56 -05:00
Jeff Wallace
b4a8640669 Added documentation to the fix. 2013-11-14 16:53:19 -05:00
Jeff Wallace
6f336add8e Fixed View in new Window action for images. 2013-11-14 16:53:12 -05:00
Jeff Wallace
a70540a16d Updated reference to email parser module name in general ingest configurator. 2013-11-14 14:57:22 -05:00
Richard Cordovano
4f004e44c2 Updated hash database code and its clients to use new comment feature of API 2013-11-14 13:10:10 -05:00
Richard Cordovano
97ef8c45eb Merged master into tags_and_hashes 2013-11-13 20:31:05 -05:00
Richard Cordovano
36292599b0 Cosmetic UI fix to report generator handling of reports without files 2013-11-13 19:54:05 -05:00
Richard Cordovano
b3856fd0d1 Fix for bug in handling of null file path/ext code for report modules 2013-11-13 19:35:31 -05:00
Richard Cordovano
24bbd79de6 Clean up for hash db API work 2013-11-13 19:02:39 -05:00
Richard Cordovano
178179a462 Correct implementation of indexing for hash databases 2013-11-13 18:40:25 -05:00
raman-bt
a4fc68b5a8 Changed the label on the message box in ProgressPanel to be more generic and read "Status" instead of "Currently Adding:"
Any kind of progress messages may be displayed in the box, instead of simply the name of file/folder being added.
2013-11-13 09:14:26 -05:00
Jeff Wallace
eb82122a09 Only show full path for certain artifact nodes. 2013-11-11 13:44:56 -05:00
Jeff Wallace
34007d2979 Removed duplicate path columns for some blackboard artifact nodes. 2013-11-11 09:46:18 -05:00
Richard Cordovano
a537d0457b Modified DataModelActionsFactory to deal with artifact source content 2013-11-10 20:03:51 -05:00
Richard Cordovano
b82816009e Restored selection of menu actions for tag nodes 2013-11-10 19:31:34 -05:00
Richard Cordovano
cec71c909a Added getActions(Content content) to DataModelActionsFactory 2013-11-09 11:52:12 -05:00
Richard Cordovano
fe610119fe Added DataModelActionsFactory class 2013-11-09 11:42:56 -05:00
Jeff Wallace
4ec9d61977 Added DataSource column to BlackboardArtifactNodes. 2013-11-08 16:44:35 -05:00