Mercurial Mercurial > corpus_parole / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge two heads
authornowmad@23.1.168.192.in-addr.arpa
Fri, 22 Jan 2016 14:31:17 +0100
changeset 101 9fb98e5f1b42
parent 100 1f93330f9d42 (current diff)
parent 32 9765cf7cf817 (diff)
child 102 976962b53ab9
merge two heads
--- a/server/bo_client/app/adapters/application.js	Fri Jan 22 13:37:03 2016 +0100
+++ b/server/bo_client/app/adapters/application.js	Fri Jan 22 14:31:17 2016 +0100
@@ -1,6 +1,6 @@
-import DS from 'ember-data';
+import RESTAdapter from 'ember-data/adapters/rest';
 import ENV from 'bo-client/config/environment';
 
-export default DS.RESTAdapter.extend({
+export default RESTAdapter.extend({
   namespace: ENV.baseURL.replace(/\/$/,"")+'/api/v1',
 });
--- a/server/bo_client/app/app.js	Fri Jan 22 13:37:03 2016 +0100
+++ b/server/bo_client/app/app.js	Fri Jan 22 14:31:17 2016 +0100
@@ -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';
 
--- a/server/bo_client/app/index.html	Fri Jan 22 13:37:03 2016 +0100
+++ b/server/bo_client/app/index.html	Fri Jan 22 14:31:17 2016 +0100
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Corpus Parole</title>
 
-    {{content-for 'head'}}
+    {{content-for "head"}}
 
     <!-- Fonts -->
     <link rel="stylesheet" href="assets/css/fonts.css">
@@ -21,7 +21,7 @@
     <![endif]-->
     <link rel="stylesheet" href="assets/bo-client-vendor.css">
     <link rel="stylesheet" href="assets/bo-client.css">
-    {{content-for 'head-footer'}}
+    {{content-for "head-footer"}}
   </head>
   <body>
   	<nav class="navbar navbar-default">
@@ -49,10 +49,12 @@
     <div class="container-fluid" id="ember-container"></div>
 
 
-    {{content-for 'body'}}
+    {{content-for "body"}}
 
     <script src="assets/bo-client-vendor.js"></script>
     <script src="assets/bo-client.js"></script>
 
+    {{content-for "body-footer"}}
+
   </body>
 </html>
--- a/server/bo_client/app/models/document.js	Fri Jan 22 13:37:03 2016 +0100
+++ b/server/bo_client/app/models/document.js	Fri Jan 22 14:31:17 2016 +0100
@@ -3,18 +3,18 @@
 import _ from 'lodash/lodash';
 
 export default DS.Model.extend({
-  //id: DS.attr('string'),
+  //id: attr('string'),
   uri: DS.attr('string'),
 
   title: DS.attr('string'),
 
   language: DS.attr('string'),
 
-  publishers: DS.attr({defaultValue: []}),
+  publishers: DS.attr({defaultValue: function() { return []; }}),
 
-  contributors: DS.attr({defaultValue: []}),
+  contributors: DS.attr({defaultValue: function() { return []; }}),
 
-  mediaArray: DS.attr({defaultValue: []}),
+  mediaArray: DS.attr({defaultValue: function() { return []; }}),
 
   mediaList: Ember.computed('mediaArray', function() {
     var res = [];
--- a/server/bo_client/bower.json	Fri Jan 22 13:37:03 2016 +0100
+++ b/server/bo_client/bower.json	Fri Jan 22 14:31:17 2016 +0100
@@ -2,26 +2,19 @@
   "name": "bo-client",
   "dependencies": {
     "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": ">=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": "latest",
-    "loader.js": "ember-cli/loader.js#3.5.0",
-    "qunit": "~1.18.0",
+    "ember-cli-shims": "0.1.0",
+    "ember-load-initializers": "0.1.7",
+    "ember-qunit-notifications": "0.1.0",
+    "jquery": "1.11.3",
+    "loader.js": "^3.5.0",
+    "qunit": "~1.20.0",
     "bootstrap-sass": "bootstrap-sass-official#~3.3.6",
-    "font-awesome": "~4.4.0",
+    "font-awesome": "~4.5.0",
     "typeahead.js": "~0.11.1",
     "urijs": "URIjs#~1.17.0",
     "store": "https://github.com/marcuswestin/store.js.git#master"
   },
   "resolutions": {
-    "ember-cli-shims": "0.0.6",
-    "loader.js": "3.5.0",
-    "ember-load-initializers": "0.1.7",
     "ember": "2.2.0",
     "qunit-notifications": "~0.1.0"
   }
--- a/server/bo_client/package.json	Fri Jan 22 13:37:03 2016 +0100
+++ b/server/bo_client/package.json	Fri Jan 22 14:31:17 2016 +0100
@@ -24,25 +24,27 @@
     "broccoli-funnel": "^1.0.1",
     "broccoli-merge-trees": "^1.0.0",
     "ember-aupac-typeahead": "2.0.4",
-    "ember-cli": "1.13.13",
+    "ember-ajax": "0.7.1",
+    "ember-cli": "2.2.0-beta.6",
     "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.1.0",
+    "ember-cli-dependency-checker": "^1.2.0",
     "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.0.4",
+    "ember-cli-qunit": "^1.1.0",
     "ember-cli-release": "0.2.8",
     "ember-cli-sass": "5.2.0",
-    "ember-cli-sri": "^1.2.1",
+    "ember-cli-sri": "^2.0.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-component-css": "0.1.6",
-    "ember-data": "2.2.1",
+    "ember-data": "2.3.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.5",
+    "ember-resolver": "^2.0.3",
     "ember-i18n": "4.2.0",
     "ember-lodash": "0.0.6",
     "ember-truth-helpers": "1.2.0",
--- a/server/bo_client/tests/helpers/resolver.js	Fri Jan 22 13:37:03 2016 +0100
+++ b/server/bo_client/tests/helpers/resolver.js	Fri Jan 22 14:31:17 2016 +0100
@@ -1,4 +1,4 @@
-import Resolver from 'ember/resolver';
+import Resolver from 'ember-resolver';
 import config from '../../config/environment';
 
 var resolver = Resolver.create();
--- a/server/bo_client/tests/index.html	Fri Jan 22 13:37:03 2016 +0100
+++ b/server/bo_client/tests/index.html	Fri Jan 22 14:31:17 2016 +0100
@@ -7,27 +7,27 @@
     <meta name="description" content="">
     <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/bo-client.css">
     <link rel="stylesheet" href="assets/test-support.css">
 
-    {{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="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/bo-client.js"></script>
     <script src="testem.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>
corpus_parole