Rohan Mitchell e5b3736e86 Merge branch 'single-order-patches' into combined/single-order-patches-and-bulk-product-edit

2015-05-29 14:36:51 +10:00

..

assets

Auto-merge from CI [skip ci]

2015-05-29 14:29:23 +10:00

controllers

Merge branch 'single-order-patches' into combined/single-order-patches-and-bulk-product-edit

2015-05-29 14:36:51 +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

Auto-merge from CI [skip ci]

2015-05-29 14:29:23 +10:00

overrides

orders list: filter by distributor and order cycle

2015-05-21 18:00:14 +10:00

presenters

Admin can set enterprise fee's tax category

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

serializers/api

Adding price to line_item serializer (oops, forgot to include when merging in master)

2015-05-21 17:48:35 +10:00

views

Auto-merge from CI [skip ci]

2015-05-29 14:29:23 +10:00