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 |
|
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 |
|
Richard Cordovano
|
0a370a4491
|
Merge pull request #627 from mrtizmo/ewfverify
Ewfverify module - additional Japanese localization
|
2014-04-17 15:40:46 -04:00 |
|
Richard Cordovano
|
3e8ff14e8d
|
Merge pull request #626 from mrtizmo/actions
Core - Actions module additional Japanese localization
|
2014-04-17 15:40:11 -04:00 |
|
Richard Cordovano
|
77b1c7977f
|
Merge pull request #623 from mrtizmo/report
Report module Japanese i18n update
|
2014-04-17 15:39:45 -04:00 |
|
Richard Cordovano
|
db8b8763a2
|
Merge pull request #622 from mrtizmo/filetypeid
Filetypeid module Japanese i18n update
|
2014-04-17 15:39:14 -04:00 |
|
Richard Cordovano
|
abe70a2cb2
|
Merge pull request #621 from mrtizmo/recentactivity
RecentActivity module Japanese i18n
|
2014-04-17 15:39:00 -04:00 |
|
Richard Cordovano
|
f3425bac44
|
Merge pull request #620 from mrtizmo/sevenzip
Sevenzip module i18n
|
2014-04-17 15:38:22 -04:00 |
|
Richard Cordovano
|
b1669259ee
|
Merge pull request #618 from mrtizmo/hashDatabase
HashDatabase module - translation consistency fix
|
2014-04-17 15:38:03 -04:00 |
|
Richard Cordovano
|
587a8f0baa
|
Merge pull request #617 from mrtizmo/core-filesearch
Core - filesearch module word correction
|
2014-04-17 15:37:44 -04:00 |
|
Richard Cordovano
|
6b14e4a8a6
|
Merge pull request #616 from mrtizmo/ingest
Core - Ingest module - pulled static strings and removed unused strings.
|
2014-04-17 15:35:38 -04:00 |
|
Richard Cordovano
|
719305b067
|
Made getting tasks from ingest schedulers thread-safe
|
2014-04-17 15:33:05 -04:00 |
|
Samuel H. Kenyon
|
d6860d7207
|
Merge remote-tracking branch 'upstream/develop' into mt-3rdparty
|
2014-04-17 14:53:14 -04:00 |
|
Kay Bassi
|
ea39513426
|
Translation completed. Checked for inconsistent translation.
|
2014-04-17 14:48:59 -04:00 |
|
Kay Bassi
|
cfefe56f7c
|
Translation completed. Checked for inconsistent translation.
|
2014-04-17 14:37:33 -04:00 |
|
Richard Cordovano
|
d37aff4b63
|
Merge pull request #629 from rcordovano/ingest_scheduler_fixes
Fixed double add of FileTask in IngestManager.FileScheduler.scheduleFile
|
2014-04-17 14:10:44 -04:00 |
|
Richard Cordovano
|
8d60850499
|
Fixed double add of FileTask in IngestManager.FileScheduler.scheduleFile
|
2014-04-17 14:09:28 -04:00 |
|
Kay Bassi
|
ae92767cf9
|
Translation completed. Checked for inconsistent translation.
|
2014-04-17 13:33:54 -04:00 |
|
alexjacks92
|
3b32ad6fc9
|
More unneeded logging.
|
2014-04-17 10:54:00 -04:00 |
|