# HG changeset patch # User ymh # Date 1452900806 -3600 # Node ID 9765cf7cf81737bc0b46261cf838ae65c1d81e74 # Parent 3e93c61f6be053e722fdf3455f87d9447d7dad1f upgrade to ember-cli 2.2(beta) diff -r 3e93c61f6be0 -r 9765cf7cf817 server/bo_client/app/adapters/application.js --- a/server/bo_client/app/adapters/application.js Fri Jan 15 17:16:49 2016 +0100 +++ b/server/bo_client/app/adapters/application.js Sat Jan 16 00:33:26 2016 +0100 @@ -1,6 +1,6 @@ -import DS from 'ember-data'; +import RESTAdapter from 'ember-data/adapters/rest'; import ENV from 'bo-client/config/environment'; -export default DS.RESTAdapter.extend({ +export default RESTAdapter.extend({ namespace: ENV.baseURL.replace(/\/$/,"")+'/api/v1', }); diff -r 3e93c61f6be0 -r 9765cf7cf817 server/bo_client/app/app.js --- a/server/bo_client/app/app.js Fri Jan 15 17:16:49 2016 +0100 +++ b/server/bo_client/app/app.js Sat Jan 16 00:33:26 2016 +0100 @@ -1,5 +1,5 @@ import Ember from 'ember'; -import Resolver from 'ember/resolver'; +import Resolver from 'ember-resolver'; import loadInitializers from 'ember/load-initializers'; import config from './config/environment'; diff -r 3e93c61f6be0 -r 9765cf7cf817 server/bo_client/app/index.html --- a/server/bo_client/app/index.html Fri Jan 15 17:16:49 2016 +0100 +++ b/server/bo_client/app/index.html Sat Jan 16 00:33:26 2016 +0100 @@ -6,7 +6,7 @@ Corpus Parole - {{content-for 'head'}} + {{content-for "head"}} @@ -21,7 +21,7 @@ - {{content-for 'head-footer'}} + {{content-for "head-footer"}}