Will Marshall f7c71568df Merge branch 'laura_and_will' ...

Conflicts:
	app/models/spree/variant_decorator.rb
	db/schema.rb
	spec/models/spree/product_spec.rb
	spec/models/spree/variant_spec.rb

2014-06-13 12:42:14 +10:00

..

admin

BPE uses soft-delete for products

2014-06-12 14:59:27 +10:00

darkswarm

Not pre-loading images and setting the map back to gifses

2014-06-13 11:05:32 +10:00

search

Upgrading Foundation, starting to work through regression issues

2014-03-27 13:01:01 +11:00

shared

Removing position fixed

2014-05-22 12:39:52 +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

Fixing map issues, adding a nice pretty loader

2014-06-12 11:50:28 +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

jquery-migrate-1.0.0.js

Removing JMigrate warnings

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