From 0e09ae86aa742450d4d88e72fc875a82c524e11f Mon Sep 17 00:00:00 2001 From: Kelly Selden Date: Sat, 13 Dec 2014 11:03:17 -0500 Subject: [PATCH] 0.0.42 --- .bowerrc | 3 +++ README.md | 38 ++++++++++++++++++++++++++++++++------ app/index.html | 6 ++---- config/environment.js | 2 +- package.json | 2 +- tests/index.html | 7 +++---- 6 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 .bowerrc diff --git a/.bowerrc b/.bowerrc new file mode 100644 index 0000000..69fad35 --- /dev/null +++ b/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory": "bower_components" +} diff --git a/README.md b/README.md index 97a4b44..a7c8ec3 100644 --- a/README.md +++ b/README.md @@ -2,24 +2,50 @@ This README outlines the details of collaborating on this Ember application. +A short introduction of this app could easily go here. + +## Prerequisites + +You will need the following things properly installed on your computer. + +* [Git](http://git-scm.com/) +* [Node.js](http://nodejs.org/) (with NPM) and [Bower](http://bower.io/) + ## Installation -* `git clone` this repository +* `git clone ` this repository +* change into the new directory * `npm install` * `bower install` -## Running +## Running / Development * `ember server` * Visit your app at http://localhost:4200. -## Running Tests +### Code Generators + +Make use of the many generators for code, try `ember help generate` for more details + +### Running Tests * `ember test` * `ember test --server` -## Building +### Building + +* `ember build` (development) +* `ember build --environment production` (production) + +### Deploying + +Specify what it takes to deploy your app. + +## Further Reading / Useful Links -* `ember build` +* ember: http://emberjs.com/ +* ember-cli: http://www.ember-cli.com/ +* Development Browser Extensions + * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi) + * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/) -For more information on using ember-cli, visit [http://www.ember-cli.com/](http://www.ember-cli.com/). diff --git a/app/index.html b/app/index.html index 1df1d88..aaa2666 100644 --- a/app/index.html +++ b/app/index.html @@ -13,13 +13,11 @@ - diff --git a/config/environment.js b/config/environment.js index 24065b0..47490a8 100644 --- a/config/environment.js +++ b/config/environment.js @@ -27,7 +27,7 @@ module.exports = function(environment) { } if (environment === 'test') { - + ENV.baseURL = '/'; // Testem prefers this... } if (environment === 'production') { diff --git a/package.json b/package.json index b205656..7314898 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "body-parser": "^1.2.0", "broccoli-asset-rev": "0.0.17", "broccoli-ember-hbs-template-compiler": "^1.6.1", - "ember-cli": "0.0.41", + "ember-cli": "0.0.42", "ember-cli-ember-data": "0.1.0", "ember-cli-inject-live-reload": "^1.0.2", "ember-cli-ic-ajax": "0.1.1", diff --git a/tests/index.html b/tests/index.html index d376505..e837e1e 100644 --- a/tests/index.html +++ b/tests/index.html @@ -33,15 +33,14 @@
-