Don't provide shortcut for comment search (#4291)

* don't provide shortcut for comment search to avoid clash with tree-search shortcut
* adapt tooltip
* update changelog
* Merge branch 'master' of github.com:scalableminds/webknossos into avoid-double-search-shortcut

CHANGELOG.md

@@ -42,6 +42,8 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.md).
 ### Fixed
 - When creating tasks from zip, the individual nml names are used again, rather than the zip name. [#4277](https://github.com/scalableminds/webknossos/pull/4277)
 
+### Removed
+- Removed the Search shortcut (Ctrl+Shift+F) for comments in the tracing view, since that shortcut collides with the tree search. [#4291](https://github.com/scalableminds/webknossos/pull/4291)
 
 ## [19.09.0](https://github.com/scalableminds/webknossos/releases/tag/19.09.0) - 2019-08-28
 [Commits](https://github.com/scalableminds/webknossos/compare/19.08.0...19.09.0)

frontend/javascripts/oxalis/view/right-menu/comment_tab/comment_tab_view.js

@@ -353,10 +353,9 @@ class CommentTabView extends React.PureComponent<PropsWithSkeleton, CommentTabSt
             onSelect={comment => this.props.setActiveNode(comment.nodeId)}
             data={_.flatMap(this.props.skeletonTracing.trees, tree => tree.comments)}
             searchKey="content"
-            provideShortcut
             targetId={commentListId}
           >
-            <ButtonComponent icon="search" title="Open the search via CTRL + Shift + F" />
+            <ButtonComponent icon="search" title="Search through comments" />
           </AdvancedSearchPopover>
           <ButtonComponent
             title="Jump to previous comment"