From f3a700462dc93a7063730c1bccf5da93d02ba51b Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 24 Apr 2015 11:07:27 -0800 Subject: [PATCH] ember-cli 0.2.3 --- app/app.js | 4 +++- bower.json | 12 ++++++------ package.json | 9 ++++----- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/app.js b/app/app.js index 757df38..8d66b95 100644 --- a/app/app.js +++ b/app/app.js @@ -3,9 +3,11 @@ import Resolver from 'ember/resolver'; import loadInitializers from 'ember/load-initializers'; import config from './config/environment'; +var App; + Ember.MODEL_FACTORY_INJECTIONS = true; -var App = Ember.Application.extend({ +App = Ember.Application.extend({ modulePrefix: config.modulePrefix, podModulePrefix: config.podModulePrefix, Resolver: Resolver diff --git a/bower.json b/bower.json index e3f4047..28ecb4c 100644 --- a/bower.json +++ b/bower.json @@ -2,15 +2,15 @@ "name": "hymenobacterdotinfo", "dependencies": { "jquery": "~2.1.1", - "ember": "1.11.0", - "ember-data": "1.0.0-beta.16.1", - "ember-resolver": "~0.1.15", - "loader.js": "ember-cli/loader.js#3.2.0", + "ember": "1.11.1", "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", - "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2", - "ember-qunit": "0.3.0", + "ember-data": "1.0.0-beta.16.1", + "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4", + "ember-qunit": "0.3.1", "ember-qunit-notifications": "0.0.7", + "ember-resolver": "~0.1.15", + "loader.js": "ember-cli/loader.js#3.2.0", "qunit": "~1.17.1", "flakes": "~1.0.0", "ember-simple-auth": "~0.7.3", diff --git a/package.json b/package.json index 36ae436..d419e2f 100644 --- a/package.json +++ b/package.json @@ -21,18 +21,17 @@ "devDependencies": { "body-parser": "^1.12.2", "broccoli-asset-rev": "^2.0.2", - "connect-restreamer": "^1.0.2", "ember-can": "^0.4.0", - "ember-cli": "0.2.2", + "ember-cli": "0.2.3", "ember-cli-app-version": "0.3.3", - "ember-cli-babel": "^4.0.0", + "ember-cli-babel": "^5.0.0", "ember-cli-content-security-policy": "0.4.0", "ember-cli-dependency-checker": "0.0.8", "ember-cli-divshot": "^0.1.7", "ember-cli-htmlbars": "0.7.4", "ember-cli-ic-ajax": "0.1.1", "ember-cli-inject-live-reload": "^1.3.0", - "ember-cli-qunit": "0.3.9", + "ember-cli-qunit": "0.3.10", "ember-cli-simple-auth": "^0.7.2", "ember-cli-simple-auth-token": "^0.6.0", "ember-cli-uglify": "1.0.1", @@ -40,7 +39,7 @@ "ember-export-application-global": "^1.0.2", "express": "^4.12.3", "glob": "^4.5.3", - "jsonwebtoken": "^4.2.1", + "jsonwebtoken": "^5.0.0", "morgan": "^1.5.2" } }