2 files changed, 22 insertions, 0 deletions
diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade
index 51b09d72..ae52dc4c 100644
--- a/client/components/sidebar/sidebar.jade
+++ b/client/components/sidebar/sidebar.jade
@@ -153,6 +153,12 @@ template(name="boardCardSettingsPopup")
         span
           i.fa.fa-comment-o
           | {{_ 'comment'}}
+    div.check-div
+      a.flex.js-field-has-comments(class="{{#if allowsActivities}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if allowsActivities}}is-checked{{/if}}")
+        span
+          i.fa.fa-history
+          | {{_ 'activities'}}
 
 template(name="boardSubtaskSettingsPopup")
   form.board-subtask-settings
diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js
index 4de7aa80..c3c00b08 100644
--- a/client/components/sidebar/sidebar.js
+++ b/client/components/sidebar/sidebar.js
@@ -882,6 +882,22 @@ BlazeComponent.extendComponent({
             this.currentBoard.allowsComments,
           );
         },
+        'click .js-field-has-activities'(evt) {
+          evt.preventDefault();
+          this.currentBoard.allowsActivities = !this.currentBoard
+            .allowsActivities;
+          this.currentBoard.setAllowsActivities(
+            this.currentBoard.allowsActivities,
+          );
+          $(`.js-field-has-activities ${MCB}`).toggleClass(
+            CKCLS,
+            this.currentBoard.allowsActivities,
+          );
+          $('.js-field-has-activities').toggleClass(
+            CKCLS,
+            this.currentBoard.allowsActivities,
+          );
+        },
       },
     ];
   },