diff --git a/.travis.yml b/.travis.yml index 66dd107..70a305e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ cache: - node_modules before_install: - - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH - "npm config set spin false" - "npm install -g npm@^2" diff --git a/app/app.js b/app/app.js index 037963b..8d66b95 100644 --- a/app/app.js +++ b/app/app.js @@ -9,6 +9,7 @@ Ember.MODEL_FACTORY_INJECTIONS = true; App = Ember.Application.extend({ modulePrefix: config.modulePrefix, + podModulePrefix: config.podModulePrefix, Resolver: Resolver }); diff --git a/bower.json b/bower.json index eb8e9b7..28ecb4c 100644 --- a/bower.json +++ b/bower.json @@ -2,12 +2,12 @@ "name": "hymenobacterdotinfo", "dependencies": { "jquery": "~2.1.1", - "ember": "1.12.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-data": "1.0.0-beta.17", + "ember-data": "1.0.0-beta.16.1", "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4", - "ember-qunit": "0.3.3", + "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", diff --git a/package.json b/package.json index e251e84..d419e2f 100644 --- a/package.json +++ b/package.json @@ -22,21 +22,20 @@ "body-parser": "^1.12.2", "broccoli-asset-rev": "^2.0.2", "ember-can": "^0.4.0", - "ember-cli": "0.2.5", + "ember-cli": "0.2.3", "ember-cli-app-version": "0.3.3", "ember-cli-babel": "^5.0.0", "ember-cli-content-security-policy": "0.4.0", - "ember-cli-dependency-checker": "^1.0.0", + "ember-cli-dependency-checker": "0.0.8", "ember-cli-divshot": "^0.1.7", - "ember-cli-htmlbars": "0.7.6", + "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.13", + "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", - "ember-data": "1.0.0-beta.17", - "ember-disable-proxy-controllers": "^0.7.0", + "ember-cli-uglify": "1.0.1", + "ember-data": "1.0.0-beta.16.1", "ember-export-application-global": "^1.0.2", "express": "^4.12.3", "glob": "^4.5.3", diff --git a/public/crossdomain.xml b/public/crossdomain.xml index 0c16a7a..29a035d 100644 --- a/public/crossdomain.xml +++ b/public/crossdomain.xml @@ -1,15 +1,15 @@ - + - - + + - - + + diff --git a/public/robots.txt b/public/robots.txt index f591645..5debfa4 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -1,3 +1,2 @@ # http://www.robotstxt.org User-agent: * -Disallow: diff --git a/testem.json b/testem.json index 0f35392..42a4ddb 100644 --- a/testem.json +++ b/testem.json @@ -1,7 +1,6 @@ { "framework": "qunit", "test_page": "tests/index.html?hidepassed", - "disable_watching": true, "launch_in_ci": [ "PhantomJS" ],