From 8feffa54317dd1d16e4d46a9b42a00f85fea2474 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Mon, 5 Jan 2015 17:31:19 -0600 Subject: [PATCH 1/2] fix(news): Improve accuracy --- views/shared/new-stuff.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/shared/new-stuff.jade b/views/shared/new-stuff.jade index 020839c92e..ce42a9f18c 100644 --- a/views/shared/new-stuff.jade +++ b/views/shared/new-stuff.jade @@ -7,11 +7,11 @@ h5 JANUARY BACKGROUNDS, TESTING CRON BUG FIX, AND DATE FORMAT ADJUSTMENT! tr td h5 Testing Fix for Cron Bug - p Today we will be testing a possible fix for a bug that sometimes causes Dailies to not reset correctly on the following day. It's a big change, so we will be keeping a close watch on the site to make sure that it doesn't break anything. If you experience any problems with day start or Dailies reseting in the next few days, please let us know immediately on Github. Thanks! + p Today we will be testing a possible fix for a bug that sometimes causes Dailies to not reset correctly on the following day. It's a big change, so we will be keeping a close watch on the site to make sure that it doesn't break anything. If you experience any problems with day start or Dailies reseting in the next few days, please let us know immediately on GitHub. Thanks! tr td h5 Date Format Adjustment - p There's a new option under Settings that lets you adjust the date format. Now you can list dates as MM/DD or DD/MM. + p There's a new option under Settings that lets you adjust the date format. Now you can list dates as MM/DD/YYYY, DD/MM/YYYY, or YYYY/MM/DD. p.small.muted by Verabird hr From b854663b9255a8e303e0d398836a32caf11c417e Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Tue, 6 Jan 2015 09:05:30 +0100 Subject: [PATCH 2/2] fix(loggly): do not pass apiKey --- src/controllers/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/user.js b/src/controllers/user.js index 25c69720a3..43cc9ff8a2 100644 --- a/src/controllers/user.js +++ b/src/controllers/user.js @@ -297,7 +297,7 @@ api.cron = function(req, res, next) { error: "Cron caught", stack: (err.stack || err.message || err), body: req.body, headers: req.header, - auth: (req.headers['x-api-user'] + ' | ' + req.headers['x-api-key']), + auth: req.headers['x-api-user'], originalUrl: req.originalUrl, opStatus: opStatus });