10 Commits

Author SHA1 Message Date
adam-m
9de459c2d0 Fix null ptr exception in ingest restart dialog
Remove redundant code
2012-02-29 16:05:58 -05:00
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
315812d9d8 Move 'Start' and 'Close' button from Ingest panel to dialog 2012-02-28 17:29:58 -05:00
Dick Fickling
d2c4725330 Add second level of configuration to Ingest Services 2012-02-28 16:55:16 -05:00
Dick Fickling
34f7da23e4 Allow user to restart ingest 2012-02-07 16:46:39 -05:00
adam-m
dbdb412055 fix ingest wizard 2012-02-03 02:56:16 -05:00
Dick Fickling
9aa1603628 Ingest Dialog Panel Changes 2012-02-02 11:05:10 -05:00
Dick Fickling
ba0995140c Add dialog after image add to kick off Ingest 2012-02-01 16:41:37 -05:00