7407 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
183536c832
Merge pull request #3181 from eugene7646/archive_dsp_v2_3136
Archive DSP (3136)
2017-11-15 10:53:36 -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
48123343cc
Merge pull request #3192 from zhhl/3155-waitCursorInIngestInbox
3155: Busy cursor in ingest inbox
2017-11-13 14:31:17 -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
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
Richard Cordovano
35ce341372 Workaround for JComponent.addPropertyChangeListener calls in ctor 2017-11-08 17:41:10 -05:00
William Schaefer
feb12e304b 3201 fix title for Edit Tag dialog 2017-11-08 17:18:22 -05:00
Richard Cordovano
64a0e83132 Merge in release-4.5.1 branch and resolve conflicts 2017-11-08 12:09:08 -05:00
William Schaefer
d49b1667af 3201 disable tag deletion and editing during ingest 2017-11-08 09:58:03 -05:00
William Schaefer
93a72e6a36 Merge branch '3199-ConsolidateDefaultTags' of https://github.com/wschaeferB/autopsy into 3201-ManageTagsOptionsPanel 2017-11-07 15:25:57 -05:00
William Schaefer
09f729f92c Merge branch '3198-TagPropertiesUpdate' of https://github.com/wschaeferB/autopsy into 3199-ConsolidateDefaultTags 2017-11-07 15:22:58 -05:00
William Schaefer
4770217954 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3198-TagPropertiesUpdate 2017-11-07 15:22:28 -05:00
Richard Cordovano
2772cdfe19
Merge pull request #3185 from zhhl/3180-UnitTestCreateAndDeleteCase
3180 unit test create and delete case
2017-11-07 14:10:13 -05:00
William Schaefer
b85a41b4b9 fixed height of File ext mismatch settings Panel 2017-11-07 13:54:58 -05:00
William Schaefer
635537496a fixed height of External Viewer Global Settings Panel 2017-11-07 13:54:35 -05:00
William Schaefer
59d42a84fe Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3198-TagPropertiesUpdate 2017-11-07 13:52:49 -05:00
William Schaefer
36b7a24ea1 3201 initial revisions to Tag Options Panel to allow editing 2017-11-07 13:52:13 -05:00
U-BASIS\zhaohui
82ec21ac1a 3180: delete unused import 2017-11-07 13:49:19 -05:00
U-BASIS\zhaohui
a8648cdbb1 3180: Move unit test to qa-functional test and adding Case creation and deletion 2017-11-07 13:45:21 -05:00
Richard Cordovano
d2036b1be5
Merge pull request #3177 from zhhl/3180-caseCreationAndDeletionInUnitTest
3180: correct the typo
2017-11-06 18:03:31 -05:00
William Schaefer
9201c73fbd 3199-Fix merge conflict from changes to 3198 2017-11-06 16:12:09 -05:00
William Schaefer
0d66351f6c 3198 changed TagNameDefinition knownStatus to knownStatusDenoted 2017-11-06 16:06:01 -05:00
William Schaefer
21a74a4f6b 3199 remove remaining creation of Evidence Tag 2017-11-06 16:03:03 -05:00
Eugene Livis
6195c29d41 Merged latest develop 2017-11-06 15:51:55 -05:00
William Schaefer
ad7d504d27 3199 Category class moved to Aut Core, tags created one place 2017-11-06 15:00:05 -05:00