Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop

gema-arta · Jan 6, 2015 · e416b03 · e416b03
2 parents f0c65be + b854663
commit e416b03
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
       });

diff --git 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 <a href='https://github.com/HabitRPG/habitrpg/issues' target='_blank'>Github</a>. 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 <a href='https://github.com/HabitRPG/habitrpg/issues/1057' target='_blank'>GitHub</a>. Thanks!
   tr
     td
       h5 Date Format Adjustment
-      p There's a new option under <a href='https://habitrpg.com/#/options/settings/settings' target='_blank'>Settings</a> 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 <a href='https://habitrpg.com/#/options/settings/settings' target='_blank'>Settings</a> 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