1521 Commits

Author SHA1 Message Date
Trilok Shahi
0807f3be3e merge conflict resolution 2014-03-14 15:13:16 -04:00
Trilok Shahi
6d524d7f28 adding project file 2014-03-14 14:58:30 -04:00
Brian Carrier
7b1e165cd3 fixed name of general options panel back to display like it was in 3.0. The General term conflicted with something else and must have gotten lost in the merge 2014-03-14 14:23:28 -04:00
Trilok Shahi
3023de305e opencv dll and jar added to release folder 2014-03-14 14:15:47 -04:00
Trilok Shahi
84966e5fae thumbnails for videos added 2014-03-14 13:58:19 -04:00
Trilok Shahi
7a19c6adab thumbnail added 2014-03-14 09:53:18 -04:00
Brian Carrier
45fea6ed87 moved SQLiteDBConnect back into core because it needs teh sqlite jar to be in the same NBM and we can load a jar only once accross multiple jars. Moving it back is easiest solution at this point. Doesn't work otherwise. 2014-03-14 00:37:07 -04:00
Brian Carrier
f5a642e851 Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2014-03-13 22:59:15 -04:00
Brian Carrier
b79585c758 minor wording changes to options panel 2014-03-13 22:58:46 -04:00
alexjacks92
ead24bfa58 Eliminating a rogue print statement. 2014-03-13 14:59:16 -04:00
alexjacks92
005259fded Pulled error messages out into Bundle.properties instead of literals. 2014-03-13 13:07:28 -04:00
alexjacks92
3226e1001b Fixed reporting hang up issue. 2014-03-13 12:51:39 -04:00
Trilok Shahi
0c830f085f dataresult thumbnail code 2014-03-13 10:33:16 -04:00
Richard Cordovano
142ebc662f Fix assorted issues causing compiler warnings 2014-03-12 01:12:29 -04:00
Richard Cordovano
70ddbfb3c7 Merged Autopsy 3.0.9 release into develop (master->develop) 2014-03-11 15:21:33 -04:00
Jason Letourneau
862eeb6797 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2014-03-07 17:09:51 -05:00
Richard Cordovano
8869620cb1 Merge pull request #529 from mrtizmo/core-casemodule
Pulled static strings into Bundle - Core casemodule
2014-03-07 16:25:03 -05:00
Richard Cordovano
9def5ea31a Merge pull request #528 from mrtizmo/core-corecomponents
Pulled static strings into Bundle - Core - corecomponents module
2014-03-07 15:59:22 -05:00
Richard Cordovano
fc0eb794c8 Merge pull request #525 from mrtizmo/core-filesearch
Pulled static strings into Bundle - Core - filesearch module
2014-03-07 15:30:06 -05:00
Richard Cordovano
eb97e47216 Merge pull request #524 from mrtizmo/core-ingest
Pulled static strings into Bundle - Core - ingest module
2014-03-07 15:27:22 -05:00
Richard Cordovano
df90e11e18 Merge pull request #523 from mrtizmo/core-menuactions
Pulled static strings into Bundle - Core - menuactions module
2014-03-07 15:20:01 -05:00
Richard Cordovano
2a2fcbe53c Merge pull request #522 from mrtizmo/core-report
Pulled static strings into Bundle - Core - report module
2014-03-07 15:16:38 -05:00
Nick Davis
607f96ef29 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-corecomponents 2014-03-07 14:42:29 -05:00
Kay Bassi
0ddfaa9c7b Translation complete 2014-03-07 11:39:55 -08:00
Nick Davis
256fd4b850 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-filesearch 2014-03-07 14:34:36 -05:00
Kay Bassi
cf1c79c1a7 Translation complete 2014-03-07 11:28:48 -08:00
Richard Cordovano
6371ea22fe Merge pull request #498 from mrtizmo/develop
Japanese localization for Core - actions and Core - core modules
2014-03-07 11:20:33 -05:00
Jason Letourneau
8a12d93aed fixed two line escape for IngestManager.getFileModStats.moduleInfo.text 2014-03-07 11:04:17 -05:00
Jason Letourneau
15fd54bb0b Merge remote-tracking branch 'origin/pr/529' into develop 2014-03-07 10:35:48 -05:00
Jason Letourneau
1f96e20e50 Merge remote-tracking branch 'origin/pr/528' into develop 2014-03-07 10:35:43 -05:00
Jason Letourneau
41def13c7c resolved conflict 2014-03-07 10:35:21 -05:00
Jason Letourneau
ba0cc8da0e resolved conflict 2014-03-07 10:29:53 -05:00
Jason Letourneau
238d3ecf92 Merge remote-tracking branch 'origin/pr/525' into develop 2014-03-07 10:28:32 -05:00
Jason Letourneau
2667b6aaee Merge remote-tracking branch 'origin/pr/524' into develop 2014-03-07 10:28:28 -05:00
Jason Letourneau
4c967de40f Merge remote-tracking branch 'origin/pr/523' into develop 2014-03-07 10:28:25 -05:00
Jason Letourneau
68b5bb0ed4 Merge remote-tracking branch 'origin/pr/522' into develop 2014-03-07 10:28:20 -05:00
Jason Letourneau
4879882898 Merge remote-tracking branch 'origin/pr/506' into develop 2014-03-07 10:27:18 -05:00
Jason Letourneau
6a6f4a10ca merge conflict resolved 2014-03-07 10:27:06 -05:00
Jason Letourneau
ab9c9f7160 Merge remote-tracking branch 'origin/pr/499' into develop 2014-03-07 10:24:06 -05:00
Jason Letourneau
f8b682437d Merge remote-tracking branch 'origin/pr/498' into develop 2014-03-07 10:23:50 -05:00
Nick Davis
4b38f3d27b Merge branch 'core-menuactions' of ssh://repo.narfindustries.com/autopsy-jp into core-menuactions 2014-03-06 14:21:20 -05:00
Nick Davis
8cdf16c289 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-menuactions 2014-03-06 14:20:59 -05:00
Kay Bassi
b1e7bd85f4 Completed translation 2014-03-06 10:27:47 -08:00
Richard Cordovano
05c9e0876c Merge pull request #473 from shahit2/object
added object ID column
2014-03-06 12:26:18 -05:00
Richard Cordovano
66cb306c92 Merge pull request #470 from shahit2/timeline2
changed timezone and times to UTC for display
2014-03-06 12:25:41 -05:00
Kay Bassi
3c3c0db830 Completed translation 2014-03-05 13:36:13 -08:00
Richard Cordovano
90aeeed19a Merge pull request #504 from bcarrier/move_between_packages
Moved SQLiteDBConnect and LocalDisk to better packages
2014-03-05 16:24:34 -05:00
Kay Bassi
8b882533c7 Initial translation 2014-03-05 13:19:33 -08:00
Kay Bassi
48c7704d8f Initial translation. Committing before moving to different branch. 2014-03-05 12:34:46 -08:00
Kay Bassi
248b4490ec Completed and checked over translation. 2014-03-05 12:07:01 -08:00