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 |
|
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
|
c95ed4e09b
|
Merge pull request #3226 from millmanorama/CVT-wrap_in_DataResultFilterNode_to_get_actions
wrap nodes in DataResiltFilterNodes to get more actions automatically
|
2017-11-20 11:13:46 -05:00 |
|
Richard Cordovano
|
9164f999b4
|
Merge pull request #3223 from millmanorama/881-CVT-refresh
881 cvt refresh
|
2017-11-20 11:12:44 -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 |
|
millmanorama
|
3cb5583e4f
|
wrap nodes in DataResiltFilterNodes to get more actions automatically
|
2017-11-20 15:25:42 +01: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 |
|
millmanorama
|
f47edb131e
|
change to ChildFactory, do CommunicationsManager calls off the EDT
|
2017-11-20 14:57:44 +01: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 |
|
millmanorama
|
183daff325
|
Merge remote-tracking branch 'upstream/accounts_relationships' into 894-polish-CVT-opening-behaviour
# Conflicts:
# Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
|
2017-11-20 13:45:10 +01:00 |
|
millmanorama
|
876bdc0cb8
|
remove duplicate library reference
|
2017-11-20 12:52:54 +01:00 |
|
millmanorama
|
146a417438
|
split apply/refresh into to buttons
|
2017-11-20 12:48:09 +01:00 |
|
millmanorama
|
5aee6dbde0
|
Merge remote-tracking branch 'upstream/accounts_relationships' into 881-CVT-refresh
# Conflicts:
# Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.form
# Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.java
# Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
|
2017-11-20 11:53:37 +01: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 |
|