# HG changeset patch
# User nowmad@23.1.168.192.in-addr.arpa
# Date 1453301607 -3600
# Node ID f0609941aa9825942ce4d359873e0b47c63b2516
# Parent  89be68e13215221848cdd67d8d0719f13d2922ee
update libraries and go ember 2.2.0

diff -r 89be68e13215 -r f0609941aa98 cms/app-client/app/adapters/application.js
--- a/cms/app-client/app/adapters/application.js	Wed Jan 20 13:04:27 2016 +0100
+++ b/cms/app-client/app/adapters/application.js	Wed Jan 20 15:53:27 2016 +0100
@@ -1,16 +1,17 @@
 import DS from 'ember-data';
+export { default } from 'ember-data-fixture-adapter';
 
-export default DS.FixtureAdapter.extend({
-  host: 'http://127.0.0.1',
-  namespace: 'api',
-  queryFixtures: function(records, query, type) {
-    return records.filter(function(record) {
-        for(var key in query) {
-            if (!query.hasOwnProperty(key)) { continue; }
-            var value = query[key];
-            if (record[key] !== value) { return false; }
-        }
-        return true;
-    });
-  }
-});
+// export default DS.FixtureAdapter.extend({
+//   host: 'http://127.0.0.1',
+//   namespace: 'api',
+//   queryFixtures: function(records, query) {
+//     return records.filter(function(record) {
+//         for(var key in query) {
+//             if (!query.hasOwnProperty(key)) { continue; }
+//             var value = query[key];
+//             if (record[key] !== value) { return false; }
+//         }
+//         return true;
+//     });
+//   }
+// });
diff -r 89be68e13215 -r f0609941aa98 cms/app-client/app/models/sound.js
--- a/cms/app-client/app/models/sound.js	Wed Jan 20 13:04:27 2016 +0100
+++ b/cms/app-client/app/models/sound.js	Wed Jan 20 15:53:27 2016 +0100
@@ -7,8 +7,8 @@
   type: DS.attr('string'),
   spatial: DS.attr('string'),
   language: DS.attr('string'),
-  created: DS.attr('integer'),
-  master: DS.attr('url')
+  created: DS.attr('number'),
+  master: DS.attr('string')
 });
 
 Sound.reopenClass({
diff -r 89be68e13215 -r f0609941aa98 cms/app-client/bower.json
--- a/cms/app-client/bower.json	Wed Jan 20 13:04:27 2016 +0100
+++ b/cms/app-client/bower.json	Wed Jan 20 15:53:27 2016 +0100
@@ -1,19 +1,26 @@
 {
   "name": "app-client",
   "dependencies": {
-    "ember": "1.13.7",
-    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
+    "ember": "2.2.0",
+    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.6",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": "1.13.8",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
-    "ember-qunit": "0.4.9",
-    "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.18",
+    "ember-data": ">=2.1.0",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.7",
+    "ember-qunit": ">=0.4.9",
+    "ember-qunit-notifications": ">=0.0.7",
+    "ember-resolver": ">=0.1.18",
     "jquery": "^1.11.3",
-    "loader.js": "ember-cli/loader.js#3.2.1",
+    "loader.js": "ember-cli/loader.js#3.5.0",
     "qunit": "~1.18.0",
-    "bootstrap-sass": "~3.3.5",
+    "bootstrap-sass": "bootstrap-sass-official#~3.3.6",
     "ammap3": "~3.18.6",
     "font-awesome": "~4.4.0"
+  },
+  "resolutions": {
+    "qunit-notifications": "~0.1.0",
+    "ember-load-initializers": "0.1.7",
+    "loader.js": "3.5.0",
+    "ember-cli-shims": "0.0.6",
+    "ember": "2.2.0"
   }
 }
diff -r 89be68e13215 -r f0609941aa98 cms/app-client/config/environment.js
--- a/cms/app-client/config/environment.js	Wed Jan 20 13:04:27 2016 +0100
+++ b/cms/app-client/config/environment.js	Wed Jan 20 15:53:27 2016 +0100
@@ -25,6 +25,15 @@
     // ENV.APP.LOG_TRANSITIONS = true;
     // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
     // ENV.APP.LOG_VIEW_LOOKUPS = true;
+    ENV.contentSecurityPolicy = {
+      'default-src': "'none'",
+      'script-src': "'self' *",
+      'font-src': "'self'",
+      'connect-src': "'self' *",
+      'img-src': "'self'",
+      'style-src': "'self' *",
+      'media-src': "'self'"
+    };
   }
 
   if (environment === 'test') {
diff -r 89be68e13215 -r f0609941aa98 cms/app-client/package.json
--- a/cms/app-client/package.json	Wed Jan 20 13:04:27 2016 +0100
+++ b/cms/app-client/package.json	Wed Jan 20 15:53:27 2016 +0100
@@ -37,6 +37,7 @@
     "ember-cli-sri": "^1.0.3",
     "ember-cli-uglify": "^1.2.0",
     "ember-data": "1.13.8",
+    "ember-data-fixture-adapter": "1.13.0",
     "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.3",
     "ember-wormhole": "0.3.4"