15936 Commits

Author SHA1 Message Date
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
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
3170c1d0c8 Merge remote-tracking branch 'upstream/develop' into 3144_encaseHashes 2017-11-17 11:45:46 -05:00
Ann Priestman
a5ace70c54 Merge branch '3139_cr_hashes' into 3144_encaseHashes
Conflicts:
	Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ImportCentralRepoDbProgressDialog.java
2017-11-17 11:27:20 -05:00
U-BASIS\zhaohui
30615f5b7d 3207: fix typo 2017-11-17 11:06:29 -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
U-BASIS\zhaohui
4ecfb24165 3207: create ArrayList in python 2017-11-17 09:40:31 -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
U-BASIS\zhaohui
01fda811d5 3207: Update python code to use collection of attributes instead of adding addtribute one at a time 2017-11-16 13:56:09 -05:00
William Schaefer
c017e57df8 Merge branch '3201-ManageTagsOptionsPanel' of https://github.com/wschaeferB/autopsy into 3202-TagsMessagingOnStatusChange 2017-11-16 11:01:23 -05:00
Ann Priestman
61b7f89788 Cleanup 2017-11-16 09:40:29 -05:00
William Schaefer
590f8dc241 3201 resolve merge conflict from 3199 2017-11-15 16:08:40 -05:00
William Schaefer
5035aa41b4 3199 include knownStatus in TagName class 2017-11-15 15:57:28 -05:00
William Schaefer
93f50cb740 3202 fix merge conflict from 3201 2017-11-15 14:10:26 -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
7f205b3ae4 3201 move fix for blank description on new tag into 3201 from 3202 2017-11-15 12:34:05 -05:00
William Schaefer
82e99dc221 3201 resolve merge conflicts with 3199 2017-11-15 12:30:26 -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
25f6f2657f Rename DataSource => AutoIngestDataSource for clarity 2017-11-15 11:55:52 -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
Richard Cordovano
98b0290959 Merge remote-tracking branch 'upstream/release-4.5.1' into develop 2017-11-15 10:14:19 -05:00
Richard Cordovano
16abf6bf4c Update develpers folder contents 2017-11-15 09:41:08 -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
William Schaefer
9b511c3c05 3202 make TagsPanelDescription large enough for text 2017-11-14 18:18:16 -05:00
William Schaefer
55efc419ab 3202 rename gui elements in TagOptionsPanel, change @messages 2017-11-14 18:16:44 -05:00
William Schaefer
9b7ada8f64 3202 remove confirmation for changing tag status in current case 2017-11-14 17:32:11 -05:00
Richard Cordovano
6d23931448
Merge pull request #3202 from dgrove727/3177_Aid10Metrics
3177 aid10 metrics
2017-11-14 16:16:52 -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
U-BASIS\dgrove
e78980cb6e Merge 2017-11-14 02:45:19 -05:00
U-BASIS\dgrove
e64e30181e Typo 2017-11-14 02:26:38 -05:00
U-BASIS\dgrove
22f023002c Fixed merge issue. 2017-11-14 02:24:24 -05:00