Rohan Mitchell f5b45fa0ba Merge branch 'master' into folklabs-producer-emails

2015-05-01 09:51:01 +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

Avoid serialising entire order cycle when enqueuing OrderCycleNotificationJob

2015-04-29 15:21:05 +10:00

helpers

Moving spree namespaced serializers into admin

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

jobs

Avoid serialising entire order cycle when enqueuing OrderCycleNotificationJob

2015-04-29 15:21:05 +10:00

mailers

Extract data preparation into private methods

2015-04-29 15:50:42 +10: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

Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails

2015-04-29 14:42:17 +10:00