Commit Graph
15802 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
William Schaefer 0b27196ad4 3201 merge changes from 3199 and resolve conflicts 2017-11-17 15:37:19 -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
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
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
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
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
U-BASIS\dgrove 8934275246 Merge remote-tracking branch 'upstream/develop' into 3177_Aid10Metrics 2017-11-13 17:31:00 -05:00
U-BASIS\dgrove 556810da0e Fixed merge conflict. 2017-11-13 16:52:19 -05:00
U-BASIS\dgrove e63c7d8723 Cleanup. 2017-11-13 16:28:55 -05:00
U-BASIS\dgrove 5edea4c595 API added for getting data source content size. 2017-11-13 16:26:14 -05:00
Richard Cordovano 48123343cc Merge pull request #3192 from zhhl/3155-waitCursorInIngestInbox
3155: Busy cursor in ingest inbox
2017-11-13 14:31:17 -05:00
Richard Cordovano a241a9a3c0 Merge pull request #3188 from dgrove727/3192_WaitCursor
Wait cursor set for 'Ingest Module Settings' button.
2017-11-13 14:20:18 -05:00
Richard Cordovano bb0f25ae02 Merge pull request #3187 from esaunders/release-4.5.1
Reduce memory consumed by keyword search hits
2017-11-13 13:26:28 -05:00
Richard Cordovano 146dacd541 Merge pull request #3180 from dgrove727/3148_AlertFiles
3148 alert files
2017-11-13 13:22:28 -05:00
William Schaefer bb40f1d8e8 3202 Messaging for changing of status which tag implies 2017-11-10 17:52:02 -05:00
U-BASIS\dgrove 2e3fcab59d Fixed for merging. 2017-11-10 16:02:26 -05:00
U-BASIS\dgrove ca64d9a397 Pulling node data to determine case status. 2017-11-10 10:28:47 -05:00
William Schaefer 1a63dc413c 3201 attribute storing knownStatus for TagName renamed to knownStatus 2017-11-10 09:46:47 -05:00
William Schaefer e091dc72b5 3201 merge conflicts with changes from 3199 2017-11-09 17:27:07 -05:00
William Schaefer 4a61034b31 3199 merge in changes from 3198 2017-11-09 17:00:41 -05:00
William Schaefer e1770f5fdf 3198 change storage of knownStatus for TagNameDefinition from String to enum 2017-11-09 16:53:29 -05:00
Richard Cordovano fad0383803 Merge pull request #3186 from wschaeferB/FixHeightOfOptionsPanels
Fix height of options panels
2017-11-09 15:55:42 -05:00
William Schaefer 74e9378e8b Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3198-TagPropertiesUpdate 2017-11-09 15:51:58 -05:00
U-BASIS\zhaohui a38763a85f 3155: Busy cursor in ingest inbox 2017-11-09 14:46:33 -05:00
Eugene Livis 3c95a7a70a ArchiveExtractorDSProcessor no longer implements ArchiveExtractorDSProcessor interface 2017-11-09 13:28:00 -05:00
Eugene Livis c1808f4a03 Bug fix 2017-11-09 13:23:58 -05:00
Eugene Livis 3c433fcee3 Optimization for getting, storing, and sorting DSP list only once 2017-11-09 13:13:06 -05:00
Eugene Livis 0c46e2d2d7 Only adding logical file set if there are files remaining. Bug fixes. Optimizations 2017-11-09 12:26:25 -05:00
Eugene Livis cb7a93d081 Added simpler interfaces that require only one method call 2017-11-09 12:25:27 -05:00
Eugene Livis dd34e770d8 Fixed a bug in AIMs use of taskId and data source addition notification 2017-11-09 12:24:29 -05:00
Eugene Livis 64c6a9568f Merge branch 'develop' of github.com:sleuthkit/autopsy into archive_dsp_v2_3136 2017-11-09 09:46:36 -05:00
Richard Cordovano a0f0e3cffc Merge remote-tracking branch 'upstream/release-4.5.1' into develop 2017-11-08 17:48:02 -05:00
Richard Cordovano b4d2cbd447 Update comment in some JPanel subclasses 2017-11-08 17:45:39 -05:00