Rohan Mitchell a207f50aeb Merge branch 'master' into delay-devise-emails ...

Conflicts:
	script/run_tests.sh

2015-04-30 12:29:06 +10:00

..

assets

Resolve conflict for overflow dropdown between multiple single-line-selectors on the one page

2015-04-24 16:05:39 +10:00

controllers

Moving spree namespaced serializers into admin

2015-04-22 21:02:06 +10:00

helpers

Moving spree namespaced serializers into admin

2015-04-22 21:02:06 +10:00

jobs

Add jobs for user, order and enterprise emails

2015-04-16 16:54:43 +10:00

mailers

Add rails-i18n gem.

2014-12-03 09:39:35 +11:00

models

Merge branch 'master' into delay-devise-emails

2015-04-30 12:29:06 +10:00

overrides

User can toggle property inheritence from product property page, and checking the box shows a list of producer properties that will be inherited from

2015-04-22 21:02:07 +10:00

presenters

Admin can set enterprise fee's tax category

2015-03-05 10:44:25 +11:00

serializers/api

Pulling property values into the shopfront

2015-04-23 13:51:49 +10:00

views

Hiding filters on list views because styling is broken

2015-04-24 19:35:18 +10:00