6143 Commits

Author SHA1 Message Date
Nick Davis
024ea401bf Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-directorytree 2014-03-25 11:59:50 -04:00
Nick Davis
74c2d384c8 Removed unused Bundle properties entries. 2014-03-25 11:56:04 -04:00
Nick Davis
4340194c9b Resolved conflicts. 2014-03-25 11:51:19 -04:00
Nick Davis
214ec5a091 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into hashDatabase 2014-03-25 11:40:55 -04:00
Richard Cordovano
07cddc2a15 Merge pull request #559 from rcordovano/parallel_file_ingest
Renamed keywword search settings panels
2014-03-25 10:57:45 -04:00
Richard Cordovano
c7e16f59a7 Renamed keywword search settings panels 2014-03-25 10:52:39 -04:00
Nick Davis
2ac1d0f292 Merge branch 'core-report' of ssh://repo.narfindustries.com/autopsy-jp into core-report 2014-03-25 10:34:33 -04:00
Nick Davis
461fb664bd Merge branch 'timeline' of ssh://repo.narfindustries.com/autopsy-jp into timeline 2014-03-25 10:27:27 -04:00
Nick Davis
0a1adeb67b Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2014-03-25 10:25:38 -04:00
Richard Cordovano
bfa51b6a14 Merge pull request #557 from rcordovano/parallel_file_ingest
Renamed ingest job settings classes
2014-03-25 09:52:31 -04:00
Richard Cordovano
7c2282e832 Renamed ingest job settings classes 2014-03-25 09:47:46 -04:00
Richard Cordovano
51cca21f3f Merge pull request #556 from rcordovano/new_ingest_framework
New ingest framework
2014-03-24 21:58:49 -04:00
Richard Cordovano
bb469cada3 Fixed progress bar message for file task worker in ingest manager 2014-03-24 21:26:40 -04:00
Richard Cordovano
edc9c68186 Did additional work on new ingest framework 2014-03-24 21:17:41 -04:00
Richard Cordovano
87bb0211f2 Merged in develop branch as of March 24, 2014 2014-03-24 12:35:48 -04:00
Richard Cordovano
17a9ab103f Did additional new ingest framework effort 2014-03-24 12:23:51 -04:00
Richard Cordovano
7ad2b5b5ae Work on getting modules to use settings 2014-03-24 07:47:38 -04:00
Kay Bassi
f20985e4fe Made correction on inconsistent translation, Translated additional strings 2014-03-24 17:08:17 +09:00
Kay Bassi
866dcfaa34 Made correction on inconsistent translation, Translated additional strings 2014-03-24 17:04:39 +09:00
Kay Bassi
0d3bb02e12 Made correction on inconsistent translation, Translated additional strings 2014-03-24 16:46:03 +09:00
Kay Bassi
7ab0434480 Made correction on inconsistent translation, Translated additional strings 2014-03-24 15:47:11 +09:00
Kay Bassi
86c018ffde Made correction on inconsistent translation, Translated additional strings 2014-03-24 15:41:09 +09:00
Kay Bassi
8e0c79c8b1 Made correction on inconsistent translation, Translated additional strings 2014-03-24 15:37:46 +09:00
Kay Bassi
c3d50737c1 Merge remote-tracking branch 'origin/core-datamodel' into core-datamodel 2014-03-24 15:37:28 +09:00
Kay Bassi
c5dda4fd26 Made correction on inconsistent translation, Translated additional strings 2014-03-24 15:36:04 +09:00
Kay Bassi
35a45234c3 Made correction on inconsistent translation, Translated additional strings 2014-03-24 15:31:26 +09:00
Kay Bassi
6007e2650b Made correction on inconsistent translation, Translated additional strings 2014-03-24 15:16:08 +09:00
Kay Bassi
ff8bf489f2 Made correction on inconsistent translation 2014-03-21 15:37:22 +09:00
Kay Bassi
63fa000aa8 Made correction on inconsistent translation 2014-03-21 14:59:19 +09:00
Kay Bassi
4749bc8725 Merge remote-tracking branch 'origin/core-corecomponents' into core-corecomponents 2014-03-21 14:50:53 +09:00
Kay Bassi
023a719de9 Made correction on inconsistent translation 2014-03-21 14:50:12 +09:00
Richard Cordovano
189b2ec858 Tidied up the ingest framework 2014-03-21 00:04:01 -04:00
Richard Cordovano
009640bb4b Made hash lookup module work with module settings per ingest job 2014-03-20 17:21:44 -04:00
Richard Cordovano
07e3cfabe4 Refactored and fixed new ingest framework 2014-03-20 14:51:59 -04:00
Richard Cordovano
cec1fbf5ad Refactored and fixed new ingest framework 2014-03-20 14:51:38 -04:00
Richard Cordovano
8c433c12a1 Did pull request prep and merge bug fixing 2014-03-20 12:49:34 -04:00
Nick Davis
d100623144 Merge branch 'core-casemodule' of ssh://repo.narfindustries.com/autopsy-jp into core-casemodule 2014-03-19 11:25:55 -04:00
Nick Davis
10aaa415cc Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-casemodule 2014-03-19 11:25:44 -04:00
Nick Davis
ab9ff1160b Merge branch 'core-corecomponents' of ssh://repo.narfindustries.com/autopsy-jp into core-corecomponents 2014-03-19 11:25:01 -04:00
Nick Davis
11656168aa Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-corecomponents 2014-03-19 11:24:46 -04:00
Nick Davis
4ae43a79fa Merge branch 'core-datamodel' of ssh://repo.narfindustries.com/autopsy-jp into core-datamodel 2014-03-19 11:24:12 -04:00
Nick Davis
cbbb5c3a22 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-datamodel 2014-03-19 11:24:01 -04:00
Nick Davis
1a202b8795 Merge branch 'core-directorytree' of ssh://repo.narfindustries.com/autopsy-jp into core-directorytree 2014-03-19 11:23:32 -04:00
Nick Davis
2883d443de Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-directorytree 2014-03-19 11:23:08 -04:00
Nick Davis
40a8b521eb Merge branch 'hashDatabase' of ssh://repo.narfindustries.com/autopsy-jp into hashDatabase 2014-03-19 11:22:31 -04:00
Nick Davis
5d80699111 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into hashDatabase 2014-03-19 11:22:11 -04:00
Nick Davis
17f60d2f3e Merge branch 'develop' of https://github.com/sleuthkit/autopsy into keywordSearch 2014-03-19 11:21:21 -04:00
Nick Davis
8600bca79c Merge branch 'core-report' of ssh://repo.narfindustries.com/autopsy-jp into core-report 2014-03-19 11:20:54 -04:00
Nick Davis
c8b3bcd0a0 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-report 2014-03-19 11:20:32 -04:00
Nick Davis
d5e2c905a6 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into timeline 2014-03-19 11:18:17 -04:00