Merge branch 'master' of github.com:sharelatex/web-sharelatex

services/web/app/coffee/Features/Compile/CompileController.coffee

@@ -42,5 +42,5 @@ module.exports = CompileController =
 		proxy = request(url: url, method: req.method, timeout: oneMinute)
 		proxy.pipe(res)
 		proxy.on "error", (error) ->
-			logger.error err: error, url: url, "CLSI proxy error"
+			logger.warn err: error, url: url, "CLSI proxy error"
 	

services/web/app/coffee/controllers/ProjectController.coffee

@@ -154,7 +154,7 @@ module.exports = class ProjectController
 										spellCheckLanguage: user.ace.spellCheckLanguage
 										pdfViewer : user.ace.pdfViewer
 										docPositions: {}
-										trackChanges: user.featureSwitches.trackChanges
+										oldHistory: !!user.featureSwitches?.oldHistory
 									})
 									sharelatexObject : JSON.stringify({
 										siteUrl: Settings.siteUrl,

services/web/app/coffee/models/User.coffee

@@ -32,7 +32,7 @@ UserSchema = new Schema
 						}
 	featureSwitches	  : {
 							dropbox: {type:Boolean, default:true},
-							trackChanges: {type:Boolean, default:false}
+							oldHistory: {type:Boolean}
 						}
 	referal_id : {type:String, default:() -> uuid.v4().split("-")[0]}
 	refered_users: [ type:ObjectId, ref:'User' ]

services/web/public/coffee/file-tree/FileTreeManager.coffee

@@ -75,6 +75,7 @@ define [
 			children.add(entity)
 
 		openDoc: (doc, line) ->
+			return if !doc?
 			doc_id = doc.id or doc
 			@trigger "open:doc", doc_id, line: line
 			@selectEntity(doc_id)

services/web/public/coffee/ide.coffee

@@ -119,10 +119,10 @@ define [
 			@cursorManager = new CursorManager(@)
 			@fileViewManager = new FileViewManager(@)
 			@analyticsManager = new AnalyticsManager(@)
-			if @userSettings.trackChanges
-				@trackChangesManager = new TrackChangesManager(@)
-			else
+			if @userSettings.oldHistory
 				@historyManager = new HistoryManager(@)
+			else
+				@trackChangesManager = new TrackChangesManager(@)
 
 			@setLoadingMessage("Connecting")
 			firstConnect = true