Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Ember to v2.10.0 #584

Merged
merged 1 commit into from Dec 7, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ember/.gitignore
@@ -1,4 +1,4 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
Expand Down
3 changes: 2 additions & 1 deletion ember/.travis.yml
Expand Up @@ -7,7 +7,8 @@ sudo: false

cache:
directories:
- node_modules
- $HOME/.npm
- $HOME/.cache # includes bowers cache

before_install:
- npm config set spin false
Expand Down
11 changes: 5 additions & 6 deletions ember/README.md
Expand Up @@ -7,10 +7,10 @@ A short introduction of this app could easily go here.

You will need the following things properly installed on your computer.

* [Git](http://git-scm.com/)
* [Node.js](http://nodejs.org/) (with NPM)
* [Bower](http://bower.io/)
* [Ember CLI](http://ember-cli.com/)
* [Git](https://git-scm.com/)
* [Node.js](https://nodejs.org/) (with NPM)
* [Bower](https://bower.io/)
* [Ember CLI](https://ember-cli.com/)
* [PhantomJS](http://phantomjs.org/)

## Installation
Expand Down Expand Up @@ -46,8 +46,7 @@ Specify what it takes to deploy your app.
## Further Reading / Useful Links

* [ember.js](http://emberjs.com/)
* [ember-cli](http://ember-cli.com/)
* [ember-cli](https://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/)

2 changes: 1 addition & 1 deletion ember/bower.json
@@ -1,7 +1,7 @@
{
"name": "skylines",
"dependencies": {
"ember": "~2.10.0-beta.3",
"ember": "~2.10.0",
"ember-cli-shims": "0.1.3",
"remarkable": "^1.6.2",
"ember-mocha-adapter": "~0.3.1",
Expand Down
18 changes: 9 additions & 9 deletions ember/package.json
Expand Up @@ -2,26 +2,22 @@
"name": "skylines",
"version": "0.0.0",
"description": "Small description for skylines goes here",
"private": true,
"license": "MIT",
"author": "",
"directories": {
"doc": "doc",
"test": "tests"
},
"repository": "",
"scripts": {
"build": "ember build",
"start": "ember server",
"test": "ember test"
},
"repository": "",
"engines": {
"node": ">= 0.12.0"
},
"author": "",
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.4.5",
"ember-ajax": "^2.4.1",
"ember-cli": "^2.9.1",
"ember-cli": "2.10.0",
"ember-cli-active-link-wrapper": "^0.3.1",
"ember-cli-app-version": "^2.0.0",
"ember-cli-babel": "^5.1.7",
Expand Down Expand Up @@ -55,5 +51,9 @@
"ember-simple-auth": "1.1.0",
"ember-truth-helpers": "1.2.0",
"loader.js": "^4.0.10"
}
},
"engines": {
"node": ">= 0.12.0"
},
"private": true
}