16316 Commits

Author SHA1 Message Date
Raman Arora
c3a6828931 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 6456-redo-calllogviewer
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/contentviewers/CallLogArtifactViewer.java
2020-06-15 14:16:27 -04:00
Raman Arora
4866924902 removed old classes and renamed the new to old. 2020-06-15 13:43:59 -04:00
Raman Arora
77a0563ac0 64565: Reorganize call log artifact viewer
Interim commit.
2020-06-15 12:42:04 -04:00
Ethan Roseman
2f8ea858f7 Merge branch '6472_persona_empty_values' of github.com:ethteck/autopsy into 6472_persona_empty_values 2020-06-15 12:08:56 -04:00
Ethan Roseman
4e961ac7c6 Merge remote-tracking branch 'sleuthkit/develop' into 6472_persona_empty_values 2020-06-15 12:08:10 -04:00
Richard Cordovano
6786317f78
Merge pull request #5970 from ethteck/6455_confidence_justification_edit
6455 Added the ability to modify justification and confidence in the …
2020-06-15 10:26:58 -04:00
Richard Cordovano
48006751cb
Merge pull request #5969 from raman-bt/6451-no-personas-if-cr-disabled
6451: Do not search for personas, if Central Repo is disabled.
2020-06-15 10:26:11 -04:00
Ethan Roseman
91d465a82d
Merge branch 'develop' into 6455_confidence_justification_edit 2020-06-15 10:23:24 -04:00
Ethan Roseman
0241957e44 PR suggestion 2020-06-15 10:22:32 -04:00
Ethan Roseman
12d07f6502
Merge branch 'develop' into 6472_persona_empty_values 2020-06-15 10:20:19 -04:00
Greg DiCristofaro
23c2bbdd6b Merge branch 'develop' into 6345-64bitCarver 2020-06-15 08:24:38 -04:00
Richard Cordovano
5e5095be50
Merge pull request #5974 from rcordovano/develop
Correct truncated key name in JA properties file
2020-06-12 17:08:13 -04:00
Richard Cordovano
fac9777bbb Correct truncated key name in JA properties file 2020-06-12 17:07:33 -04:00
Richard Cordovano
0044988558
Merge pull request #5973 from rcordovano/develop
Suppressed warnings for display of deprecated aritfact types
2020-06-12 17:04:06 -04:00
Richard Cordovano
3e1bee8668 Suppressed warnings for display of deprecated aritfact types 2020-06-12 17:03:10 -04:00
Richard Cordovano
0dc1400e3e
Merge pull request #5939 from gdicristofaro/6326-gpxModule
6326 gpx module
2020-06-12 16:55:10 -04:00
Richard Cordovano
ccb3416da9 Update bundle.properties-MERGED files 2020-06-12 15:45:21 -04:00
Ethan Roseman
40242fc3cc 6472 Prevent persona metadata key or value from being empty 2020-06-12 15:26:30 -04:00
Ethan Roseman
5633783d55 Merge remote-tracking branch 'sleuthkit/develop' into 6455_confidence_justification_edit 2020-06-12 15:15:37 -04:00
Ethan Roseman
883dec3af7 6455 Added the ability to modify justification and confidence in the Persona details panel 2020-06-12 15:11:04 -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
Greg DiCristofaro
e67f065ee9 fix for NPE 2020-06-12 13:55:10 -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
Greg DiCristofaro
820dfc6caa updates to remove additional photorec 2020-06-12 10:30:32 -04:00
Raman Arora
bc10b2657a 6451: Do not search for personas, if Central Repo is disabled. 2020-06-12 08:48:04 -04:00
Kelly Kelly
06d6e49f91 Merged in develop 2020-06-11 18:23:27 -04:00
Greg DiCristofaro
51421996d8 updates to windows build 2020-06-11 17:11:22 -04:00
Greg DiCristofaro
0c57f1a747 Merge branch 'develop' of github.com:sleuthkit/autopsy into 6345-64bitCarver 2020-06-11 17:10:54 -04:00
Kelly Kelly
f57ea9b1f3 Missed the properties file 2020-06-11 16:19:40 -04:00
Ethan Roseman
ba38f92882
Merge branch 'develop' into 6428_persona_additional_fields 2020-06-11 14:59:07 -04:00
Kelly Kelly
0966919f35 Added contact image to ContactArtifactViewer 2020-06-11 14:57:33 -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
Greg DiCristofaro
4660768500 Merge branch 'develop' of github.com:sleuthkit/autopsy into 6345-64bitCarver 2020-06-11 14:22:19 -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 9ef959ddaa2332bd4cea418064a022a638c88429.
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