Merge pull request #143 from openmcac/ac_ember_upgrade

Upgrade to Ember 2.7.0

Author: achan

app/router.js

@@ -45,10 +45,23 @@ Ember.Route.reopen({
 });
 
 Router.map(function() {
+  // Workaround: https://github.com/emberjs/ember.js/issues/13921
+  // wildcard routes need to be at the top
+  this.route("dashboard", function() {});
+  this.route("bulletin/sunday", { path: "/sunday" }, function() {});
+  this.route("not-found", { path: "*path" });
+  // END WORKAROUND 13921
+
   this.route("group", { path: ":group_slug" }, function() {
     this.route("index", { path: "/" }, function() {});
     this.route("edit", function() {});
 
+    this.route("bulletins", { resetNamespace: true, path: "bulletins" }, function() {
+      this.route("new", function() {
+        this.route("announcements");
+      });
+    });
+
     this.route("bulletin", { resetNamespace: true, path: "bulletins/:bulletin_id" }, function() {
       this.route("edit");
     });
@@ -65,15 +78,6 @@ Router.map(function() {
     this.route('posts', { resetNamespace: true, path: 'posts' }, function() {
       this.route('new', function() {});
     });
-
-    this.route("bulletins", { resetNamespace: true, path: "bulletins" }, function() {
-      this.route("new", function() {
-        this.route("announcements");
-      });
-    });
-  });
-
-  this.route("bulletin/sunday", { path: "/sunday" }, function() {
   });
 
   this.route("login");
@@ -82,8 +86,6 @@ Router.map(function() {
   this.route('groups', function() {
     this.route('new');
   });
-  this.route('dashboard', function() {});
-  this.route("not-found", { path: "*path" });
 
   this.route('settings', function() {
     this.route('password');

bower.json

@@ -4,7 +4,7 @@
     "Faker": "~3.1.0",
     "bootstrap": "~3.3.1",
     "bootstrap-markdown": "~2.8.0",
-    "ember": "~2.4.1",
+    "ember": "~2.7.0",
     "ember-cli-shims": "0.1.0",
     "ember-cli-test-loader": "0.2.2",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
@@ -26,7 +26,6 @@
     "ceibo": "~1.1.0"
   },
   "resolutions": {
-    "ember": "~2.4.1",
-    "FakeXMLHttpRequest": "^1.4.0"
+    "ember": "~2.7.0"
   }
 }

package.json

@@ -24,7 +24,7 @@
     "broccoli-static-compiler": "^0.2.2",
     "ember-ajax": "2.0.0-beta.3",
     "ember-bootstrap-datetimepicker": "1.0.1",
-    "ember-cli": "2.4.2",
+    "ember-cli": "^2.7.0",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-babel": "^5.1.5",
     "ember-cli-dependency-checker": "^1.2.0",
@@ -52,7 +52,7 @@
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-concurrency": "0.5.17",
-    "ember-data": "^2.4.0",
+    "ember-data": "^2.7.0",
     "ember-deploy-redis": "0.0.2",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.4",
@@ -63,14 +63,14 @@
     "ember-notify": "^4.3.1",
     "ember-resize": "0.0.10",
     "ember-resolver": "^2.0.3",
-    "ember-simple-auth": "1.0.1",
+    "ember-simple-auth": "^1.1.0",
     "ember-sinon": "0.5.0",
     "ember-sortable": "1.6.3",
     "ember-validations": "2.0.0-alpha.4",
     "ember-watson": "^0.5.4",
     "emberx-select": "2.1.0",
     "express": "^4.8.5",
-    "liquid-fire": "0.23.0",
+    "liquid-fire": "^0.24.0",
     "loader.js": "^4.0.0",
     "moment": "2.11.1",
     "moment-timezone": "0.5.0",