Will Marshall edaba844d9 Merge branch 'laura_and_will' into new_cart ...

Conflicts:
	app/views/shop/products/_form.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml

2014-07-18 17:02:19 +10:00

..

admin

Rename JS file so that it is loaded after the spree code it is overriding. Admin can't add products outside distribution to an order.

2014-07-16 11:26:22 +10:00

darkswarm

Merge branch 'laura_and_will' into new_cart

2014-07-18 17:02:19 +10:00

search

Remove most references to suburbs - previously used by new_landing_page, no longer used.

2014-07-17 14:26:04 +10:00

shared

Adding some basic animations, upgrading Angular Foundation

2014-06-25 13:59:22 +10:00

shop

Adding ze boilerplate

2014-02-07 13:55:25 +11:00

store

Fixing a couple of spec bugs

2014-04-08 18:09:02 +10:00

templates

Pulling some structure out of directives

2014-07-11 12:45:08 +10:00

application.js

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

distributors.js.coffee

Adding the distributors controller

2013-12-04 15:58:25 +11:00

iehack.js

Patching up IE warning

2014-06-19 15:18:14 +10:00

jquery-migrate-1.0.0.js

Removing JMigrate warnings

2014-02-27 16:15:06 +11:00