15058 Commits

Author	SHA1	Message	Date
Greg DiCristofaro	c35303f71a	Merge branch 'develop' into 6412-standardInterestingFileSetRules	2020-06-03 08:50:25 -04:00
Greg DiCristofaro	53e9fc0b99	updates for conflict resolution	2020-06-03 08:49:57 -04:00
Greg DiCristofaro	f68eee3b0f	bug fix for version number	2020-06-02 20:35:41 -04:00
Greg DiCristofaro	3ba4a7cd38	working through possible overwrite conflicts	2020-06-02 19:58:33 -04:00
Richard Cordovano	7f31efe9de	Merge pull request #5926 from gdicristofaro/6355-geolocationNPE ... 6355 geolocation npe	2020-06-02 15:27:38 -04:00
Richard Cordovano	90b16ace67	Merge pull request #5930 from kellykelly3/1472-Tags-menu-order-correction ... 1472 - Put Tag nodes into alphabetical order	2020-06-02 15:16:50 -04:00
Greg DiCristofaro	03fc62feb5	fixing bugs	2020-06-02 14:28:21 -04:00
Greg DiCristofaro	fc01fcd48d	fix for codacy and commenting issues	2020-06-02 11:58:35 -04:00
Greg DiCristofaro	000ee2d1de	fixed writing to disk	2020-06-02 11:44:12 -04:00
Greg DiCristofaro	7d000f4e08	FilterSetDefsPanel ui changes to accomodate standard set	2020-06-02 10:52:14 -04:00
Richard Cordovano	a66c800c49	Merge pull request #5912 from esaunders/6243-optimize-ft-by-ext ... 6243 Test to see if new content has an extension before processing and ens…	2020-06-02 10:20:20 -04:00
Greg DiCristofaro	cb5af3e93a	added files sets to standard sets	2020-06-02 09:51:01 -04:00
Kelly Kelly	481318bde4	Removed unused imports	2020-06-02 09:48:03 -04:00
Greg DiCristofaro	1ade5a4f34	updates based on comments	2020-06-02 08:39:27 -04:00
Greg DiCristofaro	555feb94f2	switching to input streams for resource files	2020-06-01 16:46:33 -04:00
Kelly Kelly	9301c9239c	Put Tag nodes into alphebetical order	2020-06-01 15:38:22 -04:00
Greg DiCristofaro	b6da6dd96b	Merge branch 'develop' into 6412-standardInterestingFileSetRules	2020-06-01 14:29:26 -04:00
Greg DiCristofaro	22c8cb8bf6	merge from master	2020-06-01 14:12:51 -04:00
apriestman	548ac6675d	Doxygen fixes	2020-06-01 13:54:01 -04:00
Greg DiCristofaro	1ae429aede	updates based on design doc	2020-06-01 12:00:34 -04:00
Greg DiCristofaro	b830a197a4	address codacy remarks	2020-06-01 08:15:03 -04:00
Greg DiCristofaro	8bac7f3179	fix for gpx parser and add bundle	2020-06-01 08:05:15 -04:00
Greg DiCristofaro	a81e714d56	Merge branch 'develop' of github.com:sleuthkit/autopsy into 6355-geolocationNPE	2020-06-01 07:31:36 -04:00
Richard Cordovano	08ae080f4d	Merge pull request #5917 from kellykelly3/1469-persisten-tag-set ... 1469 persistent tag set	2020-05-29 11:11:14 -04:00
Richard Cordovano	f028e60aea	Merge pull request #5908 from kellykelly3/1457-Add-Tag-Set-To-Tag-UI ... 1457 Add TagSet submenus	2020-05-29 11:10:30 -04:00
Richard Cordovano	244376aeeb	Merge pull request #5915 from raman-bt/6315-calllog-artifact-viewer-2 ... 6315 calllog artifact viewer 2	2020-05-29 10:21:23 -04:00
Kelly Kelly	ef5ec8db40	Fixed bug that Greg found	2020-05-28 20:43:04 -04:00
Kelly Kelly	fae5bfa097	Merge branch 'develop' into 1457-Add-Tag-Set-To-Tag-UI	2020-05-28 16:26:34 -04:00
Ethan Roseman	1b0ac03903	6397 Codacy	2020-05-28 14:29:24 -04:00
Ethan Roseman	6fba876890	6397 Codacy	2020-05-28 14:05:41 -04:00
Ethan Roseman	4ee10bc713	6397 Fixing account search in AddAccount dialog	2020-05-28 13:08:47 -04:00
Ethan Roseman	534a36f041	Merge branch 'develop' into 6397-add-personas	2020-05-28 13:01:56 -04:00
Richard Cordovano	10663e9c25	Merge pull request #5906 from ethteck/6380-personas-view ... 6380 Groundwork for persona editing / creating, viewing functional	2020-05-28 12:56:14 -04:00
Richard Cordovano	39ee6dec07	Merge pull request #5918 from raman-bt/6419-persona-metadata-aliases ... 6419: Incorrect results from getAliases() & getMetadata()	2020-05-28 12:11:37 -04:00
Greg DiCristofaro	f6eee25167	kml error report message	2020-05-28 10:39:29 -04:00
Kelly Kelly	9f08d3bed0	Fixed codacy issues	2020-05-28 10:35:51 -04:00
Richard Cordovano	76de7b9d32	Merge pull request #5914 from gdicristofaro/6406-htmlReportStatus ... 6406 html report status	2020-05-28 10:23:13 -04:00
Raman Arora	ae75ac0162	6419: Incorrect results from getAliases() & getMetadata()	2020-05-27 18:56:40 -04:00
Kelly Kelly	dfa3a81fea	Cleaned up formatting	2020-05-27 17:26:30 -04:00
Greg DiCristofaro	5de3b7d1f3	Merge branch '6355-handleBubblingGeoException' into 6355-geolocationNPE	2020-05-27 15:44:41 -04:00
Greg DiCristofaro	d76e89413f	adding logging	2020-05-27 15:38:04 -04:00
Kelly Kelly	839bd38ef5	Fixing start up issues	2020-05-27 15:32:23 -04:00
Greg DiCristofaro	22a8b8bcdf	updates to handle errors	2020-05-27 15:31:47 -04:00
Greg DiCristofaro	339e3e26d8	Merge branch 'develop' into 6355-geolocationNPE	2020-05-27 15:04:10 -04:00
Greg DiCristofaro	5d9b65b2c5	Merge branch 'develop' into 6355-handleBubblingGeoException	2020-05-27 15:03:36 -04:00
Ethan Roseman	e92aa6496e	6397 Fixing small bug	2020-05-27 14:47:45 -04:00
Ethan Roseman	2264098b91	6397 Reworking account adding	2020-05-27 14:46:33 -04:00
Greg DiCristofaro	33b77c37f5	some comments	2020-05-27 11:19:25 -04:00
Greg DiCristofaro	77c0dc7e7f	adding standard interesting file loader	2020-05-27 11:17:56 -04:00
Greg DiCristofaro	1a6b0a7374	adding standard interesting file loader	2020-05-27 11:17:47 -04:00