update ember version

.gitignore

@@ -25,3 +25,9 @@
 !.gitignore
 !.gitkeep
 *.iml
+
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

web/bower.json

@@ -1,16 +1,18 @@
 {
   "name": "ambition-crm",
+  "description": "Ambition CRM",
+  "authors": [
+    "Shaun Chyxion <chyxion@163.com>"
+  ],
+  "main": "",
+  "license": "MIT",
+  "homepage": "",
   "dependencies": {
-    "ember": "~2.13.0",
-    "ember-cli-shims": "0.1.1",
-    "ember-cli-test-loader": "0.2.2",
-    "ember-qunit-notifications": "0.1.0",
     "bootstrap": "~3.3.5",
     "bootbox": "~4.4.0",
     "moment": ">= 2.8.0",
     "moment-timezone": ">= 0.1.0",
     "validate": "~0.9.0",
-    "jquery-storage-api": "jQuery-Storage-API#^1.9.1",
     "font-awesome": "^4.7.0",
     "mjolnic-bootstrap-colorpicker": "bootstrap-colorpicker#^2.3.3",
     "jquery-colorbox": "^1.6.4",
@@ -21,5 +23,12 @@
   },
   "resolutions": {
     "ember": "release"
-  }
+  },
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ]
 }

web/config/environment.js

@@ -4,7 +4,7 @@ module.exports = function(environment) {
   var ENV = {
     modulePrefix: 'ambition-crm',
     environment: environment,
-    baseURL: '/',
+    rootURL: '/',
     locationType: 'hash',
     EmberENV: {
       FEATURES: {
@@ -29,7 +29,7 @@ module.exports = function(environment) {
 
   if (environment === 'test') {
     // Testem prefers this...
-    ENV.baseURL = '/';
+    ENV.rootURL = '/';
     ENV.locationType = 'none';
 
     // keep test console output quieter

web/package.json

@@ -13,41 +13,45 @@
     "test": "ember test"
   },
   "repository": "",
-  "engines": {
-    "node": ">= 0.10.0"
-  },
   "author": "Shaun Chyxion",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.4.2",
+    "broccoli-asset-rev": "^2.4.5",
     "broccoli-funnel": "^1.0.1",
-    "ember-ajax": "0.7.1",
+    "ember-ajax": "^3.0.0",
     "ember-browserify": "^1.1.11",
-    "ember-cli": "2.5.0",
-    "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": "~2.14.2",
+    "ember-cli-app-version": "^3.0.0",
+    "ember-cli-babel": "^6.3.0",
+    "ember-cli-shims": "^1.1.0",
+    "ember-cli-dependency-checker": "^1.3.0",
+    "ember-cli-eslint": "^3.0.0",
+    "ember-cli-htmlbars": "^2.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.4.3",
+    "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-jshint": "^1.0.0",
     "ember-cli-moment-shim": "1.2.0",
-    "ember-cli-qunit": "^1.4.0",
+    "ember-cli-qunit": "^4.0.0",
     "ember-cli-release": "0.2.8",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.5.1",
+    "ember-export-application-global": "^2.0.0",
+    "ember-load-initializers": "^1.0.0",
     "ember-moment": "6.1.0",
     "ember-radio-button": "1.1.1",
-    "ember-resolver": "^2.0.3",
+    "ember-resolver": "^4.0.0",
     "ember-route-action-helper": "2.0.3",
+    "ember-source": "~2.14.1",
     "ember-truth-helpers": "1.1.0",
     "emberx-select": "3.0.1",
     "glob": "^4.5.3",
-    "loader.js": "^4.0.1",
+    "loader.js": "^4.2.3",
     "morgan": "^1.7.0",
     "valid-url": "^1.0.9"
   },
-  "dependencies": {}
+  "dependencies": {},
+  "engines": {
+    "node": "^4.5 || 6.* || >= 7.*"
+  },
+  "private": true
 }

web/run

@@ -1,2 +1,2 @@
-# ember s --proxy http://101.37.82.164/admin-api/
-ember s --proxy http://127.0.0.1:8088/
+# ember s --proxy http://127.0.0.1:8088/
+ember s --proxy http://101.236.35.13/