Commit Graph
6115 Commits
Author SHA1 Message Date
Samuel H. Kenyon b30c63ec36 Merge remote-tracking branch 'upstream/develop' into mt-update
Conflicts:
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
2014-04-23 11:55:34 -04:00
Samuel H. Kenyon d1861b77ba HashDbIngestModule: slight optimization for totals access (reduce number of lock acquisitions) 2014-04-23 11:50:40 -04:00
Samuel H. Kenyon f300ca7ef0 synchronize access to the totals map 2014-04-23 11:48:50 -04:00
Samuel H. Kenyon ef7a77f78c Reinserted refCounter increment since it used to be a side effect of a method that was removed. 2014-04-23 11:27:02 -04:00
Richard Cordovano 33439ecb43 Merge pull request #681 from mrtizmo/recentactivity-ja
RecentActivity additional Japanese translations
2014-04-23 10:34:44 -04:00
Richard Cordovano 16f081ea8e Merge pull request #680 from mrtizmo/thunderbird
ThunderbirdParser - added NON-NLS tags
2014-04-23 10:34:38 -04:00
Richard Cordovano 504e8d2839 Merge pull request #678 from mrtizmo/scalpel
ScalpelCarver - Added NON-NLS tags to hardcoded strings not needing Nati...
2014-04-23 10:33:55 -04:00
Richard Cordovano 57032732b5 Merge pull request #677 from mrtizmo/hashdatabase-ja
HashDatabase additional translations
2014-04-23 10:33:48 -04:00
Richard Cordovano 2b7b32830d Merge pull request #676 from mrtizmo/ingest-ja
Ingest module additional Japanese translations
2014-04-23 10:33:39 -04:00
Richard Cordovano 7feafd1ac5 Merge pull request #675 from mrtizmo/recentactivity
RecentActivity - Added NON-NLS tags to hardcoded strings not needing Nat...
2014-04-23 10:32:47 -04:00
Richard Cordovano 463d34c160 Merge pull request #673 from mrtizmo/keywordsearch
KeywordSearch - Added NON-NLS tags to hardcoded strings not needing Nati...
2014-04-23 09:43:41 -04:00
Richard Cordovano c3fc2b2c02 Merge pull request #672 from mrtizmo/filetypeid-ja
Filetypeid module - additional JA translations
2014-04-23 09:39:12 -04:00
Richard Cordovano b5c7d3a9b1 Merge pull request #671 from mrtizmo/fileextmismatch-ja
Fileextmismatch module - additional JA translations
2014-04-23 09:38:48 -04:00
Nick Davis fb43fcc13c Merge branch 'develop' of https://github.com/sleuthkit/autopsy into recentactivity-ja 2014-04-22 17:39:19 -04:00
Kay Bassi c508b6af5f Translation complete. Checked for inconsistencies. 2014-04-22 17:18:22 -04:00
Nick Davis cb8057e66a Pulled new static string. 2014-04-22 17:06:49 -04:00
Nick Davis 47b95ebd52 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into thunderbird 2014-04-22 17:02:28 -04:00
Nick Davis 33d0a9e3b3 ThunderbirdParser - Added NON-NLS tags to hardcoded strings not needing National Language Support. 2014-04-22 17:01:39 -04:00
Nick Davis 7b20874ecb ScalpelCarver - Added NON-NLS tags to hardcoded strings not needing National Language Support. 2014-04-22 16:04:43 -04:00
Nick Davis 9ccd6724df Merge branch 'develop' of https://github.com/sleuthkit/autopsy into hashdatabase-ja 2014-04-22 15:58:35 -04:00
Kay Bassi 45464aa17d Translation complete. 2014-04-22 15:54:45 -04:00
Nick Davis a06d8c051f Merge branch 'develop' of https://github.com/sleuthkit/autopsy into ingest-ja 2014-04-22 15:54:37 -04:00
Nick Davis 85083eeaac RecentActivity - Added NON-NLS tags to hardcoded strings not needing National Language Support. 2014-04-22 15:52:40 -04:00
Samuel H. Kenyon 30bb4ee6ae Merge remote-tracking branch 'upstream/develop' into mt-update
Conflicts:
	Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchIngestModule.java
	HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java
2014-04-22 15:48:51 -04:00
Samuel H. Kenyon 2de09e1914 A few more thread-safety adjustments for summary posting 2014-04-22 15:45:09 -04:00
Richard Cordovano 1bd4d58e14 Merge pull request #670 from alexjacks92/smarterDiffing
Smarter diffing - replace object id's with file paths instead.
2014-04-22 15:43:40 -04:00
Kay Bassi 6074e1d656 Translation complete. 2014-04-22 15:42:17 -04:00
Nick Davis 2539302bcf Pulled 2 additional static strings. 2014-04-22 15:19:52 -04:00
Nick Davis 7f87653414 KeywordSearch - Added NON-NLS tags to hardcoded strings not needing National Language Support. 2014-04-22 15:08:33 -04:00
Samuel H. Kenyon a553e4262c Adjusted FileExtMismatchIngestModule to use the null check / init idiom 2014-04-22 15:02:15 -04:00
Nick Davis dfe3ad2233 Pulled new static strings.
Marked a few static strings with NON-NLS.
2014-04-22 14:29:14 -04:00
Samuel H. Kenyon 840538d52c Adjusted SampleFileIngestModule to use the null check / init idiom 2014-04-22 14:22:31 -04:00
Samuel H. Kenyon 6473ffb5b3 Fixed spelling mistake. 2014-04-22 14:13:20 -04:00
Nick Davis fc3fa7b0dc Merge branch 'develop' of https://github.com/sleuthkit/autopsy into filetypeid-ja 2014-04-22 14:01:02 -04:00
Nick Davis 47a4bea174 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into fileextmismatch-ja 2014-04-22 13:58:48 -04:00
alexjacks92 fcd7c3cdd7 Typo fix. 2014-04-22 13:48:06 -04:00
alexjacks92 1e943b1f2d Added a comment for the potentially confusing dictionary creation code. 2014-04-22 13:47:26 -04:00
alexjacks92 d3c0b6d4dd DB dumps will now show file paths instead of object ids. 2014-04-22 13:44:16 -04:00
alexjacks92 728c09ca9c Merge remote-tracking branch 'upstream/develop' into smarterDiffing 2014-04-22 13:13:40 -04:00
Richard Cordovano 33236d6065 Merge pull request #668 from mrtizmo/hashdatabase
Hashdatabase - Added NON-NLS tags
2014-04-22 12:59:58 -04:00
Richard Cordovano 5be384d1d7 Merge pull request #666 from mrtizmo/ewfverify
ewfVerify - Added NON-NLS tags to hardcoded strings not needing National...
2014-04-22 12:58:40 -04:00
Richard Cordovano 663eddeaf5 Merge pull request #665 from mrtizmo/corelibs
CoreLibs - Added NON-NLS tags to hardcoded strings not needing National ...
2014-04-22 12:58:17 -04:00
Richard Cordovano 6e46673722 Merge pull request #664 from mrtizmo/timeline
Timeline - Added NON-NLS tags to hardcoded strings not needing National ...
2014-04-22 12:58:02 -04:00
Richard Cordovano aed56f9807 Merge pull request #663 from mrtizmo/report
Report - Added NON-NLS tags
2014-04-22 12:57:24 -04:00
Richard Cordovano 97a6944de1 Merge pull request #669 from rcordovano/improved_pipeline_start_error_msg
Improve ingest module start up error message box
2014-04-22 12:53:50 -04:00
Richard Cordovano 1e68d560f5 Improve ingest module start up error message box 2014-04-22 12:52:29 -04:00
Nick Davis 2bb250725f Merge branch 'develop' of https://github.com/sleuthkit/autopsy into hashdatabase 2014-04-22 12:50:00 -04:00
Nick Davis 1d366dd9ab HashDatabase - Added NON-NLS tags to hardcoded strings not needing National Language Support. 2014-04-22 12:49:49 -04:00
Samuel H. Kenyon 87de6bc968 KeywordSearchIngestModule: Added a null check to putIngestStatus() and removed the now-unnecessary init method for that 2014-04-22 12:01:40 -04:00
Samuel H. Kenyon 7bd773f7c9 HashDbIngestModule: Thread-safety refinement of summary posting 2014-04-22 11:55:32 -04:00