1586 Commits

Author	SHA1	Message	Date
Richard Cordovano	5638cf5b79	Merge pull request #2405 from zhhl/2050-NPEinRegexSearch ... 2050 handle the KeywordSearchException while call KeywordSearchQuery:performQuery()	2016-11-22 17:44:51 -05:00
Sophie Mori	1aa6b26910	Change table in dropdown keyword lists to use keyword types	2016-11-17 10:03:14 -05:00
Sophie Mori	43fa4a5535	Merge branch 'develop' into AUT-2250_keyword_list_substring	2016-11-16 17:30:31 -05:00
Ann Priestman	5b860abb44	Merge remote-tracking branch 'upstream/develop' into slackSpace ... Conflicts: Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java	2016-11-15 08:58:33 -05:00
Sophie Mori	757f880675	Change display type to make it cleaner	2016-11-11 17:03:28 -05:00
Sophie Mori	12156cf226	Clean up code	2016-11-11 16:40:54 -05:00
Sophie Mori	edaf49774d	Add substring option to keyword lists, modify xml config read and write	2016-11-11 16:30:52 -05:00
U-BASIS\zhaohui	0e123d55ef	2050: add more info for the error msg for KeywordSearchResultFactory	2016-11-11 15:12:12 -05:00
U-BASIS\zhaohui	e0473bce63	2050: add more info for the error msg	2016-11-11 15:08:39 -05:00
U-BASIS\zhaohui	f3f800e138	2050: KeyworkSearchException is handled at the caller level of performQuery	2016-11-11 14:51:21 -05:00
Sophie Mori	e730d55597	Merge branch 'develop' into AUT-1849_persistent_table_column_reordering	2016-11-08 09:23:57 -05:00
Sophie Mori	6ce43540fc	Add column key for file and keyword search result tables	2016-11-03 17:33:36 -04:00
Ann Priestman	00a95a272d	Merge remote-tracking branch 'upstream/develop' into slackSpace	2016-11-02 13:03:28 -04:00
Jonathan Millman	45afb4e4e0	fix typo in javadoc	2016-11-02 11:48:18 +01:00
Richard Cordovano	2f48775e34	Start cleanup and doc of DropdownSingleKeywordSearchPanel and DropdownToolbar	2016-11-01 09:49:13 -04:00
Richard Cordovano	b73dad822e	Update docs and rename DropdownAdHocSearchPanel -> DropdownSingleKeywordSearchPanel	2016-10-27 16:17:18 -04:00
Richard Cordovano	98c668e5ee	Improve docs for DropdownAdHocSearchPanel	2016-10-27 10:28:44 -04:00
Ann Priestman	9734adb003	Adding support for new SlackFile type	2016-10-27 09:37:07 -04:00
Richard Cordovano	f2cbf40cf8	Rename DropdownSingleTermSearchPanel to DropdownAdHocSearchPanel	2016-10-26 23:54:12 -04:00
Richard Cordovano	0cac7cba48	Tidy up and document keyword search DropdownSingleTermSearchPanel	2016-10-26 23:52:07 -04:00
rcordovano	39c7eb3988	Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop	2016-10-24 14:13:31 -04:00
rcordovano	5e0a08f00e	Merge remote-tracking branch 'upstream/release_4.2.0' into develop	2016-10-24 14:11:48 -04:00
Richard Cordovano	5acc39abaa	Make credit card search disabled by default	2016-10-24 13:00:16 -04:00
Richard Cordovano	c558a42ee1	Revert "Rename TermsComponentQuery to RegexQuery" ... This reverts commit fedf10a67c4885e6d919f5c3de55dd7ea2d1b4cb.	2016-10-23 15:40:32 -04:00
Richard Cordovano	fedf10a67c	Rename TermsComponentQuery to RegexQuery	2016-10-22 18:50:32 -04:00
Richard Cordovano	14aae826d3	Clean up and document TermsComponentQuery	2016-10-22 17:46:28 -04:00
Richard Cordovano	56786863bb	Remove incorrect but unused equals and hashCode methods from KeywordList	2016-10-22 15:19:27 -04:00
Richard Cordovano	24a5dce1ae	Clean and document KeywordList	2016-10-22 15:16:40 -04:00
Richard Cordovano	e0f5072555	Fix toString, equals, hashCode methods of Keyword	2016-10-22 14:50:32 -04:00
Richard Cordovano	f7ea2a3439	Correct documentation of Keyword class	2016-10-22 14:30:22 -04:00
Richard Cordovano	181f65aee4	Clean and document Keyword class	2016-10-22 14:03:17 -04:00
Richard Cordovano	c8fd478428	Merge remote-tracking branch 'upstream/release_4.2.0' into develop	2016-10-20 12:47:01 -04:00
Richard Cordovano	56e7dcd658	Improve logging of credit card number parsing errors	2016-10-20 12:37:16 -04:00
Richard Cordovano	d2148a86ca	Merge pull request #2384 from wschaeferB/2047-copyright ... General cleanup of AbstractFileStringContentStream.java (copyright up…	2016-10-19 17:53:01 -04:00
Richard Cordovano	4bc353d222	Merge pull request #2383 from millmanorama/inbox-message-null-check ... do a null check on attribute before including its value in html message	2016-10-19 17:41:25 -04:00
William Schaefer	309a7fb5d0	General cleanup of AbstractFileStringContentStream.java (copyright update, remove unused logger, make variables final)	2016-10-19 17:39:42 -04:00
Richard Cordovano	c45abacdba	Merge remote-tracking branch 'upstream/release_4.2.0' into develop	2016-10-19 13:30:12 -04:00
millmanorama	573425e71c	do a null check on attribute before including its value in html message	2016-10-19 15:55:03 +02:00
millmanorama	4fea244c31	add a set name attribute to account artifacts too	2016-10-19 14:57:24 +02:00
Richard Cordovano	8f41a8389e	Rename KWS TermComponentQuery to TermsComponentQuery and add to doc	2016-10-18 16:54:50 -04:00
Richard Cordovano	87f2e7bfe7	Minor 'linting' of KWS Ingester.java	2016-10-18 16:53:34 -04:00
Richard Cordovano	6bf235ba17	Clean and document KWS AbstractFileChunk class	2016-10-18 15:31:14 -04:00
millmanorama	6b3593744c	don't create the artifact until we know we have a ccn; some other refactoring that fell out	2016-10-17 17:05:34 +02:00
Richard Cordovano	16106cd78c	Update Autopsy-Core NBM versioning for release 4.2.0	2016-10-12 13:23:56 -04:00
Richard Cordovano	34ac5152cb	Restore and deprecate Server.ID_CHUNK_SEP in keywrod search module	2016-10-12 13:10:31 -04:00
Richard Cordovano	667e35f372	Merge remote-tracking branch 'upstream/credit_card_account_search' into develop	2016-10-07 14:56:45 -04:00
Richard Cordovano	3e6106bec9	Merge pull request #2359 from wishdasher/AUT-2232_options_panel_consistent_UI ... Changed options panel UI to be more consistent	2016-10-05 12:40:26 -04:00
Sophie Mori	f70fa430b5	Renamed button in keyword list options add keyword panel	2016-10-04 11:14:39 -04:00
Sophie Mori	25639b76e1	Fixed if else logic	2016-09-28 15:38:18 -04:00
Sophie Mori	e3cfc3f606	Changed adding keywords to use popup dialog box, other UI changes	2016-09-26 17:15:18 -04:00