Richard Cordovano
|
1761c5afcb
|
Merge pull request #3218 from dgrove727/3221_EncryptionDetectionModule
Crypto module created for detecting encrypted files.
|
2017-11-22 15:47:04 -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 |
|
Ann Priestman
|
3b030a76d8
|
Add new parser file
|
2017-11-22 12:32:39 -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 |
|
U-BASIS\dgrove
|
5f8b860545
|
'collectMetrics()' method implemented.
|
2017-11-22 01:05:08 -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 |
|
William Schaefer
|
20b00a3fc2
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3203-TagsContextMenuChanges
|
2017-11-21 12:57:38 -05:00 |
|
Ann Priestman
|
49a631f351
|
Refactoring hash set import
|
2017-11-21 11:17:52 -05:00 |
|
U-BASIS\dgrove
|
dbe357c644
|
Partial implementation.
|
2017-11-21 10:58:41 -05:00 |
|
Richard Cordovano
|
4db4303c17
|
Merge pull request #3232 from millmanorama/894-polish-CVT-opening-behaviour
894 polish cvt opening behaviour
|
2017-11-20 19:17:27 -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
|
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 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 |
|
millmanorama
|
058d36e05b
|
Merge remote-tracking branch 'upstream/accounts_relationships' into 894-polish-CVT-opening-behaviour
|
2017-11-20 22:31:32 +01:00 |
|
millmanorama
|
2640ab926c
|
simplify nodes by relying n asynchronous children instead of the SwingWorkers.
|
2017-11-20 22:30:14 +01: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 |
|
Richard Cordovano
|
b5b32e59f8
|
Merge pull request #3230 from millmanorama/881-CVT-refresh
remove duplicate library reference
|
2017-11-20 15:30:58 -05:00 |
|
Richard Cordovano
|
d3b421d84c
|
Merge pull request #3231 from sleuthkit/acct_refactor
revert to old way of rejecting
|
2017-11-20 15:30:33 -05:00 |
|
Brian Carrier
|
54a77d25a4
|
revert to old way of rejecting
|
2017-11-20 15:12:04 -05:00 |
|
millmanorama
|
65b947bafa
|
restore wrapping in DataResultFilterNode
|
2017-11-20 21:10:00 +01:00 |
|
millmanorama
|
f6125cbf6a
|
Merge branch 'accounts_relationships' into 894-polish-CVT-opening-behaviour
# Conflicts:
# Core/src/org/sleuthkit/autopsy/communications/Bundle.properties
# Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.form
# Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
# Core/src/org/sleuthkit/autopsy/communications/MessageBrowser.java
|
2017-11-20 21:07:42 +01: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 |
|
Richard Cordovano
|
1ca62331ea
|
Merge in develop
|
2017-11-20 12:11:08 -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 |
|