Kay Bassi
|
3920482ee9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-21 18:24:45 -08:00 |
|
Kay Bassi
|
de72110a71
|
Resolved the last 2 todo's. Translation completed.
|
2014-02-21 18:24:13 -08:00 |
|
Nick Davis
|
79b4e2e648
|
Pulled static strings into Bundle.properties.
First half of classes completed.
|
2014-02-21 17:47:05 -05:00 |
|
Nick Davis
|
9e21f77fa1
|
Pulled static strings into Bundle.properties.
Added empty ja properties file.
|
2014-02-21 16:46:16 -05:00 |
|
alexjacks92
|
e8cd480c9d
|
Merge branch 'develop' of https://www.github.com/sleuthkit/autopsy into develop
|
2014-02-21 16:07:32 -05:00 |
|
Nick Davis
|
6d1ccd6b34
|
Pulled static strings into Bundle.properties.
Added empty ja properties file.
|
2014-02-21 16:03:39 -05:00 |
|
Nick Davis
|
9769539585
|
Added empty ja properties file.
|
2014-02-21 14:20:52 -05:00 |
|
Nick Davis
|
6b214095de
|
Pulled static strings into Bundle.
|
2014-02-21 14:19:14 -05:00 |
|
Nick Davis
|
77ba2e8c5f
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
|
2014-02-21 14:01:42 -05:00 |
|
Richard Cordovano
|
85d951fd6e
|
Merge pull request #497 from raman-bt/develop
Fixed the access specifier on the exception constructor so it it actually be constructed (outside this pkg)
|
2014-02-21 13:38:51 -05:00 |
|
raman-bt
|
584c1bc59a
|
Fixed the access specifier on the exception constructor so it it actually be constructed (outside this pkg)
|
2014-02-21 13:35:59 -05:00 |
|
alexjacks92
|
8b20118844
|
Merge branch 'develop' of https://www.github.com/sleuthkit/autopsy into develop
|
2014-02-21 13:34:04 -05:00 |
|
Richard Cordovano
|
1ca84d03b1
|
Merge pull request #496 from raman-bt/develop
Defined IngestModuleException that an ingest module may throw if init() fails.
|
2014-02-21 13:30:23 -05:00 |
|
raman-bt
|
c1d90f878f
|
Defined IngestModuleException that an ingest module may throw if init() fails.
|
2014-02-21 13:10:47 -05:00 |
|
alexjacks92
|
a2a6c701ae
|
Merge branch 'develop' of https://www.github.com/sleuthkit/autopsy into develop
|
2014-02-21 10:18:21 -05:00 |
|
Richard Cordovano
|
1d26bded0d
|
Merge pull request #495 from APriestman/develop
New public functions in HashDbManager for creating and modifying hash databases
|
2014-02-21 07:48:58 -05:00 |
|
Kay Bassi
|
e50f83255d
|
Initial translation of action/bundle
Still have 2 questions. See todo's.
|
2014-02-20 21:26:16 -08:00 |
|
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 |
|
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 |
|
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
|
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 |
|