Merge branch 'new-product-form'

Conflicts:
	app/assets/javascripts/admin/admin.js.coffee
This commit is contained in:
Rohan Mitchell
2014-05-24 17:14:32 +10:00
40 changed files with 341 additions and 103 deletions

View File

@@ -1,3 +1,3 @@
window.Admin = angular.module("ofn.admin", ["ngResource", "ngAnimate", "ofn.dropdown"]).config ($httpProvider) ->
angular.module("ofn.admin", ["ngResource", "ngAnimate", "ofn.dropdown"]).config ($httpProvider) ->
$httpProvider.defaults.headers.common["X-CSRF-Token"] = $("meta[name=csrf-token]").attr("content")
$httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"