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,920 Commits 1 Branch 0 Tags
Commit Graph

15920 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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 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
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
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
Ann Priestman
b230a3c63d Remove central repo hashset name properties file 2017-11-20 09:12:01 -05:00
Ann Priestman
cd6d0ca14c Cleanup 2017-11-20 08:58:49 -05:00
Ann Priestman
bb1abf07e4 Clear out new reference set ID list after save 2017-11-20 08:49:59 -05:00
Ann Priestman
3cacda1d22 Remove default version 2017-11-20 08:43:26 -05:00
Ann Priestman
0abc682737 Merge remote-tracking branch 'upstream/develop' into 3144_encaseHashes 2017-11-20 08:11:24 -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