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

services/web/app/coffee/Features/Templates/TemplatesWebController.coffee

@@ -45,7 +45,7 @@ module.exports = TemplatesWebController =
 			disposition = "inline"
 		else
 			disposition = "attachment"
-		res.header({"content-disposition": "#{disposition}; filename=#{name}.#{req.params.file_type};"})
+		res.header({"content-disposition": "#{disposition}; filename=\"#{name.replace("\"", "-")}.#{req.params.file_type}\""})
 		
 		logger.log url:url, template_name: name, disposition: disposition, "proxying request to templates api"
 		

services/web/public/coffee/ide/chat/services/chatMessages.coffee

@@ -50,6 +50,8 @@ define [
 					chat.state.loading = false
 					if messages.length < MESSAGE_LIMIT
 						chat.state.atEnd = true
+					if !messages.reverse?
+						Raven?.captureException(new Error("messages has no reverse property"), { messages: messages })
 					messages.reverse()
 					prependMessages(messages)
 					chat.state.nextBeforeTimestamp = chat.state.messages[0]?.timestamp

services/web/public/coffee/ide/editor/directives/aceEditor/undo/UndoManager.coffee

@@ -230,6 +230,8 @@ define [
 				}
 
 		_aceDeltaToSimpleDelta: (aceDelta, docLines) ->
+			if !aceDelta.range?
+				Raven?.captureException(new Error("Missing range in aceDelta"), { delta: aceDelta })
 			start = aceDelta.range.start
 			linesBefore = docLines.slice(0, start.row)
 			position =
@@ -258,7 +260,7 @@ define [
 						remove: aceDelta.lines.join("\n") + "\n"
 					}
 				else
-					throw "Unknown Ace action: #{aceDelta.action}"
+					throw new Error("Unknown Ace action: #{aceDelta.action}")
 
 		_simplePositionToAcePosition: (position, docLines) ->
 			column = 0

services/web/public/coffee/main.coffee

@@ -2,6 +2,7 @@ define [
 	"main/project-list/index"
 	"main/user-details"
 	"main/account-settings"
+	"main/account-upgrade"
 	"main/templates"
 	"main/plans"
 	"main/group-members"