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.
Upgrade app-client to ember 2.4.3
authorymh <ymh.work@gmail.com>
Fri, 08 Apr 2016 18:41:51 +0200
changeset 148 6b32182a7fba
parent 147 bc37828169f3
child 149 3ace15523e6b
Upgrade app-client to ember 2.4.3
cms/app-client/.jshintrc file | annotate | diff | comparison | revisions
cms/app-client/.travis.yml file | annotate | diff | comparison | revisions
cms/app-client/bower.json file | annotate | diff | comparison | revisions
cms/app-client/package.json file | annotate | diff | comparison | revisions
cms/app-client/tests/.jshintrc file | annotate | diff | comparison | revisions
server/bo_client/package.json file | annotate | diff | comparison | revisions 
--- a/cms/app-client/.jshintrc	Fri Apr 08 17:23:17 2016 +0200
+++ b/cms/app-client/.jshintrc	Fri Apr 08 18:41:51 2016 +0200
@@ -1,6 +1,5 @@
 {
   "predef": [
-    "server",
     "document",
     "window",
     "-Promise"
--- a/cms/app-client/.travis.yml	Fri Apr 08 17:23:17 2016 +0200
+++ b/cms/app-client/.travis.yml	Fri Apr 08 18:41:51 2016 +0200
@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "0.12"
+  - "4"
 
 sudo: false
 
@@ -10,12 +10,11 @@
     - node_modules
 
 before_install:
-  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
-  - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - npm config set spin false
+  - npm install -g bower
+  - npm install phantomjs-prebuilt
 
 install:
-  - npm install -g bower
   - npm install
   - bower install
 
--- a/cms/app-client/bower.json	Fri Apr 08 17:23:17 2016 +0200
+++ b/cms/app-client/bower.json	Fri Apr 08 18:41:51 2016 +0200
@@ -1,8 +1,8 @@
 {
   "name": "app-client",
   "dependencies": {
-    "ember": "~2.4.1",
-    "ember-cli-shims": "0.1.0",
+    "ember": "~2.4.3",
+    "ember-cli-shims": "0.1.1",
     "ember-cli-test-loader": "0.2.2",
     "ember-qunit-notifications": "0.1.0",
     "jquery": "^2.2",
--- a/cms/app-client/package.json	Fri Apr 08 17:23:17 2016 +0200
+++ b/cms/app-client/package.json	Fri Apr 08 18:41:51 2016 +0200
@@ -8,8 +8,8 @@
     "test": "tests"
   },
   "scripts": {
-    "build": "ember build --environment=production",
-    "start": "ember serve --environment=development",
+    "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"
   },
@@ -20,37 +20,37 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "bower": "^1.7.6",
-    "broccoli-asset-rev": "^2.3.0",
+    "bower": "^1.7.9",
+    "broccoli-asset-rev": "^2.4.2",
     "broccoli-funnel": "^1.0.1",
-    "broccoli-merge-trees": "^1.1.0",
+    "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.0",
+    "ember-cli": "^2.4.3",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-babel": "^5.1.6",
-    "ember-cli-d3": "1.1.2",
+    "ember-cli-d3": "1.1.6",
     "ember-cli-dependency-checker": "^1.2.0",
-    "ember-cli-font-awesome": "^1.3.0",
-    "ember-cli-htmlbars": "^1.0.1",
+    "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.3.1",
-    "ember-cli-mirage": "0.1.11",
-    "ember-cli-qunit": "^1.2.1",
+    "ember-cli-inject-live-reload": "^1.4.0",
+    "ember-cli-mirage": "0.1.13",
+    "ember-cli-qunit": "^1.4.0",
     "ember-cli-release": "0.2.8",
-    "ember-cli-sass": "5.2.0",
-    "ember-cli-sri": "^2.0.0",
+    "ember-cli-sass": "5.3.1",
+    "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.4.0",
+    "ember-data": "^2.4.2",
     "ember-data-fixture-adapter": "1.13.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.5.0",
+    "ember-load-initializers": "^0.5.1",
     "ember-lodash": "0.0.6",
     "ember-resolver": "^2.0.3",
     "ember-wormhole": "0.3.5",
-    "loader.js": "^4.0.0"
+    "loader.js": "^4.0.1"
   }
 }
--- a/cms/app-client/tests/.jshintrc	Fri Apr 08 17:23:17 2016 +0200
+++ b/cms/app-client/tests/.jshintrc	Fri Apr 08 18:41:51 2016 +0200
@@ -1,7 +1,5 @@
 {
   "predef": [
-    "server",
-    "Audio",
     "document",
     "window",
     "location",
--- a/server/bo_client/package.json	Fri Apr 08 17:23:17 2016 +0200
+++ b/server/bo_client/package.json	Fri Apr 08 18:41:51 2016 +0200
@@ -23,7 +23,7 @@
     "bower": "^1.7.9",
     "broccoli-asset-rev": "^2.4.2",
     "broccoli-funnel": "^1.0.1",
-    "broccoli-merge-trees": "^1.1.0",
+    "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",
@@ -32,7 +32,6 @@
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-babel": "^5.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-inject-live-reload": "^1.4.0",
@@ -41,9 +40,11 @@
     "ember-cli-sass": "5.3.1",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
+    "ember-component-css": "0.1.9",
     "ember-data": "^2.4.2",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.5",
+    "ember-font-awesome": "^2.1.0",
     "ember-i18n": "4.2.0",
     "ember-load-initializers": "^0.5.1",
     "ember-lodash": "0.0.6",
corpus_parole