1879 Commits

Author SHA1 Message Date
Samuel H. Kenyon
d2315fd653 Merge remote-tracking branch 'upstream/develop' into keyword-refactor 2014-04-25 16:14:22 -04:00
Richard Cordovano
bc337f2ec1 Remove unused import in IngestManager 2014-04-25 09:55:56 -04:00
Richard Cordovano
f1cfe85dd3 Reduce method level synchronization in IngestManager 2014-04-24 14:40:52 -04:00
Samuel H. Kenyon
744e60961e Merge remote-tracking branch 'upstream/keywordsearch-refactor' into keyword-refactor 2014-04-24 11:55:40 -04:00
Richard Cordovano
04e2a16daf Remove obsolete TODO comment from IngestJobLauncher 2014-04-24 10:35:55 -04:00
Richard Cordovano
56f5d0cf9f Merge remote-tracking branch 'upstream/develop' into serialize_ingest_module_settings 2014-04-24 09:26:13 -04:00
Richard Cordovano
71212a4813 Replace Java lib object stream with NetBeans object streams for ingest module settings serialization 2014-04-24 09:25:39 -04:00
Richard Cordovano
34e8f960e5 Merge pull request #686 from SynapticNulship/unfreeze
Improve ingestJobs concurrency
2014-04-24 09:24:08 -04:00
Brian Carrier
460d92e67f Fixed file type panel, which was too wide 2014-04-24 00:19:03 -04:00
Brian Carrier
2e826b8cff Added image extensions to each other 2014-04-24 00:18:15 -04:00
Brian Carrier
514a7f00a6 resolved conflicts 2014-04-23 20:55:44 -04:00
Samuel H. Kenyon
008e4ddbe9 remove unnecessary declare/assignment break 2014-04-23 17:26:45 -04:00
Samuel H. Kenyon
f8ce131626 Merge remote-tracking branch 'upstream/develop' into unfreeze 2014-04-23 17:22:15 -04:00
Samuel H. Kenyon
fbe7eaf364 converted ingestJobs into a ConcurrentHashMap 2014-04-23 17:21:17 -04:00
Samuel H. Kenyon
dcfd2f276d ingestJobs now has its own lock (itself); ingestTasks still uses this for locking 2014-04-23 16:10:49 -04:00
Samuel H. Kenyon
d4afaefe92 added method comment 2014-04-23 15:17:49 -04:00
Samuel H. Kenyon
420eee58c6 Changed query for tags associated with this artifact to match the actual DB schema, and extracted that to a method 2014-04-23 15:13:40 -04:00
Samuel H. Kenyon
9bbfaecece prevent netbeans assigned value is never used warning (although it's innocuous in this case) 2014-04-23 11:59:59 -04:00
Samuel H. Kenyon
b30c63ec36 Merge remote-tracking branch 'upstream/develop' into mt-update
Conflicts:
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
2014-04-23 11:55:34 -04:00
Samuel H. Kenyon
f300ca7ef0 synchronize access to the totals map 2014-04-23 11:48:50 -04:00
Samuel H. Kenyon
ef7a77f78c Reinserted refCounter increment since it used to be a side effect of a method that was removed. 2014-04-23 11:27:02 -04:00
Richard Cordovano
6af898fdaf Merge remote-tracking branch 'upstream/develop' into serialize_ingest_module_settings 2014-04-23 10:52:42 -04:00
Richard Cordovano
2b7b32830d Merge pull request #676 from mrtizmo/ingest-ja
Ingest module additional Japanese translations
2014-04-23 10:33:39 -04:00
Richard Cordovano
c3fc2b2c02 Merge pull request #672 from mrtizmo/filetypeid-ja
Filetypeid module - additional JA translations
2014-04-23 09:39:12 -04:00
Richard Cordovano
6cc432947b Improve error handling in IngestJobLauncher 2014-04-22 16:51:27 -04:00
Samuel H. Kenyon
30bb4ee6ae Merge remote-tracking branch 'upstream/develop' into mt-update
Conflicts:
	Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchIngestModule.java
	HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java
2014-04-22 15:48:51 -04:00
Samuel H. Kenyon
2de09e1914 A few more thread-safety adjustments for summary posting 2014-04-22 15:45:09 -04:00
Kay Bassi
6074e1d656 Translation complete. 2014-04-22 15:42:17 -04:00
Richard Cordovano
79b87db731 Implement serialization of ingest module settings 2014-04-22 15:38:20 -04:00
Samuel H. Kenyon
a553e4262c Adjusted FileExtMismatchIngestModule to use the null check / init idiom 2014-04-22 15:02:15 -04:00
Nick Davis
dfe3ad2233 Pulled new static strings.
Marked a few static strings with NON-NLS.
2014-04-22 14:29:14 -04:00
Samuel H. Kenyon
840538d52c Adjusted SampleFileIngestModule to use the null check / init idiom 2014-04-22 14:22:31 -04:00
Brian Carrier
0da651612b Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2014-04-22 14:18:54 -04:00
Brian Carrier
f7ce38d20f Lots of KeywordSearch refactoring 2014-04-22 14:18:40 -04:00
Samuel H. Kenyon
6473ffb5b3 Fixed spelling mistake. 2014-04-22 14:13:20 -04:00
Nick Davis
fc3fa7b0dc Merge branch 'develop' of https://github.com/sleuthkit/autopsy into filetypeid-ja 2014-04-22 14:01:02 -04:00
Nick Davis
47a4bea174 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into fileextmismatch-ja 2014-04-22 13:58:48 -04:00
Richard Cordovano
18a0c62e51 Add getVersionNumber() method to IngestModuleIngestJobSettings interface 2014-04-22 13:35:34 -04:00
Richard Cordovano
5233688e86 Merge remote-tracking branch 'upstream/develop' into serialize_ingest_module_settings 2014-04-22 13:01:14 -04:00
Richard Cordovano
6e46673722 Merge pull request #664 from mrtizmo/timeline
Timeline - Added NON-NLS tags to hardcoded strings not needing National ...
2014-04-22 12:58:02 -04:00
Richard Cordovano
aed56f9807 Merge pull request #663 from mrtizmo/report
Report - Added NON-NLS tags
2014-04-22 12:57:24 -04:00
Richard Cordovano
1e68d560f5 Improve ingest module start up error message box 2014-04-22 12:52:29 -04:00
Richard Cordovano
d1629da229 Add ingest module settings serialization method stubs to IngestJobLauncher 2014-04-22 12:23:30 -04:00
Kay Bassi
af17f63171 Corrected inconsistency 2014-04-22 11:19:25 -04:00
Kay Bassi
c952f3ba0e Corrected inconsistency 2014-04-22 11:13:11 -04:00
Nick Davis
bfdcff59ed Timeline - Added NON-NLS tags to hardcoded strings not needing National Language Support. 2014-04-22 10:54:22 -04:00
Nick Davis
c6cd395f22 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into report 2014-04-22 10:46:39 -04:00
Nick Davis
a298bcfc74 Report - Added NON-NLS tags to hardcoded strings not needing National Language Support. 2014-04-22 10:46:33 -04:00
Kay Bassi
ef8f351682 Translation complete. 2014-04-22 10:40:01 -04:00
Kay Bassi
87252f606b Committing before checking out different branch. 2014-04-22 10:36:07 -04:00