6805 Commits

Author	SHA1	Message	Date
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	edd03a66c1	remove TextMarkupLookup interface	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
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
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	70fc568cec	Moved convertPathToUNC() into UNCPathUtilities class	2017-02-14 14:10:33 -05:00
William Schaefer	b42b4c128c	2197 fixed formatting in all files which were modified	2017-02-14 13:47:44 -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
William Schaefer	37e3656bb6	2197 integrated fix for null pointer exception from 2199	2017-02-14 11:21:32 -05:00
Eugene Livis	13472133ef	Merge branch 'search_improvements' of https://github.com/sleuthkit/autopsy into core_name	2017-02-14 10:57:49 -05:00
Eugene Livis	10494299e4	Bug fix	2017-02-14 10:56:07 -05:00
William Schaefer	b905f007d3	Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2199-ProfilesInAddDataWizard	2017-02-13 15:34:31 -05:00
esaunders	96d5c6ff41	Merge branch 'search_improvements' of github.com:sleuthkit/autopsy into 2290-store-doc-ids	2017-02-13 12:29:18 -05:00
esaunders	fa8b191cdb	Don't show keyword search type or document ids in search results pane.	2017-02-13 11:57:35 -05:00
Richard Cordovano	cd8ec4f36b	Merge remote-tracking branch 'upstream/develop' into search_improvements	2017-02-11 14:26:35 -05:00
Eugene Livis	843473a380	Merge branch 'search_improvements' of https://github.com/sleuthkit/autopsy into core_name	2017-02-09 15:30:24 -05:00
Richard Cordovano	8377953e62	Turn off CustomArtifactsCreatorIngestModuleFactory	2017-02-09 10:03:21 -05:00
Richard Cordovano	fa9cfbc40b	Update comment in ArtifactStringContent.java	2017-02-09 06:36:46 -05:00
Richard Cordovano	2d2c1db850	Repair merge errors	2017-02-08 20:26:51 -05:00
Richard Cordovano	32a457808a	Merge in develop branch	2017-02-08 20:13:19 -05:00
Richard Cordovano	d18ef89bf1	Merge remote-tracking branch 'upstream/develop-4.3.1' into develop	2017-02-08 19:57:21 -05:00
Richard Cordovano	7a467d0e91	Improvements to attributes with multiple sources code	2017-02-08 19:48:46 -05:00
Richard Cordovano	3ed67b1df8	Add attribute sources to ArtifactStringContent	2017-02-08 19:06:35 -05:00
Richard Cordovano	2ca451b46e	Change custom artifact names for test ingest module	2017-02-08 18:10:53 -05:00
Richard Cordovano	f22a453377	Clean and fix ArtifactStringContent	2017-02-08 17:59:18 -05:00
William Schaefer	ce1771f685	Merge branch '2198-RunIngestModulesWizard' of https://github.com/wschaeferB/autopsy into 2199-ProfilesInAddDataWizard	2017-02-08 10:59:07 -05:00
William Schaefer	bfa75149da	2198 default run ingest modules context renamed for backwards compatability	2017-02-08 10:58:13 -05:00