From 6e9fbec6e7b1a932017651550fce5fc9f4f90e93 Mon Sep 17 00:00:00 2001
From: jelhan <jeldrik@systemli.org>
Date: Thu, 2 Jul 2015 15:54:09 +0200
Subject: [PATCH] Update: ember 1.12 and ember-cli 0.2.7

---
 .travis.yml            |  1 +
 .watchmanconfig        |  3 +++
 bower.json             | 14 +++++++-------
 package.json           | 15 ++++++++-------
 public/crossdomain.xml | 18 +++++++++---------
 public/robots.txt      |  1 +
 testem.json            |  1 +
 7 files changed, 30 insertions(+), 23 deletions(-)
 create mode 100644 .watchmanconfig

diff --git a/.travis.yml b/.travis.yml
index 5ca4ed4..ca4c942 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ cache:
     - node_modules
 
 before_install:
+  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
   - "npm config set spin false"
   - "npm install -g npm@^2"
 
diff --git a/.watchmanconfig b/.watchmanconfig
new file mode 100644
index 0000000..5e9462c
--- /dev/null
+++ b/.watchmanconfig
@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp"]
+}
diff --git a/bower.json b/bower.json
index 90656a4..b2369d5 100644
--- a/bower.json
+++ b/bower.json
@@ -1,16 +1,16 @@
 {
   "name": "croodle",
   "dependencies": {
-    "jquery": "^1.11.1",
-    "ember": "1.11.0",
-    "ember-data": "1.0.0-beta.16.1",
-    "ember-resolver": "~0.1.15",
-    "loader.js": "ember-cli/loader.js#3.2.0",
+    "ember": "1.12.0",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
-    "ember-qunit": "0.3.0",
+    "ember-data": "1.0.0-beta.18",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
+    "ember-qunit": "0.3.3",
     "ember-qunit-notifications": "0.0.7",
+    "ember-resolver": "~0.1.15",
+    "jquery": "^1.11.1",
+    "loader.js": "ember-cli/loader.js#3.2.0",
     "qunit": "~1.17.1",
     "ember-i18n": "~3.0.1",
     "sjcl": "~1.0.0",
diff --git a/package.json b/package.json
index e984d21..3a1f2a5 100644
--- a/package.json
+++ b/package.json
@@ -23,20 +23,21 @@
     "broccoli-static-compiler": "~0.2.1",
     "connect-restreamer": "^1.0.1",
     "cors": "^2.5.3",
-    "ember-cli": "0.2.2",
+    "ember-cli": "0.2.7",
     "ember-cli-app-version": "0.3.3",
-    "ember-cli-babel": "^4.0.0",
+    "ember-cli-babel": "^5.0.0",
     "ember-cli-bootstrap-datepicker": "git://github.com/soulim/ember-cli-bootstrap-datepicker.git#5cc3fdf114cece954cbb4af60c5584e362c1cdc3",
     "ember-cli-build-info": "^0.1.0",
     "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "0.0.8",
-    "ember-cli-htmlbars": "0.7.4",
+    "ember-cli-dependency-checker": "^1.0.0",
+    "ember-cli-htmlbars": "0.7.6",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-less": "1.3.0",
-    "ember-cli-qunit": "0.3.9",
-    "ember-cli-uglify": "1.0.1",
-    "ember-data": "1.0.0-beta.16.1",
+    "ember-cli-qunit": "0.3.13",
+    "ember-cli-uglify": "^1.0.1",
+    "ember-data": "1.0.0-beta.18",
+    "ember-disable-proxy-controllers": "^1.0.0",
     "ember-easy-form-extensions": "0.2.8",
     "ember-export-application-global": "^1.0.2",
     "ember-radio-button": "^0.1.2",
diff --git a/public/crossdomain.xml b/public/crossdomain.xml
index 29a035d..0c16a7a 100644
--- a/public/crossdomain.xml
+++ b/public/crossdomain.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 <cross-domain-policy>
-    <!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
+  <!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
 
-    <!-- Most restrictive policy: -->
-    <site-control permitted-cross-domain-policies="none"/>
+  <!-- Most restrictive policy: -->
+  <site-control permitted-cross-domain-policies="none"/>
 
-    <!-- Least restrictive policy: -->
-    <!--
-    <site-control permitted-cross-domain-policies="all"/>
-    <allow-access-from domain="*" to-ports="*" secure="false"/>
-    <allow-http-request-headers-from domain="*" headers="*" secure="false"/>
-    -->
+  <!-- Least restrictive policy: -->
+  <!--
+  <site-control permitted-cross-domain-policies="all"/>
+  <allow-access-from domain="*" to-ports="*" secure="false"/>
+  <allow-http-request-headers-from domain="*" headers="*" secure="false"/>
+  -->
 </cross-domain-policy>
diff --git a/public/robots.txt b/public/robots.txt
index 5debfa4..f591645 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,2 +1,3 @@
 # http://www.robotstxt.org
 User-agent: *
+Disallow:
diff --git a/testem.json b/testem.json
index 05fb917..4d56583 100644
--- a/testem.json
+++ b/testem.json
@@ -1,6 +1,7 @@
 {
   "framework": "qunit",
   "test_page": "tests/index.html?hidepassed",
+  "disable_watching": true,
   "launch_in_ci": [
     "PhantomJS"
   ],