Commit Graph
5384 Commits
Author SHA1 Message Date
Nick Davis 9d46571b27 Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-core-ext-res 2016-02-02 18:00:00 -05:00
Nick Davis 75ec1fef95 Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-core-events 2016-02-02 17:56:48 -05:00
Richard Cordovano f7f5be0d64 Merge pull request #1902 from eugene7646/vm_id
Using parent data source ID for all extracted VMs
2016-02-02 17:55:42 -05:00
Richard Cordovano ef59d47b09 Merge pull request #1898 from narfindustries/1501-ja-core-diag
1501 ja core diag - translations
2016-02-02 17:54:42 -05:00
Richard Cordovano 428b2b5fdf Merge pull request #1897 from narfindustries/1501-ja-core-datamodel
1501 ja core datamodel - translations
2016-02-02 17:54:26 -05:00
Richard Cordovano bfe42d2628 Merge pull request #1896 from narfindustries/1501-ja-core-coreutils
1501 ja core coreutils - translations
2016-02-02 17:54:05 -05:00
Richard Cordovano 04914b6dc4 Merge pull request #1895 from narfindustries/1501-ja-core-comp
1501 ja core comp - translations
2016-02-02 17:53:48 -05:00
Richard Cordovano de3edfbe4c Merge pull request #1893 from narfindustries/1501-ja-core-core
1501 ja core core - translations
2016-02-02 17:52:31 -05:00
Richard Cordovano a7bac29f8a Merge pull request #1892 from narfindustries/1501-ja-core-contentviewers
1501 ja core contentviewers - translations
2016-02-02 17:52:16 -05:00
Nick Davis c6ffce23ab Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-core-dirtree 2016-02-02 17:52:15 -05:00
Kay Bassi add56fe71d Completed editing/translation 2016-02-02 14:51:50 -08:00
Richard Cordovano b0ef9e5310 Merge pull request #1885 from narfindustries/1501-ja-core-actions
1501 ja core actions - translations
2016-02-02 17:49:28 -05:00
Kay Bassi 3efcbb3f1f Completed editing/translation 2016-02-02 14:45:19 -08:00
Nick Davis 8afdd0d6c3 Extracted hard coded strings. Commented strings that shouldn't be extracted using NON-NLS. Used @NbBundle.Messages() style annotations for strings. 2016-02-02 17:40:47 -05:00
Kay Bassi e144692318 Completed editing/translation 2016-02-02 14:39:54 -08:00
Eugene Livis a4188895d8 Using parent data source ID for all extracted VMs 2016-02-02 17:27:18 -05:00
Nick Davis c8841d7314 Extracted hard coded strings. Commented strings that shouldn't be extracted using NON-NLS. Used @NbBundle.Messages() style annotations for strings. 2016-02-02 16:42:52 -05:00
Kay Bassi cdde83b3fe Completed editing/translation 2016-02-02 13:32:24 -08:00
Nick Davis c6240f8b9b Merge branch 'develop' of github.com:sleuthkit/autopsy into 1501-ja-core-diag 2016-02-02 15:13:22 -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 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 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
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
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
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
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 57594e2bdb.
2016-02-01 16:03:43 -05:00
Richard Cordovano 8e1b7c612e Revert "Make IngestibleFileFilter.isIngestible public"
This reverts commit e7bcd3987b.
2016-02-01 16:03:07 -05:00
Oliver Spohngellert 9897b0a42d Finished reports update pending approval 2016-02-01 15:53:39 -05:00
Kay Bassi 384cd416d5 Finished translation/editing 2016-02-01 11:28:25 -08:00
Nick Davis ef1d892ce9 Started extracting hard coded strings. 2016-02-01 13:14:43 -05:00
Oliver Spohngellert 2aa817b6b2 Almost done fixing giant switch 2016-02-01 11:06:39 -05:00
Richard Cordovano dc541c5eae Clarify a field name in FileUtil 2016-02-01 11:05:01 -05:00
Richard Cordovano e7bcd3987b Make IngestibleFileFilter.isIngestible public 2016-01-30 19:39:48 -05:00