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 |
|
Samuel H. Kenyon
|
a553e4262c
|
Adjusted FileExtMismatchIngestModule to use the null check / init idiom
|
2014-04-22 15:02:15 -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 |
|
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 |
|
Nick Davis
|
f313d42702
|
ewfVerify - Added NON-NLS tags to hardcoded strings not needing National Language Support.
|
2014-04-22 11:00:45 -04:00 |
|
Richard Cordovano
|
6cabd1ac4a
|
Merge pull request #667 from rcordovano/solr_exception_catch
Catch exception in org.sleuthkit.autopsy.keywordsearch.Server.isRunning(...
|
2014-04-22 11:00:32 -04:00 |
|
Nick Davis
|
757f74dbdd
|
CoreLibs - Added NON-NLS tags to hardcoded strings not needing National Language Support.
|
2014-04-22 10:57:23 -04:00 |
|
Nick Davis
|
bfdcff59ed
|
Timeline - Added NON-NLS tags to hardcoded strings not needing National Language Support.
|
2014-04-22 10:54:22 -04:00 |
|
Nick Davis
|
c6cd395f22
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into report
|
2014-04-22 10:46:39 -04:00 |
|
Nick Davis
|
a298bcfc74
|
Report - Added NON-NLS tags to hardcoded strings not needing National Language Support.
|
2014-04-22 10:46:33 -04:00 |
|
Richard Cordovano
|
08ebc3a5ae
|
Catch exception in org.sleuthkit.autopsy.keywordsearch.Server.isRunning()
|
2014-04-22 10:40:02 -04:00 |
|
Richard Cordovano
|
ddb10c3a01
|
Merge pull request #662 from rcordovano/msg_notify_to_msg_box
Change presentation of module startup errors to message box
|
2014-04-22 10:25:10 -04:00 |
|
Richard Cordovano
|
7c7f01ebb7
|
Change presentation of module startup errors to message box
|
2014-04-22 10:24:00 -04:00 |
|
Richard Cordovano
|
e04416a486
|
Merge pull request #661 from mrtizmo/casemodule
Casemodule - Japanese translation of additional strings
|
2014-04-22 10:15:00 -04:00 |
|
Richard Cordovano
|
1bdde9c30e
|
Merge pull request #659 from mrtizmo/sevenzip
SevenZip - Added NON-NLS tags to hardcoded strings not needing National ...
|
2014-04-22 10:13:41 -04:00 |
|
Nick Davis
|
592edcb21f
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into casemodule
|
2014-04-22 10:13:30 -04:00 |
|
Nick Davis
|
a3f1fad82c
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into casemodule
|
2014-04-22 10:12:56 -04:00 |
|
Richard Cordovano
|
37d3e5d0cf
|
Merge pull request #658 from mrtizmo/filetypeid
FileTypeId - Added NON-NLS tags to hardcoded strings not needing Nationa...
|
2014-04-22 10:12:52 -04:00 |
|
Nick Davis
|
343a49efe6
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into casemodule
|
2014-04-22 10:12:35 -04:00 |
|
Nick Davis
|
5c4d0f6ae6
|
Pulled two strings and translated.
|
2014-04-22 10:12:28 -04:00 |
|
Richard Cordovano
|
f771894435
|
Merge pull request #657 from mrtizmo/fileextmismatch
FileExtMismatch - Added NON-NLS tags to hardcoded strings not needing Na...
|
2014-04-22 10:12:22 -04:00 |
|
Richard Cordovano
|
3534f4a4bd
|
Merge pull request #656 from mrtizmo/exif
Exif - Added NON-NLS tags to hardcoded strings not needing National Lang...
|
2014-04-22 10:11:52 -04:00 |
|
Richard Cordovano
|
477c7589fc
|
Merge pull request #655 from mrtizmo/ingest
Ingest - Added NON-NLS tag to hardcoded strings not needing...
|
2014-04-22 10:11:36 -04:00 |
|
Richard Cordovano
|
663c26f01c
|
Merge pull request #654 from mrtizmo/filesearch
Filesearch - Added NON-NLS tag to hardcoded strings not needing National...
|
2014-04-22 10:08:55 -04:00 |
|
Richard Cordovano
|
204d6161b5
|
Merge pull request #653 from mrtizmo/directorytree
Directorytree - Added NON-NLS tag to hardcoded strings not needing Natio...
|
2014-04-22 10:03:53 -04:00 |
|
Richard Cordovano
|
7da36a762c
|
Merge pull request #651 from mrtizmo/datamodel
Datamodel - Added NON-NLS tag to hardcoded strings not needing National ...
|
2014-04-22 10:02:39 -04:00 |
|
Richard Cordovano
|
69cbb358f9
|
Merge pull request #649 from alexjacks92/gitignoreUpdate
Gitignore update - the repo has no interest in the pycache or compiled python files.
|
2014-04-22 09:55:18 -04:00 |
|
Richard Cordovano
|
4d33f4f6c8
|
Merge pull request #660 from mrtizmo/corecomponents
Corecomponents - Added NON-NLS comment tags
|
2014-04-22 09:54:47 -04:00 |
|
Richard Cordovano
|
51eb33099e
|
Merge pull request #648 from alexjacks92/ExampleConfig
Removed email settings from example test configuration file.
|
2014-04-22 09:54:36 -04:00 |
|
Nick Davis
|
4989d2896b
|
Resolved merge conflict.
|
2014-04-22 09:50:19 -04:00 |
|
alexjacks92
|
0ec1f7dc0c
|
Merge remote-tracking branch 'upstream/develop' into smarterDiffing
|
2014-04-22 09:44:46 -04:00 |
|
Richard Cordovano
|
876864394a
|
Merge pull request #650 from mrtizmo/coreutils
Coreutils - Added NON-NLS tag to hardcoded strings not needing National...
|
2014-04-22 09:36:16 -04:00 |
|
Richard Cordovano
|
63ab8545aa
|
Merge pull request #644 from mrtizmo/corecomponentinterfaces
Corecomponentinterfaces - Added NON-NLS tag to hardcoded strings not needing...
|
2014-04-22 09:31:13 -04:00 |
|