grunt init, dev

- added grunt-bg-shell
- reorganized asset tasks into one location
- turn off ember-cli analytics
- remove app/config-dev and config-prod
- remove qunit from bower.json
- remove express from package.json

.bowerrc

@@ -1,3 +1,4 @@
 {
+    "cwd": "core/client/",
     "directory": "bower_components"
-}
+}

core/client/.ember-cli

@@ -5,5 +5,5 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false
+  "disableAnalytics": true
 }

core/client/.gitignore

@@ -18,4 +18,4 @@ testem.log
 
 # built by grunt
 public/assets/img/contributors/
-templates/-contributors.hbs
+app/templates/-contributors.hbs

core/client/Brocfile.js

@@ -29,6 +29,7 @@ app.import('bower_components/ember-simple-auth/simple-auth.js');
 app.import('bower_components/ember-simple-auth/simple-auth-oauth2.js');
 app.import('bower_components/google-caja/html-css-sanitizer-bundle.js');
 app.import('bower_components/nanoscroller/bin/javascripts/jquery.nanoscroller.js');
+app.import('bower_components/jqueryui-touch-punch/jquery.ui.touch-punch.js');
 
 app.import('vendor/showdown/extensions/ghostgfm.js');
 app.import('vendor/showdown/extensions/ghostimagepreview.js');

core/client/bower.json

@@ -3,7 +3,7 @@
   "dependencies": {
     "codemirror": "4.0.1",
     "Countable": "2.0.2",
-    "handlebars": "~1.3.0",
+    "handlebars": "2.0.0",
     "device": "git://github.com/matthewhudson/device.js#5347a275b66020a0d4dfe9aad81a488f8cce448d",
     "ember": "1.10.0",
     "ember-data": "1.0.0-beta.14.1",
@@ -12,12 +12,12 @@
     "ember-simple-auth": "0.7.2",
     "fastclick": "1.0.0",
     "google-caja": "5669.0.0",
-    "handlebars": "2.0.0",
     "ic-ajax": "1.0.1",
-    "jquery": "^1.11.1",
+    "jquery": "~1.11.2",
     "jquery-file-upload": "9.5.6",
     "jquery-hammerjs": "1.0.1",
     "jquery-ui": "1.10.4",
+    "jqueryui-touch-punch": "furf/jquery-ui-touch-punch",
     "keymaster": "git://github.com/madrobby/keymaster#564ea42e07de40da8113a571f17ceae8802672ff",
     "loader.js": "ember-cli/loader.js#1.0.1",
     "moment": "2.8.3",
@@ -30,9 +30,6 @@
   "devDependencies": {
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.1",
-    "ember-mocha": "~0.3.0",
-    "ember-qunit": "0.2.8",
-    "ember-qunit-notifications": "0.0.7",
-    "qunit": "~1.17.1"
+    "ember-mocha": "~0.3.0"
   }
 }

core/client/package.json

@@ -35,7 +35,6 @@
     "ember-cli-uglify": "1.0.1",
     "ember-data": "1.0.0-beta.14.1",
     "ember-export-application-global": "^1.0.2",
-    "express": "^4.8.5",
     "fs-extra": "0.16.3",
     "glob": "^4.0.5"
   },

package.json

@@ -76,23 +76,22 @@
         "blanket": "~1.1.6",
         "bower": "~1.3.10",
         "grunt": "~0.4.5",
+        "grunt-bg-shell": "^2.3.1",
         "grunt-cli": "~0.1.13",
-        "grunt-autoprefixer": "1.0.1",
-        "grunt-concat-sourcemap": "~0.4.3",
         "grunt-contrib-clean": "~0.6.0",
         "grunt-contrib-compress": "~0.11.0",
-        "grunt-contrib-concat": "~0.5.0",
         "grunt-contrib-copy": "~0.5.0",
         "grunt-contrib-jshint": "~0.10.0",
         "grunt-contrib-uglify": "~0.6.0",
         "grunt-contrib-watch": "~0.6.1",
         "grunt-docker": "~0.0.8",
-        "grunt-ember-templates": "dgeb/grunt-ember-templates#88594c6",
-        "grunt-es6-module-transpiler": "~0.6.0",
         "grunt-express-server": "~0.4.19",
         "grunt-jscs": "~1.2.0",
         "grunt-mocha-cli": "~1.11.0",
+<<<<<<< HEAD
         "grunt-sass": "~0.18.0",
+=======
+>>>>>>> grunt init, dev
         "grunt-shell": "~1.1.1",
         "grunt-update-submodules": "~0.4.1",
         "matchdep": "~0.3.0",