codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-28 13:30:00 +00:00
Code Issues Releases Wiki Activity
15,907 Commits 24 Branches 52 Tags
20b00a3fc2a348d288e3695fb18bcb5179568cdd
Commit Graph
7502 Commits
Author SHA1 Message Date
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
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
William Schaefer e5b81aa96e 3202 make TagNameDefinition non public again 2017-11-20 10:30:39 -05:00
William Schaefer 767c0d601b 3202 merge in changes from 3201 and resolve conflicts 2017-11-17 19:23:34 -05:00
William Schaefer edc7816b40 3201 merge changes from 3199 2017-11-17 19:19:01 -05:00
William Schaefer 4bc8d85acd 3199 clean up read Tags properties code and rename Category to DhsImageCategory 2017-11-17 19:08:59 -05:00
Richard Cordovano f4811ed8a4 Merge branch '3199-ConsolidateDefaultTags' of https://github.com/wschaeferB/autopsy into develop 2017-11-17 17:51:45 -05:00
William Schaefer 85471c15f5 Merge branch '3201-ManageTagsOptionsPanel' of https://github.com/wschaeferB/autopsy into 3202-TagsMessagingOnStatusChange 2017-11-17 17:14:26 -05:00
William Schaefer 8533ce98fb 3201 merge changes from 3199 regarding refactor of addTagName method name 2017-11-17 17:13:02 -05:00
William Schaefer d8a75596a2 3199 fix second usage of addOrUpdateTagName 2017-11-17 17:05:05 -05:00
William Schaefer bfaec69477 3199 fix renamed sleuthkit method use in autopsy 2017-11-17 17:04:04 -05:00
Richard Cordovano 4ad996b369 Merge pull request #3222 from APriestman/3141_addHashes 
Hashes can be added to central repo hash sets.
 2017-11-17 16:22:18 -05:00
Richard Cordovano 2539a55238 Merge pull request #3206 from APriestman/3196_invalidHashSets 
Only display valid hash sets in the ingest module settings
 2017-11-17 16:09:33 -05:00
Ann Priestman e24518be51 Cleanup 2017-11-17 15:52:37 -05:00
William Schaefer 7cea808fc0 Merge branch '3201-ManageTagsOptionsPanel' of https://github.com/wschaeferB/autopsy into 3202-TagsMessagingOnStatusChange 
boolean isSelected = tagNamesList.getSelectedIndex() != -1;
        boolean enableEdit = !ingestIsRunning && isSelected;
        editTagNameButton.setEnabled(enableEdit);
        boolean enableDelete = enableEdit && !TagNameDefinition.getStandardTagNames().contains(tagNamesList.getSelectedValue().getDisplayName());
        deleteTagNameButton.setEnabled(enableDelete);
        if (isSelected) {

            descriptionTextArea.setText(tagNamesList.getSelectedValue().getDescription());
            if (tagNamesList.getSelectedValue().isNotable()) {
                notableYesOrNoLabel.setText("Yes");
            } else {
                notableYesOrNoLabel.setText("No");
            }
        } else {
            descriptionTextArea.setText("");
            notableYesOrNoLabel.setText("");
        }the commit.
 2017-11-17 15:46:26 -05:00
William Schaefer 0b27196ad4 3201 merge changes from 3199 and resolve conflicts 2017-11-17 15:37:19 -05:00
Ann Priestman c308d26ff8 Merge remote-tracking branch 'upstream/develop' into 3195_indexDialog 
Conflicts:
	Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java
 2017-11-17 15:33:24 -05:00
Richard Cordovano a7824f52bb Merge pull request #3170 from APriestman/3139_cr_hashes 
Integrate central repository hash sets into HashDbManager
 2017-11-17 15:21:44 -05:00
William Schaefer 5ab65ae0d5 3199 fix typo in bundle message name 2017-11-17 15:02:28 -05:00
William Schaefer 743df27125 3199 add knownStatus to TagName class and tag_names table 2017-11-17 14:56:16 -05:00
Ann Priestman 7a3135e1fb Merge remote-tracking branch 'upstream/develop' into 3196_invalidHashSets 2017-11-17 13:14:59 -05:00
Ann Priestman 66e8b2c1cf Merge branch '3139_cr_hashes' into 3196_invalidHashSets 
Conflicts:
	Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleSettingsPanel.java
 2017-11-17 13:14:50 -05:00
Ann Priestman a28a88f13c Merge remote-tracking branch 'upstream/develop' into 3141_addHashes 2017-11-17 12:26:03 -05:00
Ann Priestman ff3f620b00 Merge branch '3139_cr_hashes' into 3141_addHashes 
Conflicts:
	Core/src/org/sleuthkit/autopsy/modules/hashdatabase/AddContentToHashDbAction.java
	Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbCreateDatabaseDialog.java
	Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbIngestModule.java
	Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java
 2017-11-17 12:25:56 -05:00
Ann Priestman 5bccb82c68 Update central repo hashsets automatically when getting known, known bad, or updateable hash sets 2017-11-17 09:41:37 -05:00
Ann Priestman c062a20213 Addresses most of the review comments 2017-11-17 08:47:43 -05:00
Richard Cordovano 7698597682 Update docs of EmbeddedFileExtractorModuleFactory.java 2017-11-16 15:36:29 -05:00
Richard Cordovano 6955416f02 Clean up EmbeddedFileExtractorIngestModule.java 2017-11-16 15:32:16 -05:00
William Schaefer c017e57df8 Merge branch '3201-ManageTagsOptionsPanel' of https://github.com/wschaeferB/autopsy into 3202-TagsMessagingOnStatusChange 2017-11-16 11:01:23 -05:00
Ann Priestman 61b7f89788 Cleanup 2017-11-16 09:40:29 -05:00
William Schaefer 590f8dc241 3201 resolve merge conflict from 3199 2017-11-15 16:08:40 -05:00
William Schaefer 5035aa41b4 3199 include knownStatus in TagName class 2017-11-15 15:57:28 -05:00
William Schaefer 93f50cb740 3202 fix merge conflict from 3201 2017-11-15 14:10:26 -05:00
U-BASIS\zhaohui 19c7cfb704 3207: Add a collection of attributes to aritifact instead of add one attribute at a time. 2017-11-15 13:10:57 -05:00
William Schaefer 7f205b3ae4 3201 move fix for blank description on new tag into 3201 from 3202 2017-11-15 12:34:05 -05:00
William Schaefer 82e99dc221 3201 resolve merge conflicts with 3199 2017-11-15 12:30:26 -05:00
William Schaefer 3fda67bb22 3199 fix merge error in TagsManager where both old and new arguments were in method call 2017-11-15 12:25:18 -05:00