Skip to content

Commit 7a0f77d

Browse files
committed
Update to ember-cli 0.2.7
1 parent 7cfc5fa commit 7a0f77d

File tree

7 files changed

+36
-28
lines changed

7 files changed

+36
-28
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ cache:
1010
- node_modules
1111

1212
before_install:
13+
- export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
1314
- "npm config set spin false"
1415
- "npm install -g npm@^2"
1516

.watchmanconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"ignore_dirs": ["tmp"]
3+
}

bower.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"name": "ember-cli-jquery-ui-example",
33
"dependencies": {
4-
"jquery": "1.11.1",
5-
"ember": "1.11.1",
6-
"ember-data": "1.0.0-beta.14.1",
7-
"ember-resolver": "0.1.15",
8-
"loader.js": "ember-cli/loader.js#3.2.0",
4+
"ember": "1.12.0",
95
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
10-
"ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.3",
6+
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
7+
"ember-data": "1.0.0-beta.18",
118
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
12-
"ember-qunit": "0.3.1",
9+
"ember-qunit": "0.3.3",
1310
"ember-qunit-notifications": "0.0.7",
14-
"qunit": "1.17.1",
11+
"ember-resolver": "~0.1.15",
12+
"jquery": "^1.11.1",
13+
"loader.js": "ember-cli/loader.js#3.2.0",
14+
"qunit": "~1.17.1",
1515
"jquery-ui": "1.11.1"
1616
}
1717
}

package.json

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-cli-jquery-ui-example",
3-
"version": "0.0.14",
3+
"version": "0.0.17",
44
"private": true,
55
"directories": {
66
"doc": "doc",
@@ -18,18 +18,20 @@
1818
"author": "",
1919
"license": "MIT",
2020
"devDependencies": {
21-
"broccoli-asset-rev": "2.0.2",
22-
"ember-cli": "0.2.3",
21+
"broccoli-asset-rev": "^2.0.2",
22+
"ember-cli": "0.2.7",
2323
"ember-cli-app-version": "0.3.3",
24+
"ember-cli-babel": "^5.0.0",
2425
"ember-cli-content-security-policy": "0.4.0",
25-
"ember-cli-dependency-checker": "0.0.8",
26-
"ember-cli-htmlbars": "0.7.4",
26+
"ember-cli-dependency-checker": "^1.0.0",
27+
"ember-cli-htmlbars": "0.7.6",
2728
"ember-cli-ic-ajax": "0.1.1",
28-
"ember-cli-inject-live-reload": "1.3.0",
29-
"ember-cli-jquery-ui": "latest",
30-
"ember-cli-qunit": "0.3.10",
31-
"ember-cli-uglify": "1.0.1",
32-
"ember-data": "1.0.0-beta.16.1",
33-
"ember-export-application-global": "1.0.2"
29+
"ember-cli-inject-live-reload": "^1.3.0",
30+
"ember-cli-qunit": "0.3.13",
31+
"ember-cli-uglify": "^1.0.1",
32+
"ember-data": "1.0.0-beta.18",
33+
"ember-disable-proxy-controllers": "^1.0.0",
34+
"ember-export-application-global": "^1.0.2",
35+
"ember-cli-jquery-ui": "latest"
3436
}
3537
}

public/crossdomain.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0"?>
22
<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
33
<cross-domain-policy>
4-
<!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
4+
<!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
55

6-
<!-- Most restrictive policy: -->
7-
<site-control permitted-cross-domain-policies="none"/>
6+
<!-- Most restrictive policy: -->
7+
<site-control permitted-cross-domain-policies="none"/>
88

9-
<!-- Least restrictive policy: -->
10-
<!--
11-
<site-control permitted-cross-domain-policies="all"/>
12-
<allow-access-from domain="*" to-ports="*" secure="false"/>
13-
<allow-http-request-headers-from domain="*" headers="*" secure="false"/>
14-
-->
9+
<!-- Least restrictive policy: -->
10+
<!--
11+
<site-control permitted-cross-domain-policies="all"/>
12+
<allow-access-from domain="*" to-ports="*" secure="false"/>
13+
<allow-http-request-headers-from domain="*" headers="*" secure="false"/>
14+
-->
1515
</cross-domain-policy>

public/robots.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# http://www.robotstxt.org
22
User-agent: *
3+
Disallow:

testem.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"framework": "qunit",
33
"test_page": "tests/index.html?hidepassed",
4+
"disable_watching": true,
45
"launch_in_ci": [
56
"PhantomJS"
67
],

0 commit comments

Comments
 (0)