11435 Commits

Author SHA1 Message Date
Nick Davis
c6240f8b9b Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-core-diag 2016-02-02 15:13:22 -05:00
Richard Cordovano
15d56ad88c Merge ja_localization_2016_1 into develop 2016-02-02 15:10:51 -05:00
Nick Davis
ade4650dbb Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-core-datamodel 2016-02-02 15:09:54 -05:00
Nick Davis
7980cce442 Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-core-coreutils 2016-02-02 15:06:44 -05:00
Nick Davis
8e322b0c63 Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-core-comp 2016-02-02 15:01:23 -05:00
Nick Davis
9a6f74d2eb Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-core-compint 2016-02-02 14:57:01 -05:00
Nick Davis
34e995f540 Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-core-core 2016-02-02 14:51:00 -05:00
Nick Davis
133dc146f4 Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-core-contentviewers 2016-02-02 14:47:21 -05:00
Nick Davis
221fe47b3b Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-corelibs 2016-02-02 14:42:53 -05:00
Nick Davis
c5a2411317 Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-keywordsearch 2016-02-02 14:37:32 -05:00
Nick Davis
81d61d0210 Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-recentactivity 2016-02-02 14:30:56 -05:00
Nick Davis
8748283c42 Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-scalpelcarver 2016-02-02 14:25:28 -05:00
Richard Cordovano
d0cf05915a Merge pull request #1882 from narfindustries/ja_localization_2016_1
JA Imagegallery code changes - full set
2016-02-02 14:18:46 -05:00
Nick Davis
2cfbc5660d Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-tbirdparser 2016-02-02 14:15:09 -05:00
Nick Davis
016ec206b7 Merge branch '1501-ja-core-actions' of github.com:narfindustries/autopsy into 1501-ja-core-actions 2016-02-02 14:09:23 -05:00
Kay Bassi
95377231e7 Completed editing/translation 2016-02-02 10:57:50 -08:00
Kay Bassi
91629abf70 Completed editing/translation 2016-02-02 10:45:06 -08:00
Nick Davis
52d89cbba6 Fixed font issues. Extracted strings using NbBundle.Messages annotations. Commented strings, that are not to be extracted, using NON-NLS. 2016-02-02 13:32:14 -05:00
Kay Bassi
86ffcac6b7 Completed editing/translation 2016-02-02 10:20:34 -08:00
Oliver Spohngellert
ac578f2151 Fixed python examples to get rid of deprecation 2016-02-02 13:19:06 -05:00
Nick Davis
f86e968981 Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-core-casemodule-2 2016-02-02 13:16:01 -05:00
Kay Bassi
86cd393128 Completed editing/translation 2016-02-02 10:12:45 -08:00
Nick Davis
ca2a4e5b2b Extracted hard coded strings. Commented strings that shouldn't be extracted using NON-NLS. Used @NbBundle.Messages() style annotations for strings. Verified it correctly builds. 2016-02-02 12:56:17 -05:00
Kay Bassi
366914603c Completed editing/translation 2016-02-02 09:48:06 -08:00
Kay Bassi
88e324f4c9 Completed editing/translation 2016-02-02 09:35:35 -08:00
Kay Bassi
05c77f7efc Completed editing/translation 2016-02-02 09:20:43 -08:00
Kay Bassi
529747cdd4 Completed translation 2016-02-02 09:12:19 -08:00
Richard Cordovano
162f348733 Merge pull request #1880 from millmanorama/IG-fix-exception
fix exception that is logged when mime-type is unknown
2016-02-02 10:26:42 -05:00
Kay Bassi
5184a0c71e One more string to translate 2016-02-01 16:48:35 -08:00
Kay Bassi
78dfd40d48 Finished translation/editing 2016-02-01 16:31:40 -08:00
Kay Bassi
d0446ea3d5 Finished translation/editing 2016-02-01 16:06:35 -08:00
Kay Bassi
a65dd7f530 Finished translation/editing 2016-02-01 16:03:51 -08:00
Kay Bassi
21745d3c93 Finished translation/editing 2016-02-01 15:59:09 -08:00
Kay Bassi
da786f9e44 Finished translation/editing 2016-02-01 15:52:52 -08:00
Kay Bassi
d0fe76a562 Finished translation/editing 2016-02-01 15:38:32 -08:00
Kay Bassi
b5de6292d3 Finished translation/editing 2016-02-01 15:33:56 -08:00
Nick Davis
f76d2d47d8 Fixed bugs in @NbBundle.Messages annotations (scope and mis-spellings of tags). 2016-02-01 18:09:22 -05:00
Kay Bassi
774fa6e665 Finished translation/editing 2016-02-01 14:08:26 -08:00
jmillman
876ec3d8fd improve exception fix 2016-02-01 16:50:40 -05:00
Kay Bassi
46e50f9753 Finished translation/editing 2016-02-01 13:37:24 -08:00
Oliver Spohngellert
ab064dccd0 Resolved merge conflict 2016-02-01 16:16:00 -05:00
Richard Cordovano
d97120467e Revert "Factor IngestibleFileFilter util out of IngestTasksScheduler"
This reverts commit 57594e2bdb58878a5e3b13f1c22be211e29c8fb2.
2016-02-01 16:03:43 -05:00
Richard Cordovano
8e1b7c612e Revert "Make IngestibleFileFilter.isIngestible public"
This reverts commit e7bcd3987b8aaa16c36915f2c938d852ed2e49c6.
2016-02-01 16:03:07 -05:00
Oliver Spohngellert
9897b0a42d Finished reports update pending approval 2016-02-01 15:53:39 -05:00
Richard Cordovano
08845c903e Revert "Factor IngestibleFileFilter util out of IngestTasksScheduler"
This reverts commit 57594e2bdb58878a5e3b13f1c22be211e29c8fb2.
2016-02-01 15:04:02 -05:00
Richard Cordovano
cf9800db2b Revert "Make IngestibleFileFilter.isIngestible public"
This reverts commit e7bcd3987b8aaa16c36915f2c938d852ed2e49c6.
2016-02-01 15:03:45 -05:00
Kay Bassi
6df97eba03 Finished translation/editing 2016-02-01 11:54:24 -08:00
Kay Bassi
384cd416d5 Finished translation/editing 2016-02-01 11:28:25 -08:00
jmillman
f5a095bcc6 fix exception that is logged when mime-type is unknown 2016-02-01 13:54:15 -05:00
Richard Cordovano
94dac78155 Merge pull request #1879 from sleuthkit/revert-1877-revert-1875-revert-1873-1501-ja-imagegallery
Revert "Revert "Revert "1501 ja image gallery - redo 1"""
2016-02-01 13:32:32 -05:00