APriestman
5612be4210
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle_ja.properties
2014-02-20 14:53:28 -05:00
APriestman
21f9327eca
Added new public methods to HashDbManager for creating, loading, and removing HashDb objects. Also consolidated multiple HashDbManager exception types into one.
2014-02-20 14:43:07 -05:00
Nick Davis
ea5c6b0c65
For actions package in Core module, pulled static strings into properties.
...
Created empty Bundle_ja.properties.
2014-02-20 14:02:38 -05:00
Richard Cordovano
fef91bca20
Make HashDbIngestModule implement FileINgestModule instead of extend IngestModuleAbstractFile
2014-02-20 13:14:30 -05:00
Richard Cordovano
8977aa97a4
Made HashLookupModuleFactory able to create a hash lookup module instance
2014-02-20 13:01:34 -05:00
Richard Cordovano
eb2a08f4c6
Make hash lookup ingest module implement FileINgestModule interface
2014-02-20 12:41:42 -05:00
Richard Cordovano
e317129722
Complete method stubs for HashLookupModuleFactory
2014-02-20 12:30:16 -05:00
Richard Cordovano
6ca5dec891
Merge remote-tracking branch 'upstream/develop' into parallel_file_analysis_pipelines
2014-02-20 11:09:51 -05:00
Richard Cordovano
d2e2ee5cc5
Add skeleton of HashLookupModuleFactory to HashDatabase nbm
2014-02-19 18:21:29 -05:00
Richard Cordovano
767d576891
Added new AbstractIngestModuleFactory class to ingest package
2014-02-19 18:19:04 -05:00
Richard Cordovano
3b23d6e4cd
Completed first draft of interfaces for parallel file ingest
2014-02-19 17:54:59 -05:00
alexjacks92
00baf95ee4
Merge branch 'develop' of https://www.github.com/sleuthkit/autopsy into develop
2014-02-19 15:48:35 -05:00
Richard Cordovano
cb8c73178e
Merge pull request #491 from mrtizmo/develop
...
Localized text for option panels in HashDatabase and KeywordSearch modules
2014-02-19 15:25:51 -05:00
Nick Davis
8ba73dd18f
Localized text for option panels in HashDatabase and KeywordSearch modules.
...
- Moved strings to Bundle.properties
- Translated text to Japanese in Bundle_ja.properties
- Successfully tested English and Japanese build/run.
2014-02-19 14:30:56 -05:00
APriestman
99d3dad710
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java
2014-02-19 13:33:08 -05:00
APriestman
01de541e3f
Saving before merge attempt
2014-02-19 13:11:01 -05:00
Richard Cordovano
c13d992f8e
Merge pull request #490 from jletourneau-basistech/develop
...
Japanese Localization
2014-02-19 13:06:56 -05:00
Richard Cordovano
503786eddd
Merge pull request #487 from rcordovano/japanese_localization
...
Remove inadvertantly checked in artifacts of merge conflict resolution
2014-02-18 16:12:38 -05:00
Richard Cordovano
0320b6b3ed
Remove inadvertantly checked in artifacts of merge conflict resolution
2014-02-18 16:10:56 -05:00
Richard Cordovano
22620277a0
Merge pull request #486 from rcordovano/japanese_localization
...
Merge pull request conflict resolution
2014-02-18 15:33:00 -05:00
Richard Cordovano
7df2d2b34c
Resolve merge conflict for pull request of latest internationalization/localization code
2014-02-18 15:31:25 -05:00
Richard Cordovano
73b082ab34
Merge remote-tracking branch 'upstream/develop' into japanese_localization
2014-02-18 15:09:29 -05:00
Richard Cordovano
4cc6decf36
Add first draft of new ingest module interfaces
2014-02-18 08:41:29 -05:00
alexjacks92
8f2c592f8f
Merge branch 'develop' of https://www.github.com/sleuthkit/autopsy into develop
2014-02-13 10:25:07 -05:00
Richard Cordovano
27fa63191b
Merge pull request #484 from raman-bt/develop
...
Cleanup of DataSourceProcessor interface and implementations.
2014-02-13 10:24:24 -05:00
alexjacks92
1eb915e682
Merge remote-tracking branch 'upstream/develop' into develop
2014-02-13 09:58:14 -05:00
Richard Cordovano
e5dfefbb3a
Merge remote-tracking branch 'upstream/develop' into japanese_localization
2014-02-13 09:42:11 -05:00
Richard Cordovano
a910141b57
Merge pull request #481 from alexjacks92/develop
...
One more addition of branch information to the regression test emails.
2014-02-12 16:24:29 -05:00
Richard Cordovano
4d13c78070
Merge pull request #480 from alexjacks92/master
...
Added branch information to build failure emails.
2014-02-12 16:24:10 -05:00
Richard Cordovano
271b7688ca
Merge pull request #478 from SynapticNulship/drp_mods1
...
DataResultPanel changes and make DataResultViewerTable class public.
2014-02-12 16:23:26 -05:00
Samuel H. Kenyon
59a0599057
Merge remote-tracking branch 'upstream/develop' into drp_mods1
2014-02-12 12:12:28 -05:00
raman-bt
53e767dd03
Clean up the DataSourceProcessor Interface definition and the current implementations.
2014-02-12 09:19:06 -05:00
alexjacks92
41e0695bf2
Matching develop branch UI.
2014-02-11 15:28:18 -05:00
alexjacks92
8f8fe23bdb
One more fixed syntax error.
2014-02-11 13:55:53 -05:00
alexjacks92
ece9456d02
Fixing a syntax error.
2014-02-11 13:46:40 -05:00
alexjacks92
6b5b8cf0aa
Added a command to switch report to HTML instead of XML format.
2014-02-11 13:39:22 -05:00
raman-bt
53f420d6ea
Fix a potential race condition in AddImageTask in the case where user cancels the add image operation.
2014-02-11 08:28:48 -05:00
raman-bt
e747898d69
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
2014-02-10 14:32:19 -05:00
alexjacks92
94e5a84e9b
Merge remote-tracking branch 'upstream/develop' into develop
2014-02-10 09:35:39 -05:00
Nick Davis
3cb5405c32
1) Fixed spelling of NSRL.
...
2) Removed comments
2014-02-08 12:00:39 -05:00
Nick Davis
46b3d6c8d4
Merge branch 'develop' of ssh://repo.narfindustries.com/autopsy-jp into develop
2014-02-07 14:36:25 -05:00
Kay Bassi
1a050ba016
Changed the translation for "bad" to 悪質
2014-02-07 11:14:48 -08:00
Nick Davis
a6b9fa91b5
Merge branch 'develop' of ssh://repo.narfindustries.com/autopsy-jp into develop
2014-02-07 14:04:58 -05:00
Kay Bassi
467309bff3
1. Translated the following:
...
Error encountered while setting known bad state for {0}.
Error encountered while setting known state for {0}.
2. Changed "bad" into Japanese word
3. Edited HashDbIngesetModule.ModuleDescription
4. Changed "..." in HashDbCreateDatabaseDialog.saveAsButton.text to Japanese "..."
2014-02-07 10:35:36 -08:00
U-BASIS\tshahi
e16ef6082c
renamed variables and functions for timezone check
2014-02-07 13:26:17 -05:00
Nick Davis
63cd9a271b
Merge branch 'develop' of ssh://repo.narfindustries.com/autopsy-jp into develop
2014-02-07 13:01:21 -05:00
Nick Davis
ef3a7cd4f7
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
2014-02-07 13:00:49 -05:00
alexjacks92
de699ac580
One more addition of branch information to the regression test emails.
2014-02-07 12:58:49 -05:00
alexjacks92
6bc39c885c
Added branch information to build failure emails.
2014-02-07 12:57:37 -05:00
Richard Cordovano
746bd81b8a
Merge pull request #479 from alexjacks92/develop
...
Develop
2014-02-07 12:53:49 -05:00