15752 Commits

Author	SHA1	Message	Date
Richard Cordovano	ccb3416da9	Update bundle.properties-MERGED files	2020-06-12 15:45:21 -04:00
Richard Cordovano	0f6d2544bc	Merge pull request #5958 from ethteck/6409_ingest_timestamp ... 6409 Added date to ingest-related timestamps	2020-06-12 14:33:38 -04:00
Richard Cordovano	952c893d96	Merge pull request #5957 from ethteck/6428_persona_additional_fields ... 6428 persona additional fields	2020-06-12 14:33:24 -04:00
Richard Cordovano	3988ab8abb	Merge pull request #5928 from APriestman/6299_aboutPanel ... 6299 Updated links on About page.	2020-06-12 11:01:38 -04:00
Ethan Roseman	ba38f92882	Merge branch 'develop' into 6428_persona_additional_fields	2020-06-11 14:59:07 -04:00
Richard Cordovano	5550a37293	Merge pull request #5962 from ethteck/6453_persona_required_fields ... 6453 persona required fields	2020-06-11 14:56:57 -04:00
Ethan Roseman	294366c56d	Merge remote-tracking branch 'sleuthkit/develop' into 6428_persona_additional_fields	2020-06-11 14:30:26 -04:00
Richard Cordovano	747fa34ed9	Merge pull request #5954 from ethteck/6390_persona_search_account ... 6390 Persona account search in Persona Manager	2020-06-11 14:23:58 -04:00
Kelly Kelly	e8f46b2f01	Fixed merge conflict	2020-06-11 13:46:48 -04:00
Ethan Roseman	8ea50abed5	Merge remote-tracking branch 'sleuthkit/develop' into 6428_persona_additional_fields	2020-06-11 13:44:48 -04:00
Ethan Roseman	de8af75d61	Merge branch '6453_persona_required_fields' of github.com:ethteck/autopsy into 6453_persona_required_fields	2020-06-11 13:38:03 -04:00
Ethan Roseman	0f161c057c	6453: PR comment	2020-06-11 13:37:56 -04:00
Ethan Roseman	18ee6d8fd9	Merge branch 'develop' into 6453_persona_required_fields	2020-06-11 13:34:34 -04:00
Ethan Roseman	07319d764c	6390 PR suggestion	2020-06-11 13:33:17 -04:00
Kelly Kelly	f38da7927a	Cleaned up codacy issues	2020-06-11 13:30:45 -04:00
Kelly Kelly	01499c0162	Revert "Fixed codacy issues and resolved merge conflicts" ... This reverts commit 9ef959ddaa.	2020-06-11 13:09:49 -04:00
Richard Cordovano	52cf9d9da4	Merge pull request #5966 from ethteck/6454_persona_deletion_confirmation ... 6454 Added confirmation before deleting persona	2020-06-11 12:42:00 -04:00
Richard Cordovano	5591c61afb	Merge pull request #5949 from raman-bt/6410-contactbook-personas ... 6410 contactbook personas	2020-06-11 12:38:09 -04:00
Ethan Roseman	66d5ff29e1	Merge remote-tracking branch 'sleuthkit/develop' into 6428_persona_additional_fields	2020-06-11 12:02:21 -04:00
Kelly Kelly	9ef959ddaa	Fixed codacy issues and resolved merge conflicts	2020-06-11 11:57:45 -04:00
Kelly Kelly	55c35bd1eb	merged in develop	2020-06-11 11:44:14 -04:00
Ethan Roseman	f565cf8344	6428 PR comments	2020-06-11 11:36:52 -04:00
Raman Arora	69fb161575	Change confidence value.	2020-06-11 11:21:55 -04:00
Ethan Roseman	187d333a4b	Merge remote-tracking branch 'sleuthkit/develop' into 6453_persona_required_fields	2020-06-11 11:13:47 -04:00
Kelly Kelly	c5b180bc18	Addressed focusListener codacy issue	2020-06-11 11:08:48 -04:00
Richard Cordovano	014f971f4f	Merge pull request #5959 from ethteck/6444_account_add_err ... 6444 Improve account add error message	2020-06-11 11:04:30 -04:00
Richard Cordovano	b531913d37	Merge pull request #5941 from ethteck/hide-persona-edit-btns ... Hide persona edit btns	2020-06-11 10:56:39 -04:00
Raman Arora	6cc4786eb6	Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 6410-contactbook-personas ... # Conflicts: # Core/src/org/sleuthkit/autopsy/contentviewers/ContactArtifactViewer.java	2020-06-11 10:47:24 -04:00
Richard Cordovano	bba9dee174	Merge pull request #5944 from kellykelly3/1474-cvt-integrate-message-viewer2 ... 1474 CVT Integrate ArtifactContentViewer into MessageContentViewer	2020-06-11 10:18:37 -04:00
Raman Arora	7bf28b10e2	Fixed another (new) query filter out deleted personas.	2020-06-10 20:26:57 -04:00
Raman Arora	07d1967935	Fixed malformed queries.	2020-06-10 19:26:42 -04:00
Raman Arora	b345be55ad	Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 6410-contactbook-personas	2020-06-10 18:18:33 -04:00
Raman Arora	8bbd8b8a27	Remove unused import.	2020-06-10 18:03:33 -04:00
Raman Arora	62073dea91	Remove unused method.	2020-06-10 17:25:38 -04:00
Raman Arora	9d4e352533	Changed Personas layout. ... Codacy comments.	2020-06-10 17:06:57 -04:00
Ethan Roseman	dd36f60f31	6454 Added confirmation before deleting persona	2020-06-10 14:09:45 -04:00
Ethan Roseman	1609ebf6a5	6445 Restore file (2)	2020-06-10 13:43:31 -04:00
Ethan Roseman	c4a403da1b	6445 Restore file	2020-06-10 13:43:04 -04:00
Ethan Roseman	df5891f552	Merge remote-tracking branch 'sleuthkit/develop' into 6445_persona_confidence_update	2020-06-10 13:42:16 -04:00
Ethan Roseman	ccde487976	Merge remote-tracking branch 'sleuthkit/develop' into 6453_persona_required_fields	2020-06-10 13:40:38 -04:00
Ethan Roseman	075468163e	6444 Adding periods to ends of messages	2020-06-10 13:39:16 -04:00
Ethan Roseman	4e73decf24	Merge remote-tracking branch 'sleuthkit/develop' into 6390_persona_search_account	2020-06-10 13:32:08 -04:00
Ethan Roseman	4bf048b1ea	6390 Fix merge	2020-06-10 13:31:42 -04:00
Richard Cordovano	b6f33e72f8	Merge pull request #5940 from ethteck/6398_delete_persona ... 6398 Persona deletion functionality	2020-06-10 10:03:04 -04:00
Raman Arora	6679d97e5d	Removed period.	2020-06-09 20:54:09 -04:00
Raman Arora	4e4f4d197c	Address review comments.	2020-06-09 19:18:11 -04:00
Ethan Roseman	15dbc32736	6428 Fixing merge	2020-06-09 15:15:30 -04:00
Ethan Roseman	a7f4c657b5	6398 Fixing merge	2020-06-09 15:14:21 -04:00
Ethan Roseman	70e3579104	Merge remote-tracking branch 'sleuthkit/develop' into 6453_persona_required_fields	2020-06-09 14:55:27 -04:00
Ethan Roseman	9167850b18	6453 Persona justification required	2020-06-09 14:50:30 -04:00