# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1454708470 -3600
# Node ID dbcacab69cfc50488dab4b94454aaae2e95db84b
# Parent  7abc74acf392ce4af9bfc5b1e75590f382f88165
upgrade ember version to v2.3.1 for bo-client

diff -r 7abc74acf392 -r dbcacab69cfc server/bo_client/app/app.js
--- a/server/bo_client/app/app.js	Fri Feb 05 17:01:09 2016 +0100
+++ b/server/bo_client/app/app.js	Fri Feb 05 22:41:10 2016 +0100
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import Resolver from 'ember-resolver';
-import loadInitializers from 'ember/load-initializers';
+import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
 var App;
diff -r 7abc74acf392 -r dbcacab69cfc server/bo_client/bower.json
--- a/server/bo_client/bower.json	Fri Feb 05 17:01:09 2016 +0100
+++ b/server/bo_client/bower.json	Fri Feb 05 22:41:10 2016 +0100
@@ -1,8 +1,9 @@
 {
   "name": "bo-client",
   "dependencies": {
-    "ember": "2.2.0",
+    "ember": "2.3.1",
     "ember-cli-shims": "0.1.0",
+    "ember-cli-test-loader": "0.2.2",
     "ember-load-initializers": "0.1.7",
     "ember-qunit-notifications": "0.1.0",
     "jquery": "1.11.3",
@@ -12,10 +13,10 @@
     "font-awesome": "~4.5.0",
     "typeahead.js": "~0.11.1",
     "urijs": "URIjs#~1.17.0",
-    "store": "https://github.com/marcuswestin/store.js.git#master"
+    "store": "https://github.com/marcuswestin/store.js.git#v1.3.20"
   },
   "resolutions": {
-    "ember": "2.2.0",
+    "ember": "2.3.1",
     "qunit-notifications": "~0.1.0"
   }
 }
diff -r 7abc74acf392 -r dbcacab69cfc server/bo_client/package.json
--- a/server/bo_client/package.json	Fri Feb 05 17:01:09 2016 +0100
+++ b/server/bo_client/package.json	Fri Feb 05 22:41:10 2016 +0100
@@ -19,31 +19,33 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "bower": "^1.6.8",
+    "bower": "^1.7.6",
     "broccoli-asset-rev": "^2.3.0",
     "broccoli-funnel": "^1.0.1",
     "broccoli-merge-trees": "^1.0.0",
+    "broccoli-static-compiler": "^0.2.2",
     "ember-aupac-typeahead": "2.0.4",
     "ember-ajax": "0.7.1",
-    "ember-cli": "2.2.0-beta.6",
-    "ember-cli-app-version": "1.0.0",
+    "ember-cli": "2.3.0-beta.2",
+    "ember-cli-app-version": "^1.0.0",
     "ember-cli-babel": "^5.1.6",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "^1.2.0",
-    "ember-cli-font-awesome": "1.3.0",
-    "ember-cli-htmlbars": "1.0.1",
+    "ember-cli-font-awesome": "^1.3.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-qunit": "^1.1.0",
+    "ember-cli-qunit": "^1.2.1",
     "ember-cli-release": "0.2.8",
     "ember-cli-sass": "5.2.0",
     "ember-cli-sri": "^2.0.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-component-css": "0.1.6",
-    "ember-data": "2.3.0",
+    "ember-data": "^2.3.1",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.5",
+    "ember-load-initializers": "^0.5.0",
     "ember-resolver": "^2.0.3",
     "ember-i18n": "4.2.0",
     "ember-lodash": "0.0.6",
@@ -51,11 +53,11 @@
     "express": "^4.13.3",
     "glob": "^6.0.1",
     "http-proxy": "^1.12.0",
+    "loader.js": "^4.0.0",
     "morgan": "^1.6.1",
     "npm-check-updates": "^2.5.1",
     "walk-sync": "^0.2.6"
   },
   "dependencies": {
-    "broccoli-static-compiler": "^0.2.2"
   }
 }
diff -r 7abc74acf392 -r dbcacab69cfc server/src/app/Console/Commands/ImportCocoonRDF.php
--- a/server/src/app/Console/Commands/ImportCocoonRDF.php	Fri Feb 05 17:01:09 2016 +0100
+++ b/server/src/app/Console/Commands/ImportCocoonRDF.php	Fri Feb 05 22:41:10 2016 +0100
@@ -80,7 +80,7 @@
         $raw = $this->option('raw');
 
         $this->comment("Skipping $skip records");
-        $this->comment("Recording raw queries: $raw");
+        $this->comment("Recording raw queries: ".($raw?'TRUE':'FALSE'));
 
         $gs = new \EasyRdf\Sparql\Client(Config::get('corpusparole.sesame_query_url'), Config::get('corpusparole.sesame_update_url'));
         $gs_raw = new \EasyRdf\Sparql\Client(Config::get('corpusparole.sesame_query_url_raw'), Config::get('corpusparole.sesame_update_url_raw'));
@@ -205,7 +205,7 @@
                         $sourceGraph = $mappedGraph;
                     }
                     elseif ($docType == "http://purl.org/dc/dcmitype/Text") {
-                        $merger = new \CorpusParole\Libraries\Mergers\CocoonTextdRdfMerger();
+                        $merger = new \CorpusParole\Libraries\Mergers\CocoonTextRdfMerger();
                         $baseGraph = $resDocs;
                         $sourceGraph = $mappedGraph;
                     }