Merge changes after run ember init

gloit · Oct 21, 2014 · 07c811b · 07c811b
1 parent 8de33dd
commit 07c811b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,11 +6,12 @@
 
 # dependencies
 /node_modules
-/bower_components/*
+/bower_components
 
 # misc
 /.sass-cache
 /connect.lock
+/coverage/*
 /libpeerconnection.log
 .DS_Store
 Thumbs.db

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,10 @@
 *Gloit App 0.3.0 (2014)*
 
+* Add a new component `model-form` for creating a form for models;
+* Create some mixins for define routes of models;
 * Add ember-devtools;
 * Extract config from LoginController to config/environment.js;
-* Upgrade ember-cli to 0.1.1;
+* Upgrade ember-cli to 0.1.2 and ember-data to 1.0.0-beta.11;
 * Add a default pollster.
 
 *Gloit App 0.2.0 (Jun 28, 2014)*

diff --git a/app/index.html b/app/index.html
@@ -20,6 +20,8 @@
     <link rel="stylesheet" href="assets/gloit-app.css">
   </head>
   <body>
+    {{content-for 'body'}}
+
     <!--[if (IE 8)]>
     <script>
       window.Ember = { ENV: { STUB_OBJECT_CREATE: true } };

diff --git a/package.json b/package.json
@@ -19,20 +19,19 @@
   "license": "MIT",
   "devDependencies": {
     "body-parser": "^1.2.0",
-    "broccoli-asset-rev": "0.3.0",
-    "broccoli-coffee": "^0.1.0",
-    "broccoli-ember-hbs-template-compiler": "^1.6.1",
-    "broccoli-emblem-compiler": "^0.3.16",
-    "broccoli-less-single": "^0.1.4",
-    "broccoli-merge-trees": "^0.1.4",
-    "broccoli-static-compiler": "^0.1.4",
-    "ember-cli": "0.1.1",
+    "broccoli-asset-rev": "0.3.1",
+    "broccoli-ember-hbs-template-compiler": "^1.6.2",
+    "broccoli-emblem-compiler": "^0.3.18",
+    "broccoli-merge-trees": "^0.2.1",
+    "broccoli-static-compiler": "^0.2.1",
+    "ember-cli": "^0.1.2",
     "ember-cli-coffeescript": "0.0.4",
     "ember-cli-components": "git://github.com/towerhe/ember-cli-components.git",
-    "ember-cli-content-security-policy": "0.2.0",
+    "ember-cli-content-security-policy": "0.3.0",
     "ember-cli-divshot": "^0.1.5",
     "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-less": "1.0.4",
     "ember-cli-loading-slider": "^1.0.2",
     "ember-cli-qunit": "0.1.0",
     "ember-cli-simple-auth": "git://github.com/simplabs/ember-cli-simple-auth.git",

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/gloit-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/gloit-app.js"></script>