mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-17 10:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,875 Commits 1 Branch 0 Tags
Commit Graph

7472 Commits

Author SHA1 Message Date
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 55fe85935d6f84250e38598724f5c88d9126c3e3.
 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 f4811ed8a44e3ddf71dac3e96f3ead8044fdb01c, reversing
changes made to 4ad996b36955f602832c55acd90239c06a4b3c29.
 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
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
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
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
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
Ann Priestman
61b7f89788 Cleanup 2017-11-16 09:40:29 -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
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
William Schaefer
c2d0bbb932 3198 comment getTagNameDefinitions 2017-11-15 11:59:10 -05:00
Richard Cordovano
183536c832
Merge pull request #3181 from eugene7646/archive_dsp_v2_3136 
Archive DSP (3136)
 2017-11-15 10:53:36 -05:00
Ann Priestman
143e530c32 Missed a "hash" reference 2017-11-15 09:18:03 -05:00
Ann Priestman
156970c9e5 Made reference set methods less hash-specific 2017-11-15 09:08:29 -05:00
Ann Priestman
8a63c5aa15 Change HashDb interface to an abstract class. 
Rename SleuthkitHashSet and CentralRepoHashSet
 2017-11-14 15:04:30 -05:00
Ann Priestman
2bb24e3d4d Remove/change some public methods. 2017-11-14 11:32:19 -05:00
Ann Priestman
1b272cf18c Only display valid hash sets in the ingest module settings 2017-11-14 09:26:10 -05:00
Richard Cordovano
48123343cc
Merge pull request #3192 from zhhl/3155-waitCursorInIngestInbox 
3155: Busy cursor in ingest inbox
 2017-11-13 14:31:17 -05:00
Ann Priestman
a46d369f7e Merge remote-tracking branch 'upstream/develop' into 3139_cr_hashes 2017-11-13 14:29:48 -05:00
Ann Priestman
fed52680a9 Cleanup 2017-11-13 14:28:04 -05:00
Ann Priestman
0ea88c0f68 Cleanup 2017-11-13 14:24:50 -05:00
Ann Priestman
f00ceeea27 Cleanup 2017-11-13 14:03:29 -05:00
Ann Priestman
5c2b89995e Switched around names of HashDb and HashDatabase 2017-11-13 13:56:40 -05:00
Ann Priestman
bf164a7a56 Put dialogs asking if unindexed hash sets should be indexed on the EDT 2017-11-13 12:37:11 -05:00
Ann Priestman
56c5cd92cb Revert changes to the public api 2017-11-13 08:47:01 -05:00
Ann Priestman
d09fce22f8 x 2017-11-13 07:58:52 -05:00
U-BASIS\dgrove
2e3fcab59d Fixed for merging. 2017-11-10 16:02:26 -05:00
U-BASIS\dgrove
ca64d9a397 Pulling node data to determine case status. 2017-11-10 10:28:47 -05:00