6672 Commits

Author SHA1 Message Date
Kay Bassi
340c94c0d8 Made correction on inconsistent translation 2014-03-18 12:12:55 -07:00
Kay Bassi
377ad7ac89 Made correction on inconsistent translation 2014-03-18 12:01:18 -07:00
Kay Bassi
8e384f6783 Made correction on inconsistent translation 2014-03-18 11:40:35 -07:00
Kay Bassi
22e23774b4 Made correction on inconsistent translation 2014-03-18 11:30:05 -07:00
Kay Bassi
8b564cad00 Made correction on inconsistent translation 2014-03-18 10:58:34 -07:00
Nick Davis
b1ae348e3d Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2014-03-18 12:36:22 -04:00
Richard Cordovano
03e2f5fb6c Fixed show stopper bugs in new ingest framework 2014-03-18 00:22:28 -04:00
Kay Bassi
5eec98e093 Made correction on inconsistent translation 2014-03-17 18:29:34 -07:00
Kay Bassi
5993472301 Made correction on inconsistent translation 2014-03-17 18:22:26 -07:00
Kay Bassi
ea00c005f4 Made correction on inconsistent translation 2014-03-17 18:15:44 -07:00
Kay Bassi
672662c6f7 Made correction on inconsistent translation 2014-03-17 18:10:16 -07:00
Nick Davis
cd0693189d Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2014-03-17 20:50:11 -04:00
Richard Cordovano
e99925fb7d Check in current state of new ingest framework for safekeeping 2014-03-17 17:45:59 -04:00
Richard Cordovano
914691311f Merge pull request #549 from mrtizmo/recentActivity
Completed JA translation of recentactivity module
2014-03-15 07:08:15 -04:00
Richard Cordovano
d1f0831efe Merge pull request #548 from mrtizmo/sevenZip
Completed JA translation of SevenZip module
2014-03-15 07:08:06 -04:00
Richard Cordovano
7c23226c8d Merge pull request #547 from mrtizmo/thunderbirdParser
Completed JA translation of thunderbirdparser module
2014-03-15 07:07:57 -04:00
Richard Cordovano
bd8b623f10 Merge pull request #546 from mrtizmo/timeline
Completed JA translation of Timeline module
2014-03-15 07:07:42 -04:00
Richard Cordovano
94e1bffa83 Merge pull request #545 from mrtizmo/core-report
Completed JA translation of Core - report module
2014-03-15 07:07:32 -04:00
Richard Cordovano
240406832f Merge pull request #544 from mrtizmo/scalpelCarver
Completed JA translation of ScalpelCarver module
2014-03-15 07:07:02 -04:00
Richard Cordovano
bb9718d6eb Merge pull request #543 from mrtizmo/fileExtMismatch
Completed translation of FileExtMismatch module
2014-03-15 07:06:53 -04:00
Richard Cordovano
6e122965ee Merge pull request #542 from mrtizmo/ewfVerify
Completed JA translation of ewfVerify module
2014-03-15 07:06:41 -04:00
Richard Cordovano
69fe1f38a1 Merge pull request #541 from mrtizmo/core-casemodule
Completed JA translation of Core - casemodule module
2014-03-15 07:06:26 -04:00
Richard Cordovano
61adbd15ff Merge pull request #540 from mrtizmo/corelibs
Completed JA translation of Corelibs module
2014-03-15 07:06:14 -04:00
Richard Cordovano
330c9776d8 Merge pull request #539 from mrtizmo/exifParser
Completed JA translation of ExifParser module
2014-03-15 07:05:58 -04:00
Richard Cordovano
c85c769e5f Merge pull request #538 from mrtizmo/fileTypeId
JA Translation Complete - FileTypeId module
2014-03-15 07:05:43 -04:00
Brian Carrier
236a8e36e5 removed extra backslash in properties file 2014-03-14 17:35:16 -04:00
Brian Carrier
eb723200f6 Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2014-03-14 16:43:06 -04:00
Brian Carrier
ebef27f109 Updated version in project file to 3.1 beta 2014-03-14 16:42:55 -04:00
Richard Cordovano
30544781e3 Merge pull request #553 from SynapticNulship/searchoptions
null ptr fix
2014-03-14 15:26:50 -04:00
Samuel H. Kenyon
4cde7ed8ca Revert keyword list panel icon to the watch icon. 2014-03-14 15:13:12 -04:00
Samuel H. Kenyon
f70ffb5dc5 Fix NullPointerException. Modified ResultCollapsedChildFactory.createKeys() to loop through the flattened file set as it did in previous versions (which fixes current null bugs), but still use the new approach of calling getSnippet(). 2014-03-14 15:10:38 -04:00
Brian Carrier
f9ef0b5b47 Changed description to be more generic and cover all e-mail types. REmoved unused extension code. 2014-03-14 14:24:11 -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
Brian Carrier
e756eb7001 Made skipping text files the default behavior. Removed notion of skipping known files, which wasn't being used 2014-03-14 13:22:55 -04:00
Richard Cordovano
631838ff02 Check in current state of new ingest framework for safekeeping 2014-03-14 09:46:29 -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
Richard Cordovano
56e6d57391 Check in current state of new ingest framework for safekeeping 2014-03-14 00:11:59 -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
Richard Cordovano
e9ffb8d129 Merge pull request #552 from SynapticNulship/searchoptions
Searchoptions
2014-03-13 22:50:17 -04:00
Brian Carrier
bf70b35b38 removed option to enable for ingest in the add / import / global settings. ALways true now when added. 2014-03-13 18:40:02 -04:00
Samuel H. Kenyon
1f8ceae323 Merge remote-tracking branch 'upstream/develop' into searchoptions
Conflicts:
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
2014-03-13 18:17:11 -04:00
Richard Cordovano
7b46726810 Check in current state of new ingest framework for safekeeping 2014-03-13 18:07:30 -04:00
Richard Cordovano
94951df518 Merge pull request #550 from alexjacks92/develop
Fixed reporting hang up issue
2014-03-13 15:00:17 -04:00
alexjacks92
ead24bfa58 Eliminating a rogue print statement. 2014-03-13 14:59:16 -04:00
alexjacks92
d510842034 Fixing index out of bounds error. 2014-03-13 14:42:49 -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
Nick Davis
b4777c4cc8 Added CTL_OpenRecentAction, so it is ready when Core-core/layer.xml is updated to use it. 2014-03-13 11:52:37 -04:00
Nick Davis
24fbd8192a Fixed spelling error. 2014-03-13 10:42:03 -04:00