codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-28 21:39:52 +00:00
Code Issues Releases Wiki Activity
5,074 Commits 24 Branches 52 Tags
d4c67aef7dcdf66ead72c5f7276c65487e5dbdfb
Commit Graph
5074 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Carrier d4c67aef7d Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2014-02-24 12:19:11 -05:00
Brian Carrier 8fd66dac87 Added developers list to docs 2014-02-24 12:19:01 -05:00
Brian Carrier 27881f4730 Sort app types too 2014-02-24 11:20:14 -05:00
Brian Carrier 1284465698 sort extension config file, added extensions for text and kmz 2014-02-24 11:13:10 -05:00
Brian Carrier 533992532f Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2014-02-24 10:05:03 -05:00
Brian Carrier ecf00427fa Added special XML file type check to reduce exceptions that get thrown - Tika seems to try to fully parse the XML file 2014-02-24 10:04:24 -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
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
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
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
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 27fa63191b Merge pull request #484 from raman-bt/develop 
Cleanup of DataSourceProcessor interface and implementations.
 2014-02-13 10:24:24 -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
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
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
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
Richard Cordovano 746bd81b8a Merge pull request #479 from alexjacks92/develop 
Develop
 2014-02-07 12:53:49 -05:00
alexjacks92 8d875bec20 Added branch information to build failure emails for DataModel and Autopsy. 2014-02-07 12:49:02 -05:00
Kay Bassi 131bc6d91f Last two values translated in KeywordSearch module 2014-02-07 09:46:58 -08:00
alexjacks92 c370b0913b Merge branch 'develop' of https://www.github.com/sleuthkit/autopsy into develop 2014-02-07 12:41:00 -05:00
Brian Carrier 3af15f7ef7 Merge pull request #471 from shahit2/temp 
taking Recent Activity out of IE class
 2014-02-07 12:06:32 -05:00
Brian Carrier 34299ed9cf Merge pull request #477 from shahit2/meta 
changed timezone of metadata to reflect global settings
 2014-02-07 12:05:48 -05:00
Brian Carrier f67a76086b Merge pull request #462 from shahit2/imageA 
image md5 hash updated
 2014-02-07 11:51:54 -05:00
alexjacks92 f1c8ca73d6 Merge remote-tracking branch 'upstream/develop' into develop 2014-02-07 11:04:30 -05:00
raman-bt cbd45c2d58 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2014-02-07 11:03:29 -05:00
Nick Davis ea458c1554 Fixed colon/semi-colon issue. Added elipses to translated strings. Removed unused properties entry. 2014-02-06 18:50:57 -05:00
Nick Davis 0790625148 pulled 3 strings into properties. awaiting translation for 2 of them. 2014-02-06 18:49:46 -05:00