13594 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
William Schaefer	cd5a435ed6	Merge branch '2198-RunIngestModulesWizard' of https://github.com/wschaeferB/autopsy into 2199-ProfilesInAddDataWizard	2017-02-15 16:39:52 -05:00
William Schaefer	7b634fbad9	2198- made Ingest Options panel save and load filters in a more logical manner	2017-02-15 16:38:00 -05:00
Richard Cordovano	996031e340	Merge pull request #2508 from wschaeferB/2198-RunIngestModulesWizard ... 2198 run ingest modules wizard	2017-02-15 16:16:14 -05:00
Richard Cordovano	0d3ccc3110	Merge pull request #2507 from wschaeferB/2197-ProfileOptionsPanel ... 2197 profile options panel	2017-02-15 15:05:29 -05:00
William Schaefer	fe9bb7741f	2199 merged in multi-line description change from 2198, resolved conflict	2017-02-15 15:00:53 -05:00
William Schaefer	8909d4e1a1	2198 multi line descriptions enabled for radio button scroll window	2017-02-15 14:51:42 -05:00
William Schaefer	773cf26198	2199 Formatting, copyright, and netbeans tips resolution	2017-02-15 12:18:35 -05:00
William Schaefer	6c3d280424	2199 fixed bug with highlighting of proper step in AddImageWizard	2017-02-15 11:19:10 -05:00
millmanorama	b68428cb51	cleanup, comments, delete dead code	2017-02-15 16:06:57 +01:00
millmanorama	17897e0bc8	use isLiteral to determine which highlighting to use.	2017-02-15 15:48:11 +01:00
millmanorama	6abe26d6de	finish implementing all the cases for highlighting	2017-02-15 14:19:49 +01:00
millmanorama	edd03a66c1	remove TextMarkupLookup interface	2017-02-15 10:52:34 +01:00
millmanorama	87a0e8ad69	do manual highlighting for all hits in HighlightedText	2017-02-15 10:52:34 +01:00
millmanorama	6e3cf15fee	kws hit artifacts selected via the directory tree use the new regex highlighting	2017-02-15 10:52:33 +01:00
millmanorama	82cd7e6dd9	further cleanup and simplify ad hoc search related searches.	2017-02-15 10:52:33 +01:00
millmanorama	ab6d8b0b9d	more cleanup	2017-02-15 10:52:33 +01:00
millmanorama	da22c8abac	more cleanup in KeywordSearchResultFactory	2017-02-15 10:52:33 +01:00
millmanorama	636eb11f27	cleanup, remove useless methods and unneeded bundle messages, and unused fields	2017-02-15 10:52:32 +01:00
William Schaefer	e2f2435b76	2199 resolve conflicts from 2198 merge	2017-02-14 19:38:01 -05:00
William Schaefer	efef1b8077	2198 changed overridable methods to be used outside of constructor	2017-02-14 19:33:18 -05:00
William Schaefer	9702a52007	Merge branch '2197-ProfileOptionsPanel' of https://github.com/wschaeferB/autopsy into 2198-RunIngestModulesWizard	2017-02-14 19:11:03 -05:00
William Schaefer	b9b02e1bed	2197 fixed encapsulation issue regarding enabled modules list	2017-02-14 19:08:43 -05:00
William Schaefer	cd82f49d45	2199 resolve conflicts from merge and fix formatting on modified files	2017-02-14 17:12:15 -05:00
William Schaefer	cd606317eb	Merge branch '2198-RunIngestModulesWizard' of https://github.com/wschaeferB/autopsy into 2199-ProfilesInAddDataWizard	2017-02-14 17:08:31 -05:00
William Schaefer	2e28f72d85	2198 removed netbeans warning regarding method which could be overridden	2017-02-14 17:07:37 -05:00
William Schaefer	e91b638795	Merge branch '2198-RunIngestModulesWizard' of https://github.com/wschaeferB/autopsy into 2199-ProfilesInAddDataWizard	2017-02-14 16:50:01 -05:00
William Schaefer	2ceffc5788	Merge branch '2197-ProfileOptionsPanel' of https://github.com/wschaeferB/autopsy into 2198-RunIngestModulesWizard	2017-02-14 16:49:09 -05:00
William Schaefer	181cca420e	2197 formating of ingestProfiles	2017-02-14 16:45:53 -05:00
William Schaefer	8cb855e39e	2197 fixed unchecked conversion in getIngestProfiles	2017-02-14 16:44:54 -05:00
William Schaefer	4163db9db8	2199 merge and resolve conflicts from 2198	2017-02-14 16:29:29 -05:00
William Schaefer	c4c7cbb9f8	2198 formatting fixes to all modified files	2017-02-14 16:25:10 -05:00
William Schaefer	8e78f17f93	Merge branch '2197-ProfileOptionsPanel' of https://github.com/wschaeferB/autopsy into 2198-RunIngestModulesWizard	2017-02-14 16:08:05 -05:00
William Schaefer	064df7fedf	2197 removing Options from the options panel name	2017-02-14 16:07:27 -05:00
William Schaefer	8b4b2b2fb5	2198 resolve some additional conflicts from IngestProfiles rename	2017-02-14 15:56:21 -05:00
Richard Cordovano	0d1d3f610c	Merge pull request #2504 from eugene7646/core_name ... 2288: Keep track of Solr cores using a properties file	2017-02-14 15:55:17 -05:00
Eugene Livis	33794e121c	Moved Solr upgrade tools source code into a different folder	2017-02-14 15:48:02 -05:00
William Schaefer	640e08b8af	2198 - merged changes from 2197 and resolved conflicts	2017-02-14 15:44:07 -05:00
William Schaefer	47b2f11a75	Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2197-ProfileOptionsPanel	2017-02-14 15:37:28 -05:00
William Schaefer	043db65453	2197 fixed doc version number accidently reverted	2017-02-14 15:37:19 -05:00
William Schaefer	3eda78669b	2197 IngestProfiles getter now static and synchronized	2017-02-14 15:27:51 -05:00
Eugene Livis	1aa474db30	Merge branch 'search_improvements' of https://github.com/sleuthkit/autopsy into core_name	2017-02-14 14:11:08 -05:00
Eugene Livis	7046300e4c	More code review stuff	2017-02-14 14:10:50 -05:00
Eugene Livis	70fc568cec	Moved convertPathToUNC() into UNCPathUtilities class	2017-02-14 14:10:33 -05:00
Richard Cordovano	0c77364c0a	Merge pull request #2520 from dcharit/docs ... corrected the update	2017-02-14 13:53:02 -05:00
William Schaefer	b42b4c128c	2197 fixed formatting in all files which were modified	2017-02-14 13:47:44 -05:00
Dmitry Charit	aa2be4b681	corrected	2017-02-14 18:25:40 +00:00
Eugene Livis	55f7e34353	Split metadata file reading logic	2017-02-14 13:07:42 -05:00
Richard Cordovano	d6066eb001	Merge pull request #2522 from esaunders/2290-store-doc-ids ... Don't show keyword search type or document ids in search results pane.	2017-02-14 12:29:22 -05:00
William Schaefer	4cefd75345	2197 removed copy past code from IngestProfiles	2017-02-14 12:28:09 -05:00
William Schaefer	515b84f5bc	2197 enable edit and delete profile buttons with listener	2017-02-14 11:31:56 -05:00