codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-18 08:41:43 +00:00
Code Issues Releases Wiki Activity
15,891 Commits 24 Branches 52 Tags
981dbce8300e086f09b1ff942e6ef2ed9904b5da
Commit Graph
15891 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Cordovano 981dbce830 Merge pull request #3221 from wschaeferB/3201-ManageTagsOptionsPanel 
3201 manage tags options panel
 2017-11-20 19:12:10 -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 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 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 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 2e01c3bcd0 Merge remote-tracking branch 'upstream/develop' into 3196_invalidHashSets 2017-11-17 15:55:13 -05:00
Ann Priestman e24518be51 Cleanup 2017-11-17 15:52:37 -05:00
Ann Priestman 83d805aa9b Cleanup 2017-11-17 15:48:15 -05:00
Richard Cordovano 68b4391434 Merge pull request #3201 from APriestman/3195_indexDialog 
Put dialogs asking if unindexed hash sets should be indexed on the EDT
 2017-11-17 15:45:19 -05:00
Ann Priestman f156b2c0bd Cleanup 2017-11-17 15:44:32 -05:00
Ann Priestman a278fb9232 Merge remote-tracking branch 'upstream/develop' into 3141_addHashes 2017-11-17 15:37:54 -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
U-BASIS\zhaohui 30615f5b7d 3207: fix typo 2017-11-17 11:06:29 -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
U-BASIS\zhaohui 4ecfb24165 3207: create ArrayList in python 2017-11-17 09:40:31 -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
U-BASIS\zhaohui 01fda811d5 3207: Update python code to use collection of attributes instead of adding addtribute one at a time 2017-11-16 13:56:09 -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
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
William Schaefer 77b874e075 3199 resolve merge conflicts from 3198 changes 2017-11-15 12:19:30 -05:00
William Schaefer 273434f50f Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3198-TagPropertiesUpdate 2017-11-15 11:59:44 -05:00