Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes

services/web/app/views/project/editor/review-panel.jade

@@ -25,6 +25,7 @@
 		.rp-entry-list-inner
 			.rp-entry-wrapper(
 				ng-repeat="(entry_id, entry) in reviewPanel.entries[editor.open_doc_id]"
+				ng-if="!(entry.type === 'comment' && reviewPanel.commentThreads[entry.thread_id].resolved === true)"
 			)
 				div(ng-if="entry.type === 'insert' || entry.type === 'delete'")
 					change-entry(
@@ -35,7 +36,7 @@
 						on-indicator-click="toggleReviewPanel();"
 					)
 
-				div(ng-if="entry.type === 'comment' && !(reviewPanel.commentThreads[entry.thread_id].resolved === true)")
+				div(ng-if="entry.type === 'comment'")
 					comment-entry(
 						entry="entry"
 						threads="reviewPanel.commentThreads"
@@ -67,6 +68,7 @@
 				| {{ doc.path }}
 			.rp-entry-wrapper(
 				ng-repeat="(entry_id, entry) in reviewPanel.entries[doc.doc.id] | orderOverviewEntries"
+				ng-if="!(entry.type === 'comment' && reviewPanel.commentThreads[entry.thread_id].resolved === true)"
 			)
 				div(ng-if="entry.type === 'insert' || entry.type === 'delete'")
 					change-entry(
@@ -76,7 +78,7 @@
 						ng-click="gotoEntry(doc_id, entry)"
 					)
 
-				div(ng-if="entry.type === 'comment' && !(reviewPanel.commentThreads[entry.thread_id].resolved === true)")
+				div(ng-if="entry.type === 'comment'")
 					comment-entry(
 						entry="entry"
 						threads="reviewPanel.commentThreads"

services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee

@@ -39,7 +39,6 @@ define [
 				$scope.$broadcast "review-panel:layout"
 		
 		ide.socket.on "accept-change", (doc_id, change_id) ->
-			console.log "Got remote accept change", doc_id, change_id
 			if doc_id != $scope.editor.open_doc_id
 				getChangeTracker(doc_id).removeChangeId(change_id)
 			else