6672 Commits

Author SHA1 Message Date
alexjacks92
702c0f08de Merge remote-tracking branch 'upstream/develop' into develop 2014-04-21 15:42:54 -04:00
alexjacks92
cce200f1f3 Merge remote-tracking branch 'upstream/develop' into ExampleConfig 2014-04-21 15:41:15 -04:00
alexjacks92
d1fee32f54 Updating example test configuration file to not include emailing. 2014-04-21 15:39:35 -04:00
Samuel H. Kenyon
6f69bc461c Merge remote-tracking branch 'upstream/develop' into mt-update 2014-04-21 15:34:55 -04:00
Samuel H. Kenyon
3b3ae6ee8e updated FileExtMismatchIngestModule to keep track of totals for all modules per job, not all jobs combined together 2014-04-21 15:34:30 -04:00
Samuel H. Kenyon
4fb5b491bd fixed init for changes in previous commit 2014-04-21 15:31:56 -04:00
Samuel H. Kenyon
1646a5ef41 updated HashDbIngestModule to keep track of totals for all modules per job, not all jobs combined together 2014-04-21 15:25:24 -04:00
Nick Davis
9bc015153b Corecomponents - Added NON-NLS tag to hardcoded strings not needing National Language Support 2014-04-21 15:23:28 -04:00
Nick Davis
50a0459352 Added NON-NLS tag to hardcoded strings not needing National Language Support 2014-04-21 15:07:57 -04:00
Nick Davis
e2ee67265f Added NON-NLS tag to hardcoded strings not needing National Language Support 2014-04-21 15:05:00 -04:00
Nick Davis
45db04b171 Added NON-NLS tag to hardcoded strings not needing National Language Support 2014-04-21 15:01:02 -04:00
Nick Davis
e57fdd489e Merge branch 'develop' of https://github.com/sleuthkit/autopsy into casemodule 2014-04-21 14:43:10 -04:00
Nick Davis
94eb8abd20 Added NON-NLS tag to lines containing hardcoded strings that do not need National Language Support (NLS). 2014-04-21 14:39:10 -04:00
Richard Cordovano
7cd3fc1fbe Merge pull request #639 from mrtizmo/actions
Added NON-NLS tag to lines containing hardcoded strings that do not need...
2014-04-21 14:10:50 -04:00
shahit2
951ec0246d Update DataContentViewerMedia.java 2014-04-21 14:08:46 -04:00
Nick Davis
c6a5c78ad1 Added NON-NLS tag to lines containing hardcoded strings that do not need National Language Support (NLS). 2014-04-21 14:05:59 -04:00
Richard Cordovano
93108579b6 Merge pull request #637 from SynapticNulship/mt-3rdparty
thread-safety tweaks
2014-04-21 13:42:45 -04:00
Richard Cordovano
1c1a1cb684 Merge pull request #635 from alexjacks92/testScriptFix
Testing Fixes - smarter diffing without object ids, and test report generation timing fix
2014-04-21 13:26:13 -04:00
Richard Cordovano
2c6e44d870 Merge pull request #638 from rcordovano/keyword_search_options_fix
Restored default disabling of some of the standard keyword lists
2014-04-21 13:24:45 -04:00
Richard Cordovano
ce3a18a5f7 Restored default disabling of some of the standard keyword lists 2014-04-21 13:23:08 -04:00
Samuel H. Kenyon
ac4aae4ea5 Added some missing access specifiers in KeywordSearch. 2014-04-21 12:07:14 -04:00
Samuel H. Kenyon
cf22aa75b8 Removed some unused imports. 2014-04-21 11:37:15 -04:00
Samuel H. Kenyon
9034e685da Fixed some thread-safety issues in ScalpelCarver. 2014-04-21 11:36:57 -04:00
alexjacks92
c6f5a54643 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2014-04-21 10:48:48 -04:00
Richard Cordovano
df76d75de7 Merge pull request #636 from rcordovano/ingest_scheduler_fixes
Ingest scheduler fixes
2014-04-21 10:24:01 -04:00
Samuel H. Kenyon
d46d055779 Merge remote-tracking branch 'upstream/develop' into mt-3rdparty 2014-04-21 10:23:09 -04:00
Richard Cordovano
8ce3af30e2 Added null cehck to IngestScheduler.FileIngestScheduler 2014-04-21 10:00:01 -04:00
Richard Cordovano
bd6f90c895 Renamed another IngestScheduler.FileIngestScheduler method 2014-04-21 09:31:35 -04:00
Richard Cordovano
0b5524e705 Renamed IngestScheduler.FileIngestScheduler method 2014-04-21 09:27:42 -04:00
Samuel H. Kenyon
376f82d3a7 clean up ingestStatus only if this is the last module for that job 2014-04-18 17:31:49 -04:00
Samuel H. Kenyon
2c7eeba6d5 cleanup() now only removes the ingest status for the current job. call cleanup() from shutDown(). 2014-04-18 16:30:15 -04:00
Richard Cordovano
1c7a60ba42 Resolved merge conflicts due to internationalization of ingest scheduler 2014-04-18 16:19:09 -04:00
Samuel H. Kenyon
f8e922928b init ingest status 2014-04-18 16:04:19 -04:00
Richard Cordovano
cec0f4291a Merge pull request #634 from mrtizmo/scalpel
ScalpelCarver module Japanese internationalization update
2014-04-18 16:03:06 -04:00
Richard Cordovano
a018ccc9da Merge pull request #633 from mrtizmo/corecomponents
Corecomponents module Japanese Internationalization Update
2014-04-18 16:01:39 -04:00
Richard Cordovano
61caa78b82 Merge pull request #632 from mrtizmo/filesearch
Filesearch module Japanese translation update
2014-04-18 16:00:00 -04:00
Richard Cordovano
a453a0b50e Merge pull request #631 from mrtizmo/keywordSearch
KeywordSearch module Japanese translation update
2014-04-18 15:49:36 -04:00
Brian Carrier
e9131b0dd6 removed some unused fields from SOLR schema 2014-04-18 15:49:29 -04:00
Samuel H. Kenyon
f6524b1c4a updated KeywordSearchIngestModule to keep track of ingest status per job, not all jobs combined together 2014-04-18 15:13:17 -04:00
alexjacks92
77eeecf503 Fixing an issue with testing where the test will try to generate reports too early. 2014-04-18 11:33:56 -04:00
Nick Davis
c9819a8204 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into scalpel 2014-04-18 10:03:50 -04:00
Nick Davis
2c9c5e8336 Removed unused strings from Bundle. 2014-04-18 10:02:24 -04:00
Nick Davis
3ef91982a2 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into corecomponents 2014-04-18 09:54:58 -04:00
Nick Davis
089a5ab837 Resolved merge conflict. 2014-04-18 09:52:42 -04:00
Nick Davis
6480f0788f Merge branch 'develop' of https://github.com/sleuthkit/autopsy into filesearch 2014-04-18 09:45:13 -04:00
Nick Davis
7ad4519960 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into keywordSearch 2014-04-18 09:41:18 -04:00
Richard Cordovano
2b62498997 Renamed file ingest scheduler method 2014-04-18 09:09:05 -04:00
alexjacks92
8b398a1c1a Merge branch 'develop' of https://www.github.com/sleuthkit/autopsy into develop 2014-04-17 17:16:43 -04:00
Samuel H. Kenyon
6d3f882af9 updated FileTypeIdIngestModule to keep track of total time and file count for all modules per job, not all jobs combined together 2014-04-17 16:52:36 -04:00
Samuel H. Kenyon
50d15240d3 Merge remote-tracking branch 'upstream/develop' into mt-3rdparty 2014-04-17 16:20:46 -04:00