6143 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Nick Davis	1df2c71d70	Merge branch 'sevenZip' of ssh://repo.narfindustries.com/autopsy-jp into sevenZip	2014-03-13 10:40:24 -04:00
Nick Davis	6a3f54cf23	Merge branch 'thunderbirdParser' of ssh://repo.narfindustries.com/autopsy-jp into thunderbirdParser	2014-03-13 10:37:37 -04:00
Nick Davis	f64fb13a18	Merge branch 'timeline' of ssh://repo.narfindustries.com/autopsy-jp into timeline	2014-03-13 10:33:59 -04:00
Nick Davis	950cb086f2	Cleaned out unused strings from .properties.	2014-03-13 10:30:43 -04:00
Richard Cordovano	44398764bf	Check in current state of new ingest framework for safekeeping	2014-03-12 23:55:42 -04:00
Kay Bassi	8c42d39913	Translation complete	2014-03-12 19:42:29 -07:00
Kay Bassi	a0a23aafa2	Translation complete	2014-03-12 18:56:03 -07:00
Kay Bassi	5238a4b0f5	Translated last 2 text.	2014-03-12 17:50:35 -07:00
Kay Bassi	0f40b4c24b	Merge remote-tracking branch 'origin/thunderbirdParser' into thunderbirdParser	2014-03-12 17:47:52 -07:00
Kay Bassi	53ef6521be	Initial translation	2014-03-12 17:47:40 -07:00
Kay Bassi	a3076e1109	Translation complete.	2014-03-12 17:44:01 -07:00
Kay Bassi	65e6e851f4	Merge remote-tracking branch 'origin/sevenZip' into sevenZip	2014-03-12 17:39:03 -07:00
Kay Bassi	d8eacc08aa	Translation complete.	2014-03-12 17:38:49 -07:00
Nick Davis	7267bcd0a5	Merge branch 'scalpelCarver' of ssh://repo.narfindustries.com/autopsy-jp into scalpelCarver	2014-03-12 19:56:29 -04:00
Nick Davis	4b2222eb4a	Cleaned out 2 extra backslashes. Fixed unintentional escape of 2 Bundle entry.	2014-03-12 19:54:04 -04:00
Nick Davis	836a34a506	Merge branch 'recentActivity' of ssh://repo.narfindustries.com/autopsy-jp into recentActivity	2014-03-12 19:51:18 -04:00
Nick Davis	1c24599ebc	Merge branch 'fileExtMismatch' of ssh://repo.narfindustries.com/autopsy-jp into fileExtMismatch	2014-03-12 19:48:06 -04:00
Nick Davis	86a013fc54	Merge branch 'ewfVerify' of ssh://repo.narfindustries.com/autopsy-jp into ewfVerify	2014-03-12 19:44:54 -04:00
Nick Davis	da9ec30499	Cleaned out extra backslash. Fixed unintentional escape of Bundle entry.	2014-03-12 19:42:17 -04:00
Nick Davis	9eadc79a1c	Merge branch 'core-report' of ssh://repo.narfindustries.com/autopsy-jp into core-report	2014-03-12 19:33:57 -04:00
Nick Davis	518330b724	Merge branch 'core-casemodule' of ssh://repo.narfindustries.com/autopsy-jp into core-casemodule	2014-03-12 19:29:33 -04:00
Kay Bassi	e32bafdc23	Translation complete.	2014-03-12 16:08:14 -07:00
Kay Bassi	d53df5e452	Merge remote-tracking branch 'origin/scalpelCarver' into scalpelCarver	2014-03-12 16:01:03 -07:00
Kay Bassi	2c0e006257	Translation complete.	2014-03-12 16:00:45 -07:00
Kay Bassi	8aaac9aa1f	Translation complete.	2014-03-12 15:48:04 -07:00
Richard Cordovano	466e504de9	Check in current state of new ingest framework for safekeeping	2014-03-12 17:46:58 -04:00
Kay Bassi	27ba4ec7d2	Translation complete.	2014-03-12 14:14:27 -07:00
Kay Bassi	6553d8998a	Translation complete.	2014-03-12 14:08:38 -07:00
Kay Bassi	60fc92faa6	Resolved/deleted comments	2014-03-12 14:06:48 -07:00