From 2e498053e56b1fd14623a970b81b93a0910e468e Mon Sep 17 00:00:00 2001
From: Jordan Hawker <hawker.jordan@gmail.com>
Date: Sun, 30 Aug 2015 17:24:41 -0700
Subject: [PATCH 1/2] Fix date parsing in Firefox and other browsers that
 aren't as flexible as Chrome

---
 addon/models/tumblr-post.js      | 2 +-
 addon/serializers/tumblr-post.js | 1 +
 bower.json                       | 4 ++--
 package.json                     | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addon/models/tumblr-post.js b/addon/models/tumblr-post.js
index 6e2a8d5..3f0efa8 100644
--- a/addon/models/tumblr-post.js
+++ b/addon/models/tumblr-post.js
@@ -7,7 +7,7 @@ export default DS.Model.extend({
   post_url: attr('string'),
   type: attr('string'),
   timestamp: attr('number'),
-  date: attr('string'),
+  date: attr('date'),
   format: attr('string'),
   reblog_key: attr('string'),
   // tags
diff --git a/addon/serializers/tumblr-post.js b/addon/serializers/tumblr-post.js
index 0a2e7af..f662fd1 100644
--- a/addon/serializers/tumblr-post.js
+++ b/addon/serializers/tumblr-post.js
@@ -30,6 +30,7 @@ export default DS.RESTSerializer.extend({
   normalizePayload(payload) {
     if (payload.response && payload.response.posts) {
       const posts = payload.response.posts.map(function (post) {
+        post.date = new Date().toDateString(post.date);
         delete post.tags;
         return post;
       });
diff --git a/bower.json b/bower.json
index fab5b7a..5f6f12a 100644
--- a/bower.json
+++ b/bower.json
@@ -1,12 +1,12 @@
 {
   "name": "ember-tumblr",
   "dependencies": {
-    "ember": "1.13.8",
+    "ember": "1.13.9",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "0.2.0",
     "ember-data": "1.0.0-beta.18",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
-    "ember-qunit": "0.4.9",
+    "ember-qunit": "0.4.10",
     "ember-qunit-notifications": "0.0.7",
     "ember-resolver": "~0.1.18",
     "jquery": "~2.1.4",
diff --git a/package.json b/package.json
index 4c18b22..20ab3bd 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
   "devDependencies": {
     "broccoli-asset-rev": "~2.1.2",
     "ember-cli": "1.13.8",
-    "ember-cli-app-version": "0.5.0",
+    "ember-cli-app-version": "1.0.0",
     "ember-cli-dependency-checker": "~1.0.1",
     "ember-cli-deprecation-workflow": "0.1.4",
     "ember-cli-ic-ajax": "0.2.1",
@@ -48,7 +48,7 @@
   ],
   "dependencies": {
     "ember-cli-babel": "~5.1.3",
-    "ember-cli-htmlbars": "0.7.9"
+    "ember-cli-htmlbars": "1.0.0"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

From 618d2887d0ddf63b26db6f319eb533bca75a7bba Mon Sep 17 00:00:00 2001
From: Jordan Hawker <hawker.jordan@gmail.com>
Date: Sun, 30 Aug 2015 17:29:05 -0700
Subject: [PATCH 2/2] Update test script and package version

---
 .travis.yml  | 1 +
 package.json | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0fc09f8..2ed7457 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ cache:
 
 env:
   - EMBER_TRY_SCENARIO=default
+  - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
 
diff --git a/package.json b/package.json
index 20ab3bd..9ad3280 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-tumblr",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Ember Addon for integrating a Tumblr blog",
   "directories": {
     "doc": "doc",
@@ -9,8 +9,7 @@
   "scripts": {
     "start": "ember server",
     "build": "ember build",
-    "test": "ember test",
-    "testall": "ember try:testall"
+    "test": "ember try:testall"
   },
   "repository": {
     "type": "git",