16891 Commits

Author SHA1 Message Date
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
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
1f7e5adc8f
Merge pull request #3216 from millmanorama/accounts_relationships
reuse visualization tab in action button
2017-11-17 19:01:35 -05:00
Richard Cordovano
d1f112c3f1
Merge pull request #3215 from millmanorama/CVT-prevent-invalid-date-ranges
CVT prevent invalid date ranges
2017-11-17 19:01:07 -05:00
Richard Cordovano
6bbf7f126e
Merge pull request #3211 from millmanorama/CVT-UI-tweaks
Cvt ui tweaks
2017-11-17 18:57:46 -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
85471c15f5 Merge branch '3201-ManageTagsOptionsPanel' of https://github.com/wschaeferB/autopsy into 3202-TagsMessagingOnStatusChange 2017-11-17 17:14:26 -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
U-BASIS\dgrove
9aec9ce910 Merge remote-tracking branch 'upstream/develop' into 3221_EncryptionDetectionModule 2017-11-17 16:05:25 -05:00
U-BASIS\dgrove
eef2e81246 Added message inbox integration and modified logging. 2017-11-17 16:04:24 -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
William Schaefer
7cea808fc0 Merge branch '3201-ManageTagsOptionsPanel' of https://github.com/wschaeferB/autopsy into 3202-TagsMessagingOnStatusChange
boolean isSelected = tagNamesList.getSelectedIndex() != -1;
        boolean enableEdit = !ingestIsRunning && isSelected;
        editTagNameButton.setEnabled(enableEdit);
        boolean enableDelete = enableEdit && !TagNameDefinition.getStandardTagNames().contains(tagNamesList.getSelectedValue().getDisplayName());
        deleteTagNameButton.setEnabled(enableDelete);
        if (isSelected) {

            descriptionTextArea.setText(tagNamesList.getSelectedValue().getDescription());
            if (tagNamesList.getSelectedValue().isNotable()) {
                notableYesOrNoLabel.setText("Yes");
            } else {
                notableYesOrNoLabel.setText("No");
            }
        } else {
            descriptionTextArea.setText("");
            notableYesOrNoLabel.setText("");
        }the commit.
2017-11-17 15:46:26 -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
U-BASIS\dgrove
7a55b65989 Updated description to be more generic. 2017-11-17 14:23:23 -05:00
U-BASIS\dgrove
7c0cbe098e Typo fixed. 2017-11-17 14:11:56 -05:00
U-BASIS\dgrove
6bb2701776 Minor tweaks. 2017-11-17 14:02:08 -05:00
U-BASIS\dgrove
39cd68aca6 Minor tweaks. 2017-11-17 13:38:55 -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