Rohan Mitchell 6dea3fa19d Merge branch 'fix-duplicate-fees' into combined/ginerr_bugfixes_fix-duplicate-fees

2015-06-11 12:56:32 +10:00

..

assets

Merge branch 'master' into ginerr_bugfixes

2015-06-05 15:49:43 +10:00

controllers

Make filter method private

2015-06-10 17:04:09 +10:00

helpers

Merge branch 'master' into customers

2015-06-03 15:19:40 +08: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 'fix-duplicate-fees' into combined/ginerr_bugfixes_fix-duplicate-fees

2015-06-11 12:56:32 +10:00

overrides

Only record analytics in production. Also record them in admin backend.

2015-06-03 16:36:31 +10:00

presenters

Admin can set enterprise fee's tax category

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

serializers/api

Merge branch 'master' into customers

2015-06-03 15:19:40 +08:00

views

Merge branch 'ginerr_bugfixes' into combined/ginerr_bugfixes_fix-duplicate-fees

2015-06-11 12:56:27 +10:00