From aec80fb1db1b2dfc23ee12dbff6ba0fff84f06c0 Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 7 Jan 2015 11:59:37 +0000 Subject: [PATCH 1/4] Include FreeTrialModalControler in main.coffee --- services/web/public/coffee/main.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/services/web/public/coffee/main.coffee b/services/web/public/coffee/main.coffee index 908e4be549..f8bd54cd4b 100644 --- a/services/web/public/coffee/main.coffee +++ b/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" From 923fbfc574f725f59fe2bc592fda30838bdfc9f0 Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 7 Jan 2015 12:37:16 +0000 Subject: [PATCH 2/4] Correctly handle quote characters in template name when downloading --- .../app/coffee/Features/Templates/TemplatesWebController.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Templates/TemplatesWebController.coffee b/services/web/app/coffee/Features/Templates/TemplatesWebController.coffee index 22c5e9b83d..0185dfcfe8 100644 --- a/services/web/app/coffee/Features/Templates/TemplatesWebController.coffee +++ b/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" From 10653c12fdec44dd3755c35db8c36243c2afb632 Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 7 Jan 2015 13:12:00 +0000 Subject: [PATCH 3/4] Send more data to Sentry to track down error --- .../ide/editor/directives/aceEditor/undo/UndoManager.coffee | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/undo/UndoManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/undo/UndoManager.coffee index d30e2f6718..c57f1dffa4 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor/undo/UndoManager.coffee +++ b/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 From dd5562f9b6153b154b99a14f842bc8ed2112216d Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 7 Jan 2015 13:16:31 +0000 Subject: [PATCH 4/4] Send more data to sentry about messages.reverse error --- .../web/public/coffee/ide/chat/services/chatMessages.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/web/public/coffee/ide/chat/services/chatMessages.coffee b/services/web/public/coffee/ide/chat/services/chatMessages.coffee index b7c3c75dcd..203c113fc8 100644 --- a/services/web/public/coffee/ide/chat/services/chatMessages.coffee +++ b/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