50 Commits

Author SHA1 Message Date
Dick Fickling
9e3e71b3eb Merge github.com:sleuthkit/autopsy
Conflicts:
	HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestService.java
	HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbMgmtAction.java
	HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbMgmtPanel.java
	HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbPanel.form
	HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbPanel.java
	Ingest/src/org/sleuthkit/autopsy/ingest/AdvancedConfigurationDialog.java
	Ingest/src/org/sleuthkit/autopsy/ingest/IngestDialog.java
	Ingest/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.form
	Ingest/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java
	Ingest/src/org/sleuthkit/autopsy/ingest/IngestServiceAbstract.java
	Ingest/src/org/sleuthkit/autopsy/ingest/example/ExampleFsContentIngestService.java
	Ingest/src/org/sleuthkit/autopsy/ingest/example/ExampleImageIngestService.java
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationDialog.java
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.form
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel.java
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java
	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestService.java
	Report/src/org/sleuthkit/autopsy/report/reportAction.java
	Report/src/org/sleuthkit/autopsy/report/reportHTML.java
	Report/src/org/sleuthkit/autopsy/report/reportPanel.form
	Report/src/org/sleuthkit/autopsy/report/reportPanel.java
2012-02-29 14:35:29 -05:00
Dick Fickling
ba21811f45 TSK-362 2nd level of ingest configuration 2012-02-29 13:15:13 -05:00
adam-m
9c89af1168 TSK-360 Move ingest panel into add image wizard
TSK-362	2nd level of ingest configuration
first iteration - changed wizard, service configs, reusable panel components
2012-02-29 13:09:49 -05:00
Dick Fickling
d2c4725330 Add second level of configuration to Ingest Services 2012-02-28 16:55:16 -05:00
adam-m
2c33c67aae Ingest configuration API additions 2012-02-28 14:14:47 -05:00
Dick Fickling
270b740140 Merge branch 'master' of github.com:sleuthkit/autopsy 2012-02-27 12:54:30 -05:00
Dick Fickling
4512964496 No longer assume that blackboard artifacts are associated with a File object,
instead they are associated with any generic Content object
2012-02-27 12:49:04 -05:00
adam-m
ad7d2294c9 - add details to warning and error messages
- fix no keyword set detection in keyword search ingest
2012-02-27 10:33:05 -05:00
adam-m
a8e71f6526 Merge remote-tracking branch 'aebadirad42six/master' 2012-02-24 20:57:03 -05:00
Dick Fickling
22f09d14d2 minor tweaks to Recent Activity, lists viewer 2012-02-24 17:25:42 -05:00
Alex Ebadirad
28dd773c00 Modifications to html Report/src/org/sleuthkit/autopsy/report/reportHTML.java
Signed-off-by: Alex Ebadirad <aebadirad@42six.com>
2012-02-24 12:44:49 -07:00
Alex Ebadirad
fc2147ba31 Merge branch 'master' of https://github.com/aebadirad42six/autopsy
Conflicts:
	DirectoryTree/nbproject/genfiles.properties
	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestService.java
2012-02-24 12:22:53 -07:00
Alex Ebadirad
8386f8cc26 Report module addition
Signed-off-by: Alex Ebadirad <aebadirad@42six.com>
2012-02-24 12:19:40 -07:00
adam-m
defd6cd2f5 Ingest API: add a way to query individual service if it has any background jobs running that are managed by the service. Needed for more precise service state tracking by the manager. 2012-02-22 16:03:02 -05:00
Dick Fickling
89589c1934 Merge branch 'master' of github.com:sleuthkit/autopsy
Conflicts:
	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentActivityDataExplorer.java
	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentActivityKeyValueChildFactory.java
2012-02-11 00:30:34 -05:00
adam-m
631b230f49 Merge branch 'master' of https://github.com/aebadirad42six/autopsy
+resolved conflicts, minor adjustment to progress bar - added 1 subtask to track (registry)
2012-02-10 16:40:50 -05:00
Alex Ebadirad
6b5fa72de2 Added controller states to the processes, added image specific processing to all processes, reinstated registry extraction and included a few new scripts to draw information.
Signed-off-by: Alex Ebadirad <aebadirad@42six.com>
2012-02-10 09:08:39 -07:00
Dick Fickling
38e424fd3a Make Pasco results include correct obj_id 2012-02-09 13:18:38 -05:00
Dick Fickling
978bb41ea5 Merge git://github.com/alawrence/autopsy
Conflicts:
	DataModel/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java
2012-02-08 09:49:39 -05:00
Alex Ebadirad
ac8d3b75a7 Removed old code, changed ingestion service to accept image ID, cleaned up pasco results
Signed-off-by: Alex Ebadirad <aebadirad@42six.com>
2012-02-07 17:15:10 -07:00
Dick Fickling
67d6bf3aef Add configure button to Ingest Dialog 2012-02-07 15:58:06 -05:00
adam-m
7086ed3cf5 proper order of closing statement after runQuery() 2012-02-06 17:18:47 -05:00
Alex Ebadirad
fe0cae3da7 closed opened sql connections to aut db from Recent activity
Signed-off-by: Alex Ebadirad <aebadirad@42six.com>
2012-02-06 14:51:16 -07:00
adam-m
7bab52f6d4 close sql statement and result set when done, freeing sqlite internal db lock earlier 2012-02-06 16:05:48 -05:00
adam-m
4ca8224763 improve recent activity progress bar reporting 2012-02-06 16:05:36 -05:00
adam-m
62afecfe23 move interface between services and manager out to IngestManagerProxy 2012-02-03 17:26:06 -05:00
adam-m
2f59912b5c add userConfigure method to service ingest interface 2012-02-03 16:50:50 -05:00
anthony lawrence
9014133445 Merge https://github.com/sleuthkit/autopsy 2012-02-03 11:03:07 -05:00
Brian Carrier
b85844774c minor text change and comments added to queue files 2012-02-03 10:06:35 -05:00
anthony lawrence
88e0317c99 Merge https://github.com/sleuthkit/autopsy 2012-02-02 17:34:05 -05:00
anthony lawrence
84cedf81b2 temporary fix for the thumbnail view. copyright for some files. refactored KeyValueThing to KeyValue. 2012-02-02 17:33:42 -05:00
Alex Ebadirad
80386bb3bd Fixed for real.
Signed-off-by: Alex Ebadirad <aebadirad@42six.com>
2012-02-02 14:39:22 -07:00
Alex Ebadirad
c86e7901d7 Added quotes around pasco lib path
Signed-off-by: Alex Ebadirad <aebadirad@42six.com>
2012-02-02 14:03:33 -07:00
anthony lawrence
fe25b012f5 Merge https://github.com/sleuthkit/autopsy 2012-02-02 15:45:56 -05:00
Alex Ebadirad
7ed0f9dddd Small bug fix to IE, resulting in lingering pascoresult.txt file
Signed-off-by: Alex Ebadirad <aebadirad@42six.com>
2012-02-02 13:22:57 -07:00
Alex Ebadirad
1a987048af Merges for IE fix and removing hardcoded values from blackboard attributes types, using enum instead
Signed-off-by: Alex Ebadirad <aebadirad@42six.com>
2012-02-02 12:58:38 -07:00
adam-m
125819c918 Merge branch 'master' of https://github.com/sleuthkit/autopsy 2012-02-02 14:07:01 -05:00
adam-m
d09404c6de Quote paths for windows shell in case there is a space 2012-02-02 14:06:39 -05:00
Brian Carrier
f9a56b11ad Merge branch 'master' of github.com:sleuthkit/autopsy
Conflicts:
	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
2012-02-02 14:01:14 -05:00
Brian Carrier
aa4e4dacbe Use attribute enum values instead of hard coded numbers 2012-02-02 13:58:24 -05:00
Dick Fickling
9faeead2c2 save IE history as single artifact per history entry 2012-02-02 13:30:41 -05:00
anthony lawrence
387a3c0299 Merge https://github.com/sleuthkit/autopsy
Conflicts:
	CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java
	DataModel/src/org/sleuthkit/autopsy/datamodel/KeyValueThing.java
2012-02-02 12:56:19 -05:00
adam-m
8f89a3969b quick pasco 2 fix to locate jars and setup results dirs without needing manual setup.
TODO: need to push building of release/ jars into ant and remove from repo
2012-02-02 10:49:31 -05:00
adam-m
3bc6445ecf cosmetic wording changes 2012-02-02 10:16:59 -05:00
adam-m
c101420efe Merge remote-tracking branch 'aebadirad42six/master'
- fixed recent activity service, added progress reporting
- disabled RA explorer
- didn't merge sqlite change for DataModel (keeping the stable version)
2012-02-01 17:58:07 -05:00
Alexander Ebadirad
b6e4928e3b Restored IE history functionality
Signed-off-by: Alexander Ebadirad <aebadirad@42six.com>
2012-02-01 14:04:06 -07:00
Alexander Ebadirad
e3e4600577 Changes to update to new API -- TO DO get registry and IE working again
Signed-off-by: Alexander Ebadirad <aebadirad@42six.com>
2012-02-01 10:47:53 -07:00
Alexander Ebadirad
f30e4e4975 Merge branch 'master' of https://github.com/sleuthkit/autopsy
Conflicts:
	Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java
	Ingest/src/org/sleuthkit/autopsy/ingest/IngestTopComponent.form
	Ingest/src/org/sleuthkit/autopsy/ingest/IngestTopComponent.java
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java
2012-01-31 15:31:04 -07:00
Alexander Ebadirad
590e1034c0 Addition to blackboard for ff/chrome, registered ingester service -- TO DO remove topcomponent
Signed-off-by: Alexander Ebadirad <aebadirad@42six.com>
2012-01-31 14:37:10 -07:00
Alexander Ebadirad
d82b00046b Recent Activity commit
Signed-off-by: Alexander Ebadirad <aebadirad@42six.com>
2012-01-30 09:52:27 -07:00