0.1.2

ember-cli · Dec 13, 2014 · 0e6a683 · 0e6a683
1 parent c97633f
commit 0e6a683
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,7 @@
 
 # dependencies
 /node_modules
-/bower_components/*
+/bower_components
 
 # misc
 /.sass-cache

diff --git a/.jshintrc b/.jshintrc
@@ -1,9 +1,9 @@
 {
-  "predef": {
-    "document": true,
-    "window": true,
-    "-Promise": true
-  },
+  "predef": [
+    "document",
+    "window",
+    "-Promise"
+  ],
   "browser" : true,
   "boss" : true,
   "curly": true,

diff --git a/app/index.html b/app/index.html
@@ -13,6 +13,8 @@
     <link rel="stylesheet" href="assets/my-app.css">
   </head>
   <body>
+    {{content-for 'body'}}
+
     <script src="assets/vendor.js"></script>
     <script src="assets/my-app.js"></script>
   </body>

diff --git a/package.json b/package.json
@@ -19,12 +19,13 @@
   "license": "MIT",
   "devDependencies": {
     "body-parser": "^1.2.0",
-    "broccoli-asset-rev": "0.3.0",
+    "broccoli-asset-rev": "0.3.1",
     "broccoli-ember-hbs-template-compiler": "^1.6.1",
-    "ember-cli": "0.1.1",
-    "ember-cli-content-security-policy": "0.2.0",
+    "ember-cli": "0.1.2",
+    "ember-cli-content-security-policy": "0.3.0",
+    "ember-export-application-global": "^1.0.0",
     "ember-cli-ic-ajax": "0.1.1",
-    "ember-cli-inject-live-reload": "^1.2.2",
+    "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-qunit": "0.1.0",
     "ember-data": "1.0.0-beta.10",
     "express": "^4.8.5",

diff --git a/tests/index.html b/tests/index.html
@@ -8,6 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     {{content-for 'head'}}
+    {{content-for 'test-head'}}
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/my-app.css">
@@ -33,6 +34,8 @@
     <div id="qunit"></div>
     <div id="qunit-fixture"></div>
 
+    {{content-for 'body'}}
+    {{content-for 'test-body'}}
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/my-app.js"></script>