10516 Commits

Author SHA1 Message Date
Eugene Livis
5a44020de6 Improved logging inside AddImageTask 2016-01-14 15:00:19 -05:00
Richard Cordovano
f591eab75a Merge pull request #1820 from BasisOlivers/custom_artifact_addition-1857
Custom artifact addition fixed DirectoryTreeTopComponent.viewArtifact
2016-01-14 13:53:22 -05:00
Oliver Spohngellert
6886d36ac4 Added ingest module test for fixed DirectoryTreeTopComponent.viewArtifact 2016-01-14 13:42:47 -05:00
Oliver Spohngellert
5801f85828 Merge branch 'custom_artifact_addition' into custom_artifact_addition-1857 2016-01-14 13:09:56 -05:00
Richard Cordovano
a09178be73 Merge pull request #1819 from BasisOlivers/custom_artifact_addition-attribute-test
Attached new artifacts to different files
2016-01-14 12:55:14 -05:00
Oliver Spohngellert
e13bcbe22c Attached new artifacts to different files 2016-01-14 12:44:12 -05:00
Eugene Livis
1d40794bcf Fixed errors related to logging 2016-01-14 12:39:48 -05:00
Oliver Spohngellert
03c53e62b6 Merge branch 'custom_artifact_addition' into custom_artifact_addition-1857 2016-01-14 12:24:42 -05:00
Richard Cordovano
a1edb731f3 Merge pull request #1818 from BasisOlivers/custom_artifact_addition-attribute-test
Changed attribute type on ingest module
2016-01-14 11:47:11 -05:00
Oliver Spohngellert
f19d7ffbd2 Changed attribute type on ingest module 2016-01-14 11:34:51 -05:00
Oliver Spohngellert
672a25056e Fixed DirectoryTreeTopComponent to use the artifact ID and typeName instead of ARTIFACT_TYPE 2016-01-14 11:01:12 -05:00
Richard Cordovano
df3e5ebfc4 Merge pull request #1815 from BasisOlivers/custom_artifact_addition-attribute-test
Tested adding an attribute to the custom artifact
2016-01-14 10:11:17 -05:00
Brian Carrier
4dc20fd32e Merge pull request #1816 from karlmortensen/addNote
add note explaining isValidSolrUTF8() limitations
2016-01-14 09:52:43 -05:00
Karl Mortensen
426d5a57d1 add note explaining isValidSolrUTF8() limitations 2016-01-14 09:47:25 -05:00
Oliver Spohngellert
226fac3f3e Removed unnecessary import 2016-01-14 09:46:02 -05:00
Oliver Spohngellert
28d27ac452 Added attributes to the test ingest module 2016-01-14 09:44:00 -05:00
Richard Cordovano
ae5e8fff7e Merge pull request #1814 from BasisOlivers/custom_artifact_addition-1855
Made one method for getIconFilePath
2016-01-14 09:24:38 -05:00
Oliver Spohngellert
1c89bef2a8 Got rid of getIcon method in BlackboardArtifactNode 2016-01-13 16:56:31 -05:00
Eugene Livis
4548f7605e Checking for data source cancelation 2016-01-13 16:45:54 -05:00
Oliver Spohngellert
1a9d1f22cd Updated getIconFilePath as per 1855 (implemented in appropriate places 2016-01-13 16:35:30 -05:00
Eugene Livis
c27b8655f7 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into vm_detection 2016-01-13 14:40:59 -05:00
Eugene Livis
19a6e4b996 Added more logging 2016-01-13 14:40:28 -05:00
Richard Cordovano
b05b9cab6b Merge pull request #1812 from millmanorama/IG-bug-fixes
IG bug fixes
2016-01-13 12:02:47 -05:00
jmillman
4f8316a8cf fix OpenExternalViewerAction and usage in IG 2016-01-13 11:36:58 -05:00
Richard Cordovano
5017fbf66b Merge pull request #1811 from BasisOlivers/custom_artifact_addition-1851
Custom artifact addition 1851
2016-01-13 10:55:09 -05:00
Oliver Spohngellert
e5540228c2 Added ingest module in order to see if adding custom artifacts was working 2016-01-13 10:44:37 -05:00
Richard Cordovano
5fe9e4cd3f Merge pull request #1810 from BasisOlivers/custom_artifact_addition-1848.2
Custom artifact addition 1848.2
2016-01-13 10:43:42 -05:00
Oliver Spohngellert
f877b03f14 Updated design, eliminated unneccessary icon method 2016-01-12 16:49:57 -05:00
Oliver Spohngellert
afb6acfeb1 Start of ingest module to test user types 2016-01-12 16:45:17 -05:00
jmillman
ce199ecf5b clarify log messages 2016-01-12 16:44:11 -05:00
jmillman
55381fd9be fix some image reading bugs, to preserve animated gifs, and contain failure to read swf files. 2016-01-12 16:29:11 -05:00
Oliver Spohngellert
98fda5f654 Formatting fix 2016-01-12 15:36:05 -05:00
Oliver Spohngellert
38956a0b49 Merge branch 'custom_artifact_addition' into custom_artifact_addition-1848.2 2016-01-12 15:31:26 -05:00
Richard Cordovano
4c275716b0 Merge pull request #1809 from BasisOlivers/custom_artifact_addition-change-revision
Custom artifact addition change revision
2016-01-12 15:29:01 -05:00
Oliver Spohngellert
d8a7978b95 Added getArtifactType method, deprecated, documented exception 2016-01-12 15:07:11 -05:00
jmillman
1a0001c911 Log eventbus unregistration error 2016-01-12 14:13:39 -05:00
Oliver Spohngellert
34e227f9a0 Resolved backwards compatability issues regarding getArtifactType 2016-01-12 12:54:53 -05:00
Oliver Spohngellert
88b1efceb2 Updated TypeFactory and associated classes to use BlackboardArtifact.Type 2016-01-11 16:44:09 -05:00
Eugene Livis
1066fc6389 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into vm_detection 2016-01-11 16:12:53 -05:00
Eugene Livis
0d38fd257c Added comments 2016-01-11 16:12:30 -05:00
Eugene Livis
939885d11d Removing unused imports 2016-01-11 16:07:52 -05:00
Richard Cordovano
b15a1553a2 Merge pull request #1807 from BasisOlivers/custom_artifact_addition-1848
Updated to use Type class
2016-01-11 15:42:51 -05:00
Oliver Spohngellert
a5d5ad7874 Updated ModuleDataEvent to handle Type well. 2016-01-11 14:59:54 -05:00
Oliver Spohngellert
f3b93f31ea Resolved merge problems 2016-01-11 12:22:35 -05:00
Oliver Spohngellert
93a4d386f2 Added ARTIFACT-TYPE to type class 2016-01-11 11:10:49 -05:00
Richard Cordovano
047e265c9c Merge remote-tracking branch 'upstream/develop' into user_defined_blackboard_types 2016-01-08 16:59:49 -05:00
Richard Cordovano
d067bb41e6 Merge pull request #1806 from millmanorama/IG-bug-fixes
show correct error in DrawableUIBase
2016-01-08 16:56:28 -05:00
Richard Cordovano
fbe521995e Merge pull request #1805 from millmanorama/IG-categorization-undo
IG categorization undo
2016-01-08 16:56:17 -05:00
Eugene Livis
1e395f0acb Cleanup 2016-01-08 16:55:50 -05:00
Richard Cordovano
b6fb5d65e8 Merge pull request #1804 from BasisOlivers/custom_artifact_addition
Updated ModuleDataEvent
2016-01-08 16:55:47 -05:00