Commit Graph
5963 Commits
Author SHA1 Message Date
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
Samuel H. Kenyon d46d055779 Merge remote-tracking branch 'upstream/develop' into mt-3rdparty 2014-04-21 10:23:09 -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
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
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
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
Kay Bassi cb35cba316 Translation almost completed. 2014-04-16 19:40:14 -04:00
Nick Davis c673990670 Removed unused strings from Bundles. 2014-04-16 17:53:46 -04:00
Nick Davis d3c63cf401 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into ewfverify 2014-04-16 17:51:24 -04:00
Kay Bassi eb77ee079c Translation completed. 2014-04-16 17:47:51 -04:00
Kay Bassi 3944684b83 Translation almost completed. Clarifying two strings 2014-04-16 17:45:37 -04:00
Nick Davis 679c394a21 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into keywordSearch 2014-04-16 17:38:58 -04:00
Kay Bassi d2aa67c3eb Translation completed 2014-04-16 17:36:08 -04:00
Kay Bassi 86ca1bde3f Translation completed 2014-04-16 17:27:35 -04:00
Samuel H. Kenyon 9bcb6c3c31 made FileExtMismatchXML.getDefault() synchronized 2014-04-16 15:39:36 -04:00
Richard Cordovano 0dcdf692d1 Merge pull request #625 from SynapticNulship/7zip-init
7zip init
2014-04-16 15:17:22 -04:00
Samuel H. Kenyon 95cf21312e FileTypeID module: thread-safety tweak and comments 2014-04-16 15:07:28 -04:00
Samuel H. Kenyon 6b648510cd Merge remote-tracking branch 'upstream/develop' into mt-3rdparty 2014-04-16 14:21:12 -04:00
Richard Cordovano ecefcf562a Merge pull request #619 from SynapticNulship/ingester
Ingester and text indexing thread safety update
2014-04-16 14:07:20 -04:00
Richard Cordovano 95efc62354 Merge pull request #624 from rcordovano/synch_ingest_running
Restored synchronization of IngestManager.isIngestRunning()
2014-04-16 14:06:19 -04:00
Richard Cordovano 1780711230 Restored synchronization of IngestManager.isIngestRunning() 2014-04-16 14:03:29 -04:00
Nick Davis 9906dbf238 Removed unused strings from Bundle. 2014-04-15 18:04:52 -04:00
Nick Davis 29fb50525a Merge branch 'report' of ssh://repo.narfindustries.com/autopsy-jp into report 2014-04-15 18:00:58 -04:00
Nick Davis 0210ca7d9c Removed unused strings from Bundle. 2014-04-15 17:59:38 -04:00
Nick Davis 937abb24c4 Pulled strings into Bundle. 2014-04-15 17:52:42 -04:00