diff --git a/.editorconfig b/.editorconfig index 47c5438..219985c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,22 +13,8 @@ insert_final_newline = true indent_style = space indent_size = 2 -[*.js] -indent_style = space -indent_size = 2 - [*.hbs] insert_final_newline = false -indent_style = space -indent_size = 2 - -[*.css] -indent_style = space -indent_size = 2 - -[*.html] -indent_style = space -indent_size = 2 [*.{diff,md}] trim_trailing_whitespace = false diff --git a/.gitignore b/.gitignore index 86fceae..5ad14dd 100644 --- a/.gitignore +++ b/.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 @@ -13,5 +13,5 @@ /connect.lock /coverage/* /libpeerconnection.log -npm-debug.log +npm-debug.log* testem.log diff --git a/.travis.yml b/.travis.yml index e072a03..a75f20e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,13 +7,13 @@ sudo: false cache: directories: - - node_modules + - $HOME/.npm + - $HOME/.cache # includes bowers cache before_install: - npm config set spin false - - npm install -g bower + - npm install -g bower phantomjs-prebuilt - bower --version - - npm install phantomjs-prebuilt - phantomjs --version install: diff --git a/README.md b/README.md index 795c0e6..498cf90 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Ccdb-web +# ccdb-web This README outlines the details of collaborating on this Ember application. A short introduction of this app could easily go here. @@ -7,16 +7,16 @@ 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 * `git clone ` this repository -* change into the new directory +* `cd ccdb-web` * `npm install` * `bower install` @@ -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/) - diff --git a/app/templates/application.hbs b/app/templates/application.hbs new file mode 100644 index 0000000..372fe27 --- /dev/null +++ b/app/templates/application.hbs @@ -0,0 +1,5 @@ +{{!-- The following component displays Ember's default welcome message. --}} +{{welcome-page}} +{{!-- Feel free to remove this! --}} + +{{outlet}} diff --git a/bower.json b/bower.json index 90b3389..2bb31d4 100644 --- a/bower.json +++ b/bower.json @@ -1,10 +1,5 @@ { "name": "ccdb-web", "dependencies": { - "ember": "~2.7.0", - "ember-cli-shims": "0.1.1", - "ember-qunit-notifications": "0.1.0", - "pretender": "~1.1.0", - "Faker": "~3.1.0" } } diff --git a/config/environment.js b/config/environment.js index 7eda992..715a054 100644 --- a/config/environment.js +++ b/config/environment.js @@ -10,6 +10,10 @@ module.exports = function(environment) { FEATURES: { // Here you can enable experimental features on an ember canary build // e.g. 'with-controller': true + }, + EXTEND_PROTOTYPES: { + // Prevent Ember Data from overriding Date.parse. + Date: false } }, diff --git a/package.json b/package.json index 4c8c793..b3509b3 100644 --- a/package.json +++ b/package.json @@ -2,50 +2,53 @@ "name": "ccdb-web", "version": "0.0.0", "description": "Small description for ccdb-web 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.10.0" - }, - "author": "", - "license": "MIT", "devDependencies": { - "broccoli-asset-rev": "^2.4.2", - "ember-ajax": "^2.0.1", - "ember-cli": "2.7.0", - "ember-cli-app-version": "^1.0.0", - "ember-cli-babel": "^5.1.6", - "ember-cli-dependency-checker": "^1.2.0", + "broccoli-asset-rev": "^2.4.5", + "ember-ajax": "^2.4.1", + "ember-cli": "2.11.1", + "ember-cli-app-version": "^2.0.0", + "ember-cli-babel": "^5.1.7", + "ember-cli-dependency-checker": "^1.3.0", "ember-cli-flash": "1.3.16", - "ember-cli-htmlbars": "^1.0.3", - "ember-cli-htmlbars-inline-precompile": "^0.3.1", - "ember-cli-inject-live-reload": "^1.4.0", - "ember-cli-jshint": "^1.0.0", + "ember-cli-htmlbars": "^1.1.1", + "ember-cli-htmlbars-inline-precompile": "^0.3.6", + "ember-cli-inject-live-reload": "^1.4.1", + "ember-cli-jshint": "^2.0.1", "ember-cli-mirage": "0.2.1", "ember-cli-moment-shim": "2.0.0", - "ember-cli-qunit": "^2.0.0", + "ember-cli-qunit": "^3.0.1", "ember-cli-release": "^0.2.9", + "ember-cli-shims": "^1.0.2", "ember-cli-sri": "^2.1.0", "ember-cli-test-loader": "^1.1.0", "ember-cli-uglify": "^1.2.0", - "ember-data": "^2.7.0", - "ember-django-adapter": "1.1.2", + "ember-data": "^2.11.0", "ember-export-application-global": "^1.0.5", - "ember-load-initializers": "^0.5.1", + "ember-load-initializers": "^0.6.0", + "ember-resolver": "^2.0.3", + "ember-source": "~2.11.0", + "ember-django-adapter": "1.1.2", "ember-moment": "7.0.0-beta.3", "ember-power-select": "1.0.0-alpha.14", "ember-power-select-with-create": "0.1.10", - "ember-resolver": "^2.0.3", "ember-simple-auth": "1.1.0", - "loader.js": "^4.0.1" - } + "ember-welcome-page": "^2.0.2", + "loader.js": "^4.0.10" + }, + "engines": { + "node": ">= 0.12.0" + }, + "private": true } diff --git a/tests/index.html b/tests/index.html index 85cff10..bcfe81e 100644 --- a/tests/index.html +++ b/tests/index.html @@ -21,7 +21,7 @@ {{content-for "body"}} {{content-for "test-body"}} - +