Maikel 12df5de43c Auto-merged master into sign_up_email_i18n on deployment.

2016-06-24 00:45:34 +10:00

..

assets

Removing inline styles for links dropdown

2016-06-17 16:44:02 +10:00

controllers

Merge pull request #1045 from lin-d-hop/sign_up_email_i18n

2016-06-20 17:29:37 +01:00

helpers

Find current_customer via current_distributor and current_user rather than current_order

2016-05-28 00:31:59 +10:00

jobs

Run a job queue heartbeat every 5 minutes

2016-04-13 16:48:24 +10:00

mailers

Undoing this change, shouldn't be on this branch

2016-06-20 15:21:34 +01:00

models

Merge pull request #1045 from lin-d-hop/sign_up_email_i18n

2016-06-20 17:29:37 +01:00

overrides

Payment methods can be tagged

2016-05-27 16:25:10 +10:00

presenters

Adding option to 'Inherit From Product' for enterprise_fee tax categories

2016-03-02 11:56:46 +11:00

serializers/api

Tag Rules can be rearranged in UI to set priority

2016-05-27 16:25:10 +10:00

views

Merge pull request #1048 from lin-d-hop/sign_up_email_i18n

2016-06-23 15:30:42 +01:00