codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-19 01:01:34 +00:00
Code Issues Releases Wiki Activity
15,973 Commits 24 Branches 52 Tags
0eb6278f304796e323cd625f4722fe962de01c39
Commit Graph
7558 Commits
Author SHA1 Message Date
William Schaefer 0631365319 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3203-TagsContextMenuChanges 2017-11-30 12:58:59 -05:00
Richard Cordovano 2ef153c5d3 Merge pull request #3228 from wschaeferB/3202-TagsMessagingOnStatusChange 
3202 tags messaging on status change
 2017-11-30 11:03:38 -05:00
Richard Cordovano b78f179192 Merge pull request #3236 from wschaeferB/3224-DatabaseFileExtView 
3224 database file ext view
 2017-11-29 16:30:18 -05:00
William Schaefer 3d306b31ba 3158 fix NPE when some invalid image files are tried as agency logo 2017-11-28 16:30:32 -05:00
William Schaefer a6d312663c 3158 Agency Logo preview now present in options panel 2017-11-28 15:44:31 -05:00
William Schaefer 06b8b51e51 3203 fix comment to reflect that tag status applies outside of CR 2017-11-27 10:20:32 -05:00
William Schaefer d7c59a0356 3224 fix IDs for FileTypesByExtension filter enum 2017-11-22 18:19:34 -05:00
William Schaefer 605994d641 3224 add Databases node to File Types by Extension tree 2017-11-22 18:17:09 -05:00
William Schaefer 0e0ee5cd6c 3203 change new bundle properties to @messages syntax 2017-11-22 17:55:05 -05:00
William Schaefer 8dfd028c31 3203 add (Notable) to end of tags in generated reports 2017-11-22 17:45:01 -05:00
William Schaefer ba2f3640f2 Merge branch '3202-TagsMessagingOnStatusChange' of https://github.com/wschaeferB/autopsy into 3203-TagsContextMenuChanges 2017-11-22 17:07:33 -05:00
William Schaefer a5dca8681f 3202 rename event for tag definition changes and comment code better in caseeventlistener 2017-11-22 16:57:18 -05:00
U-BASIS\dgrove 4e51ecc675 Merge remote-tracking branch 'upstream/develop' into 3221_EncryptionDetectionModule 2017-11-22 13:16:48 -05:00
U-BASIS\dgrove 0f315a5bf2 Cleanup. 2017-11-22 13:16:35 -05:00
William Schaefer 993d8f7f68 Merge branch '3202-TagsMessagingOnStatusChange' of https://github.com/wschaeferB/autopsy into 3203-TagsContextMenuChanges 2017-11-22 12:32:34 -05:00
William Schaefer 84181a922c Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3202-TagsMessagingOnStatusChange 2017-11-22 12:22:36 -05:00
William Schaefer 4ec52d8a84 3203 fix error message for invalid description 2017-11-22 12:19:00 -05:00
William Schaefer 9d31a784ba 3203 add check for comma or semicolon in tag description 2017-11-22 12:13:23 -05:00
William Schaefer 0e21b69993 3203-add (Notable) to tag context menus 2017-11-22 12:02:46 -05:00
Richard Cordovano b3187bebf2 Merge pull request #3233 from APriestman/3140b_importKdb 
Allow import of .kdb files into central repo
 2017-11-22 11:26:30 -05:00
U-BASIS\dgrove 4c3b536e88 Merge remote-tracking branch 'upstream/develop' into 3221_EncryptionDetectionModule 2017-11-22 10:56:11 -05:00
Richard Cordovano 6547268bcb Merge pull request #3234 from APriestman/3210_enableNewDatabases 
Enable any central repo has sets the user personally creates by default.
 2017-11-22 10:15:44 -05:00
Ann Priestman 7fda7c6335 Merge branch '3144_encaseHashes' into 3210_enableNewDatabases 
Conflicts:
	Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java
 2017-11-22 08:54:27 -05:00
Ann Priestman 6f2fae67af Cleanup 2017-11-22 08:21:48 -05:00
Ann Priestman 7a4fd008c3 Merge branch '3144_encaseHashes' into 3140b_importKdb 
Conflicts:
	Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ImportCentralRepoDbProgressDialog.java
 2017-11-22 08:10:12 -05:00
U-BASIS\dgrove 002fc60b35 Merge remote-tracking branch 'upstream/develop' into 3221_EncryptionDetectionModule 2017-11-22 01:13:56 -05:00
Richard Cordovano cf47bc625a Merge pull request #3225 from APriestman/3144_encaseHashes 
Allow user to import Encase hashsets into central repo
 2017-11-21 18:15:24 -05:00
Ann Priestman 0057a18c49 Move clearing of list of new hash sets 
Formatting
 2017-11-21 15:41:09 -05:00
Ann Priestman c6f9953379 Merge branch '3144_encaseHashes' into 3140b_importKdb 2017-11-21 14:49:12 -05:00
Ann Priestman 1c646aa184 Fixed version check to only apply if hash set is read only 2017-11-21 14:47:08 -05:00
Ann Priestman 05615a4b15 Add kdb parser 2017-11-21 14:43:50 -05:00
Ann Priestman cc5c98fcb0 Cleanup 2017-11-21 13:15:04 -05:00
Ann Priestman 49a631f351 Refactoring hash set import 2017-11-21 11:17:52 -05:00
William Schaefer f5f7b8c6b1 Merge branch '3201-ManageTagsOptionsPanel' of https://github.com/wschaeferB/autopsy into 3202-TagsMessagingOnStatusChange 2017-11-20 18:32:11 -05:00
William Schaefer 8623c96b45 3201 remove calls to buttons that no longer exist for managing tags 2017-11-20 18:28:45 -05:00
William Schaefer 412b352a17 3201 resolve merge conflicts from Develop 2017-11-20 18:22:01 -05:00
Richard Cordovano ec2e1a8df0 Merge pull request #3220 from wschaeferB/3199-ConsolidateDefaultTags 
3199 consolidate default tags
 2017-11-20 17:39:01 -05:00
Richard Cordovano cf07e646e4 Revert "Revert "Merge branch '3199-ConsolidateDefaultTags' of https://github.com/wschaeferB/autopsy into develop"" 
This reverts commit 55fe85935d.
 2017-11-20 17:37:03 -05:00
William Schaefer e086f68933 3199 remove remaining reference to datamodel.tags package 2017-11-20 16:57:54 -05:00
Richard Cordovano 55fe85935d Revert "Merge branch '3199-ConsolidateDefaultTags' of https://github.com/wschaeferB/autopsy into develop" 
This reverts commit f4811ed8a4, reversing
changes made to 4ad996b369.
 2017-11-20 16:29:09 -05:00
Richard Cordovano 056a3a6e39 Merge pull request #3217 from zhhl/3207-addArtifactsToAttributesAsACollection 
3207 add artifacts to attributes as a collection
 2017-11-20 16:07:06 -05:00
William Schaefer da82b9457b 3202 fix logging for possible exceptions in case event listener 2017-11-20 14:11:51 -05:00
Ann Priestman 35048dc10a Cleanup 2017-11-20 13:45:09 -05:00
Ann Priestman 22f057c009 Merge remote-tracking branch 'upstream/develop' into 3210_enableNewDatabases 
Conflicts:
	Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java
	Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java
 2017-11-20 13:42:54 -05:00
William Schaefer 1f349579b0 3202 remove unused arguement from TagStatusChangeTask, add comments 2017-11-20 13:00:50 -05:00
William Schaefer de618cf8dd 3201 fix casting error in CR case event listener 2017-11-20 12:46:38 -05:00
William Schaefer 752ad4cd62 Merge branch '3201-ManageTagsOptionsPanel' of https://github.com/wschaeferB/autopsy into 3202-TagsMessagingOnStatusChange 2017-11-20 11:41:17 -05:00
William Schaefer ee705fcbd0 3201 merge in changes regarding misplaced curly bracket from 3199 2017-11-20 11:40:38 -05:00
William Schaefer 76b1ca6104 3199 fix misplaced curly bracket in getTagNameDefinitions rewrite 2017-11-20 11:37:30 -05:00
Richard Cordovano d54affddbc Update for SleuthkitCase locking API changes 2017-11-20 11:10:59 -05:00