Update Ember.js to 2.2.0
This commit is contained in:
Piotr Sarnacki
parent
efaae492c4
commit
ed71aa133e
|
|
@ -1,5 +1,5 @@
|
|||
import Ember from 'ember';
|
||||
import Resolver from 'ember/resolver';
|
||||
import Resolver from 'ember-resolver';
|
||||
import loadInitializers from 'ember/load-initializers';
|
||||
import config from './config/environment';
|
||||
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link rel="icon" type="image/png" href="/images/favicon.png" />
|
||||
|
||||
{{content-for 'head'}}
|
||||
{{content-for "head"}}
|
||||
|
||||
<link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,800' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="assets/vendor.css">
|
||||
<link rel="stylesheet" href="assets/travis.css">
|
||||
<link rel="mask-icon" href="images/favicon.svg" color="black">
|
||||
|
||||
{{content-for 'head-footer'}}
|
||||
{{content-for "head-footer"}}
|
||||
</head>
|
||||
<body>
|
||||
<noscript>
|
||||
|
|
@ -30,12 +30,12 @@
|
|||
</div>
|
||||
</div>
|
||||
</noscript>
|
||||
{{content-for 'body'}}
|
||||
{{content-for "body"}}
|
||||
|
||||
<script src="assets/vendor.js"></script>
|
||||
<script src="assets/travis.js"></script>
|
||||
|
||||
{{content-for 'body-footer'}}
|
||||
{{content-for "body-footer"}}
|
||||
|
||||
<a href="javascript:void(0)" class="feedback-button" id="userlikeCustomTab" data-right="20" data-bottom="50" data-orientation="top">Do you have a question?</a>
|
||||
</body>
|
||||
|
|
|
|||
11
bower.json
11
bower.json
|
|
@ -1,15 +1,15 @@
|
|||
{
|
||||
"name": "travis",
|
||||
"dependencies": {
|
||||
"ember": "1.13.10",
|
||||
"ember-cli-shims": "0.0.6",
|
||||
"ember-cli-test-loader": "0.2.1",
|
||||
"ember-data": "1.13.15",
|
||||
"ember": "2.2.0",
|
||||
"ember-cli-shims": "0.1.0",
|
||||
"ember-cli-test-loader": "0.2.2",
|
||||
"ember-load-initializers": "0.1.7",
|
||||
"ember-qunit": "0.4.16",
|
||||
"ember-qunit-notifications": "0.1.0",
|
||||
"jquery": "~1.11.3",
|
||||
"loader.js": "ember-cli/loader.js#3.2.1",
|
||||
"loader.js": "^3.5.0",
|
||||
"qunit": "~1.20.0",
|
||||
"visibilityjs": "~1.2.1",
|
||||
"JavaScript-MD5": "~1.1.0",
|
||||
|
|
@ -18,5 +18,8 @@
|
|||
"pusher": "~2.2.3",
|
||||
"pretender": "0.1.0",
|
||||
"ember-resolver": "~0.1.20"
|
||||
},
|
||||
"resolutions": {
|
||||
"ember": "2.2.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,20 +21,20 @@
|
|||
"devDependencies": {
|
||||
"broccoli-asset-rev": "^2.2.0",
|
||||
"broccoli-sass": "0.6.6",
|
||||
"ember-cli": "1.13.12",
|
||||
"ember-ajax": "0.7.1",
|
||||
"ember-cli": "2.2.0-beta.6",
|
||||
"ember-cli-app-version": "^1.0.0",
|
||||
"ember-cli-autoprefixer": "^0.3.0",
|
||||
"ember-cli-babel": "5.1.5",
|
||||
"ember-cli-dependency-checker": "^1.1.0",
|
||||
"ember-cli-dependency-checker": "^1.2.0",
|
||||
"ember-cli-deprecation-workflow": "0.1.5",
|
||||
"ember-cli-document-title": "0.2.0",
|
||||
"ember-cli-htmlbars": "1.0.1",
|
||||
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
|
||||
"ember-cli-ic-ajax": "0.2.4",
|
||||
"ember-cli-inject-live-reload": "^1.3.1",
|
||||
"ember-cli-inline-images": "^0.0.4",
|
||||
"ember-cli-pretender": "0.3.1",
|
||||
"ember-cli-qunit": "^1.0.4",
|
||||
"ember-cli-qunit": "^1.1.0",
|
||||
"ember-cli-release": "0.2.8",
|
||||
"ember-cli-sauce": "^1.1.0",
|
||||
"ember-cli-uglify": "1.2.0",
|
||||
|
|
@ -42,6 +42,7 @@
|
|||
"ember-data-filter": "1.13.0",
|
||||
"ember-disable-proxy-controllers": "^1.0.1",
|
||||
"ember-export-application-global": "^1.0.4",
|
||||
"ember-resolver": "^2.0.3",
|
||||
"ember-try": "0.0.7",
|
||||
"emberx-select": "2.0.2"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import Resolver from 'ember/resolver';
|
||||
import Resolver from 'ember-resolver';
|
||||
import config from '../../config/environment';
|
||||
|
||||
const resolver = Resolver.create();
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
<meta name="description" content="Travis CI - Continuous Integration - Test and Deploy with Confidence">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
|
||||
{{content-for 'head'}}
|
||||
{{content-for 'test-head'}}
|
||||
{{content-for "head"}}
|
||||
{{content-for "test-head"}}
|
||||
|
||||
<link rel="stylesheet" href="assets/vendor.css">
|
||||
<link rel="stylesheet" href="assets/travis.css">
|
||||
|
|
@ -23,21 +23,21 @@
|
|||
}
|
||||
</style>
|
||||
|
||||
{{content-for 'head-footer'}}
|
||||
{{content-for 'test-head-footer'}}
|
||||
{{content-for "head-footer"}}
|
||||
{{content-for "test-head-footer"}}
|
||||
</head>
|
||||
<body>
|
||||
|
||||
{{content-for 'body'}}
|
||||
{{content-for 'test-body'}}
|
||||
{{content-for "body"}}
|
||||
{{content-for "test-body"}}
|
||||
<script src="testem.js"></script>
|
||||
<script src="assets/vendor.js"></script>
|
||||
<script src="assets/test-support.js"></script>
|
||||
<script src="assets/travis.js"></script>
|
||||
<script src="testem.js"></script>
|
||||
<script src="assets/tests.js"></script>
|
||||
<script src="assets/test-loader.js"></script>
|
||||
|
||||
{{content-for 'body-footer'}}
|
||||
{{content-for 'test-body-footer'}}
|
||||
{{content-for "body-footer"}}
|
||||
{{content-for "test-body-footer"}}
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user