--- a/.hgignore Sun Apr 24 22:38:10 2016 +0200
+++ b/.hgignore Mon Apr 25 12:53:47 2016 +0200
@@ -33,6 +33,8 @@
^server/src/public/css
^server/src/public/js/vendor
^server/src/public/fonts
+^server/bo_client/.dir-locals.el$
+^server/bo_client/.projectile$
^server/bo_client/node_modules
^server/bo_client/bower_components
^server/bo_client/dist
--- a/cms/app-client/app/index.html Sun Apr 24 22:38:10 2016 +0200
+++ b/cms/app-client/app/index.html Mon Apr 25 12:53:47 2016 +0200
@@ -7,14 +7,14 @@
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
- {{content-for 'head'}}
+ {{content-for "head"}}
<link rel="stylesheet" href="styles.css">
<link rel="stylesheet" href="assets/vendor.css">
<link rel="stylesheet" href="assets/app-client.css">
- {{content-for 'head-footer'}}
+ {{content-for "head-footer"}}
</head>
<body>
<div class="header">
@@ -29,8 +29,8 @@
</ul>
</div>
</div>
+ {{content-for "body"}}
- {{content-for 'body'}}
<div id="corpus-app" class="corpus-app"></div>
<!--script type="text/javascript" src="https://www.google.com/jsapi?autoload={'modules':[{'name':'visualization','version':'1.1','packages':['treemap']}]}"></script-->
@@ -44,6 +44,6 @@
})
</script>
- {{content-for 'body-footer'}}
+ {{content-for "body-footer"}}
</body>
</html>
--- a/cms/app-client/bower.json Sun Apr 24 22:38:10 2016 +0200
+++ b/cms/app-client/bower.json Mon Apr 25 12:53:47 2016 +0200
@@ -1,7 +1,7 @@
{
"name": "app-client",
"dependencies": {
- "ember": "~2.4.3",
+ "ember": "~2.5.0",
"ember-cli-shims": "0.1.1",
"ember-cli-test-loader": "0.2.2",
"ember-qunit-notifications": "0.1.0",
@@ -14,8 +14,5 @@
"lodash": "~3.7.0",
"Faker": "~3.0.0",
"store": "https://github.com/marcuswestin/store.js.git#v1.3.20"
- },
- "resolutions": {
- "jquery": "^2.2"
}
}
--- a/cms/app-client/package.json Sun Apr 24 22:38:10 2016 +0200
+++ b/cms/app-client/package.json Mon Apr 25 12:53:47 2016 +0200
@@ -10,8 +10,7 @@
"scripts": {
"build": "ember build",
"start": "ember server",
- "test": "ember test",
- "dl-fixtures": "ember dl-fixtures -u http://127.0.0.1:8000/api/v1/documents/ -d app/mirage/fixtures/documents.js -p 2 -f es6"
+ "test": "ember test"
},
"repository": "",
"engines": {
@@ -26,31 +25,33 @@
"broccoli-merge-trees": "^1.1.1",
"broccoli-static-compiler": "^0.2.2",
"corpus-common-addon": "file:../../common/corpus-common-addon",
- "ember-ajax": "0.7.1",
- "ember-cli": "^2.4.3",
+ "ember-ajax": "^2.0.1",
+ "ember-cli": "2.6.0-beta.1",
"ember-cli-app-version": "^1.0.0",
"ember-cli-babel": "^5.1.6",
"ember-cli-d3": "1.1.6",
"ember-cli-dependency-checker": "^1.2.0",
- "ember-font-awesome": "^2.1.0",
"ember-cli-htmlbars": "^1.0.3",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-ic-ajax": "0.2.4",
"ember-cli-inject-live-reload": "^1.4.0",
"ember-cli-mirage": "0.1.13",
+ "ember-cli-jshint": "^1.0.0",
"ember-cli-qunit": "^1.4.0",
"ember-cli-release": "0.2.8",
"ember-cli-sass": "5.3.1",
"ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^1.2.0",
- "ember-data": "^2.4.2",
+ "ember-data": "^2.5.0",
"ember-data-fixture-adapter": "1.13.0",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.5",
+ "ember-font-awesome": "^2.1.0",
"ember-load-initializers": "^0.5.1",
"ember-lodash": "0.0.6",
"ember-resolver": "^2.0.3",
"ember-wormhole": "0.3.5",
+ "ember-welcome-page": "^1.0.1",
"loader.js": "^4.0.1"
}
}
--- a/cms/app-client/tests/helpers/module-for-acceptance.js Sun Apr 24 22:38:10 2016 +0200
+++ b/cms/app-client/tests/helpers/module-for-acceptance.js Mon Apr 25 12:53:47 2016 +0200
@@ -1,23 +1,23 @@
import { module } from 'qunit';
+import Ember from 'ember';
import startApp from '../helpers/start-app';
import destroyApp from '../helpers/destroy-app';
+const { RSVP: { Promise } } = Ember;
+
export default function(name, options = {}) {
module(name, {
beforeEach() {
this.application = startApp();
if (options.beforeEach) {
- options.beforeEach.apply(this, arguments);
+ return options.beforeEach.apply(this, arguments);
}
},
afterEach() {
- if (options.afterEach) {
- options.afterEach.apply(this, arguments);
- }
-
- destroyApp(this.application);
+ let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
+ return Promise.resolve(afterEach).then(() => destroyApp(this.application));
}
});
}
--- a/server/bo_client/bower.json Sun Apr 24 22:38:10 2016 +0200
+++ b/server/bo_client/bower.json Mon Apr 25 12:53:47 2016 +0200
@@ -1,7 +1,7 @@
{
"name": "bo-client",
"dependencies": {
- "ember": "~2.4.3",
+ "ember": "~2.5.0",
"ember-cli-shims": "0.1.1",
"ember-cli-test-loader": "0.2.2",
"ember-qunit-notifications": "0.1.0",
--- a/server/bo_client/package.json Sun Apr 24 22:38:10 2016 +0200
+++ b/server/bo_client/package.json Mon Apr 25 12:53:47 2016 +0200
@@ -1,7 +1,7 @@
{
"name": "bo-client",
"version": "0.0.0",
- "description": "Small description for bo-client goes here",
+ "description": "Bo client for Corpus Parole",
"private": true,
"directories": {
"doc": "doc",
@@ -26,21 +26,22 @@
"broccoli-merge-trees": "^1.1.1",
"broccoli-static-compiler": "^0.2.2",
"corpus-common-addon": "file:../../common/corpus-common-addon",
- "ember-ajax": "0.7.1",
+ "ember-ajax": "^2.0.1",
"ember-aupac-typeahead": "2.0.6",
- "ember-cli": "^2.4.3",
+ "ember-cli": "2.6.0-beta.1",
"ember-cli-app-version": "^1.0.0",
"ember-cli-babel": "^5.1.6",
"ember-cli-dependency-checker": "^1.2.0",
"ember-cli-htmlbars": "^1.0.3",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-inject-live-reload": "^1.4.0",
+ "ember-cli-jshint": "^1.0.0",
"ember-cli-qunit": "^1.4.0",
"ember-cli-release": "0.2.8",
"ember-cli-sass": "5.3.1",
"ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^1.2.0",
- "ember-data": "^2.4.2",
+ "ember-data": "^2.5.0",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.5",
"ember-font-awesome": "^2.1.0",
@@ -56,6 +57,7 @@
"lodash": "^4.7.0",
"morgan": "^1.7.0",
"npm-check-updates": "^2.6.1",
- "walk-sync": "^0.2.6"
+ "walk-sync": "^0.2.6",
+ "ember-welcome-page": "^1.0.1"
}
}
--- a/server/bo_client/tests/helpers/module-for-acceptance.js Sun Apr 24 22:38:10 2016 +0200
+++ b/server/bo_client/tests/helpers/module-for-acceptance.js Mon Apr 25 12:53:47 2016 +0200
@@ -1,23 +1,23 @@
import { module } from 'qunit';
+import Ember from 'ember';
import startApp from '../helpers/start-app';
import destroyApp from '../helpers/destroy-app';
+const { RSVP: { Promise } } = Ember;
+
export default function(name, options = {}) {
module(name, {
beforeEach() {
this.application = startApp();
if (options.beforeEach) {
- options.beforeEach.apply(this, arguments);
+ return options.beforeEach.apply(this, arguments);
}
},
afterEach() {
- if (options.afterEach) {
- options.afterEach.apply(this, arguments);
- }
-
- destroyApp(this.application);
+ let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
+ return Promise.resolve(afterEach).then(() => destroyApp(this.application));
}
});
}