13143 Commits

Author	SHA1	Message	Date
Brian Carrier	0dfb029d67	Merge branch 'timeline-event-mgr-2' into timeline_1	2019-07-11 13:45:38 -04:00
Brian Carrier	ab46c585ba	copied files from timeline-event-mgr. Mostly formatting. Couple of bug fixes	2019-07-11 13:02:56 -04:00
Brian Carrier	292c18e6a5	fixed bug so that correct artifact is indexed. Refactored to avoid confusion.Copied in file from timeline-event-mgr	2019-07-11 12:29:16 -04:00
Brian Carrier	bd2b7a4a18	fix incorrect previous commit. Artifacts posted as they are found	2019-07-11 12:03:25 -04:00
Brian Carrier	8ef7253795	Merge branch 'timeline-event-mgr-2' of github.com:sleuthkit/autopsy into timeline-event-mgr-2	2019-07-11 11:52:16 -04:00
Brian Carrier	c9f1ec2799	Revive postArtifact from timeline-event-mgr branch	2019-07-11 11:50:47 -04:00
Kelly Kelly	188a5d4090	changing the indexArtifact to postArtifact	2019-07-10 14:31:29 -04:00
Richard Cordovano	4ec6f4df1e	Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr-2	2019-07-09 11:29:11 -04:00
Richard Cordovano	467dea1f1b	Merge remote-tracking branch 'upstream/release-4.12.0' into develop	2019-07-09 11:24:42 -04:00
esaunders	982d2f2eee	Merge pull request #4975 from wschaeferB/5282-LogicalImagerIfFound ... 5282 logical imager if found	2019-07-03 17:29:18 -04:00
esaunders	08b35ea257	Merge pull request #4987 from wschaeferB/5239-PreventDupeRules ... 5239 prevent duplicate named rules being created	2019-07-03 17:28:06 -04:00
esaunders	dd5db93bda	Merge pull request #4984 from wschaeferB/5281-PreventZeroDaysWithinSetting ... 5281 prevent user from setting 0 days within as a condition	2019-07-03 17:27:38 -04:00
esaunders	16b0e4d918	Merge pull request #5003 from APriestman/doxygenFixes_070219 ... Fix doxygen warnings	2019-07-03 17:26:07 -04:00
Brian Carrier	47cd41f9e4	Merge pull request #4983 from jkho/5276-Logical-Imager-Adding-DS-as-Logical-File-Set ... Initial code changes.	2019-07-02 16:42:12 -04:00
U-BASIS\dsmyda	561426673a	Made volumes with virtual directories no longer a leaf volume	2019-07-02 16:18:53 -04:00
Ann Priestman	1dfcd90f4c	Fix doxygen warnings	2019-07-02 11:21:58 -04:00
Brian Carrier	edf755ac58	more refactoring	2019-07-02 08:48:37 -04:00
Brian Carrier	4eec6450b8	Changes due to Datamodel refactoring	2019-07-01 23:55:40 -04:00
Brian Carrier	ea9d797d97	Merge pull request #4966 from jkho/5265-Logical-Imager-DSP-should-not-be-enabled-for-network-drives ... 5265 logical imager dsp should not be enabled for network drives	2019-07-01 18:10:55 -04:00
Brian Carrier	4b89ef3b83	Merge pull request #4973 from kellykelly3/1272-date-range-issue ... 1242, 1274, ans 1275 - Sorted threads and messages by time and added text subject.	2019-07-01 18:10:09 -04:00
William Schaefer	36ffb538e8	5239 update merged properties file	2019-07-01 15:33:34 -04:00
William Schaefer	78c63c06f7	5239 adjust duplicate rule message per review comment	2019-07-01 15:26:57 -04:00
Joe Ho	e795af5537	Update DriveListUtils.java	2019-07-01 13:38:37 -04:00
Joe Ho	061c07f14e	Update DriveListUtils.java	2019-07-01 13:36:21 -04:00
Joe Ho	8387101c0f	Merge remote-tracking branch 'upstream/release-4.12.0' into 5265-Logical-Imager-DSP-should-not-be-enabled-for-network-drives	2019-07-01 13:35:06 -04:00
Joe Ho	34be8e878d	Fix logic error	2019-07-01 13:31:57 -04:00
William Schaefer	7e2625bb3a	Fix megabyte capitalization	2019-07-01 13:28:47 -04:00
Joe Ho	0a230d0499	Merge remote-tracking branch 'upstream/release-4.12.0' into 5276-Logical-Imager-Adding-DS-as-Logical-File-Set	2019-07-01 11:16:57 -04:00
Joe Ho	883dd00645	Update AddLogicalImageTask.java	2019-07-01 10:44:44 -04:00
Richard Cordovano	b53387dce9	Merge pull request #4970 from APriestman/5267_changeCaps ... Change capitalization	2019-06-28 18:34:52 -04:00
Kelly Kelly	86961a6547	fixed codacy issue	2019-06-28 17:58:18 -04:00
Richard Cordovano	e9afa728c1	Merge pull request #4989 from wschaeferB/5287-UseCorrectLoggerInTranslationPackage ... 5287 use correct Autopsy logger	2019-06-28 17:42:11 -04:00
Richard Cordovano	eb542d24bf	Merge branch 'release-4.12.0' into 5267_changeCaps	2019-06-28 17:34:00 -04:00
Kelly Kelly	ae83782016	updated based on review comments	2019-06-28 17:11:28 -04:00
William Schaefer	e866981524	5281 remove null check codacy indicates was unnessary	2019-06-28 16:51:13 -04:00
William Schaefer	160f145d8b	5239 fix duplicate condition	2019-06-28 16:49:24 -04:00
Kelly Kelly	5112739f02	fixed timeline hang	2019-06-28 15:25:41 -04:00
William Schaefer	4dc2fe66b2	5287 use correct Autopsy logger	2019-06-28 15:07:23 -04:00
Richard Cordovano	6804f14748	Merge pull request #4974 from wschaeferB/FixAdditionalDeDupingBug ... Fix additional deduping bug in other occurrences content viewer	2019-06-28 15:02:43 -04:00
Richard Cordovano	8452264c5f	Merge pull request #4982 from wschaeferB/5266-FixCEIngestPanel ... 5266 fix ce ingest panel	2019-06-28 15:02:02 -04:00
Joe Ho	082cdc3608	language-independent test for network drive	2019-06-28 14:47:06 -04:00
Richard Cordovano	95f6e9e8d9	Merge pull request #4981 from raman-bt/5277-cleanup-ex-msg ... 5277: Shorter log message in summary viewer when no text extractor is…	2019-06-28 14:32:58 -04:00
U-BASIS\dsmyda	d2a77fc469	Made the smallest tag the one that 'wins' selection in the event of overlap	2019-06-28 14:24:26 -04:00
Richard Cordovano	d0a3dbee31	Merge pull request #4932 from kellykelly3/1269-merg-timeline ... 1269 timeline merge	2019-06-28 14:11:46 -04:00
William Schaefer	c57299480e	5239 allow editing of rule name	2019-06-28 13:43:59 -04:00
Richard Cordovano	d49a38b299	Merge pull request #4959 from eugene7646/view_file_in_directory_5186 ... Fixed 'view file in directory' not showing up for carved files (5186)	2019-06-28 13:29:06 -04:00
William Schaefer	e3887088c8	5239 prevent duplicate named rules being created	2019-06-28 12:55:39 -04:00
William Schaefer	9a3255df90	5281 prevent user from setting 0 days within as a condition	2019-06-28 12:07:17 -04:00
Joe Ho	3d11b7e682	Initial code changes.	2019-06-27 21:28:28 -04:00
William Schaefer	d81f8385cf	5266 adjust height of panel	2019-06-27 16:43:34 -04:00