From 5f66dbebf424fe8d74e0aba85c4f103528e01a57 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 4 Jan 2016 11:12:10 +0000 Subject: [PATCH 1/4] 2015 -> 2016 --- services/web/app/views/subscriptions/new.jade | 1 - services/web/config/settings.defaults.coffee | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/services/web/app/views/subscriptions/new.jade b/services/web/app/views/subscriptions/new.jade index 564d356b2b..b70aec29fc 100644 --- a/services/web/app/views/subscriptions/new.jade +++ b/services/web/app/views/subscriptions/new.jade @@ -112,7 +112,6 @@ block content .form-group(ng-class="validation.correctExpiry == false || validation.errorFields.year ? 'has-error' : ''") select.form-control(data-recurly='year', ng-change="validateExpiry()", ng-model='data.year') option(value="", disabled, selected) Year - option(value="2015") 2015 option(value="2016") 2016 option(value="2017") 2017 option(value="2018") 2018 diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index 73677b2ecc..9f47f33a9f 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -291,7 +291,7 @@ module.exports = title: "ShareLaTeX Community Edition" left_footer: [{ - text: "Powered by ShareLaTeX © 2015" + text: "Powered by ShareLaTeX © 2016" }] right_footer: [{ From a181905ab8d996fceb0dae04ed10f633a95c15ca Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 4 Jan 2016 11:42:54 +0000 Subject: [PATCH 2/4] removed console.log --- .../web/app/coffee/Features/Project/ProjectEntityHandler.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee index 6f69cb5032..eb2496f045 100644 --- a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee +++ b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee @@ -111,7 +111,6 @@ module.exports = ProjectEntityHandler = DocstoreManager.getDoc project_id, doc_id, options, callback addDoc: (project_id, folder_id, docName, docLines, callback = (error, doc, folder_id) ->)=> - console.log project_id ProjectGetter.getProjectWithOnlyFolders project_id, (err, project) -> logger.log project: project._id, folder_id: folder_id, doc_name: docName, "adding doc" return callback(err) if err? From d2025385048882fb36ed41f60e38c2dd34f3c755 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 4 Jan 2016 12:22:31 +0000 Subject: [PATCH 3/4] added ng-cloak to successful subscription page --- .../app/views/subscriptions/successful_subscription.jade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/web/app/views/subscriptions/successful_subscription.jade b/services/web/app/views/subscriptions/successful_subscription.jade index 8764f3f3c8..86b0263238 100644 --- a/services/web/app/views/subscriptions/successful_subscription.jade +++ b/services/web/app/views/subscriptions/successful_subscription.jade @@ -5,7 +5,7 @@ block content .container .row .col-md-8.col-md-offset-2 - .card + .card(ng-cloak) .page-header h2 #{translate("thanks_for_subscribing")} .alert.alert-success @@ -15,8 +15,8 @@ block content p #{translate("if_you_dont_want_to_be_charged")} a(href="/user/subscription") #{translate("click_here_to_cancel")}. span(sixpack-when="manage-subscription") - p #{translate("to_modify_your_subscription_go_to")} - a(href="/user/subscription") #{translate("manage_subscription")}. + p #{translate("to_modify_your_subscription_go_to")} + a(href="/user/subscription") #{translate("manage_subscription")}. p - if (subscription.groupPlan == true) a.btn.btn-success.btn-large(href="/subscription/group") #{translate("add_your_first_group_member_now")} From d3971e4d4f193dfa5b2ee184b7a0377d28a5270d Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Fri, 8 Jan 2016 14:19:40 +0000 Subject: [PATCH 4/4] upgrade logger-sharelatex to v1.3.0 to fix sentry reporting bugs --- services/web/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/package.json b/services/web/package.json index 14ed730096..53ba02d822 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -27,7 +27,7 @@ "http-proxy": "^1.8.1", "jade": "~1.3.1", "ldapjs": "^0.7.1", - "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.1.0", + "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.3.0", "lynx": "0.1.1", "marked": "^0.3.3", "method-override": "^2.3.3",