Maikel Linke 2053fbecda Merge branch 'i18n-replace-strings-in-js' into i18n ...

Conflicts:
	.travis.yml
	app/views/spree/order_mailer/confirm_email_for_customer.html.haml
	config/locales/en.yml

2015-10-21 14:09:43 +11:00

..

assets

using translate filter instead of root scope function with parameters

2015-10-09 10:21:26 +11:00

controllers

Adding new route for printing an order to pdf

2015-10-16 17:25:40 +11:00

helpers

Detailed xero report

2015-09-22 09:15:55 +10:00

jobs

BillablePeriods don't get updated when account_invoice has been finalized

2015-10-14 14:36:38 +11:00

mailers

Adding invoice action to orders controller, to allow sending of invoice email

2015-10-16 17:25:40 +11:00

models

Adding new route for printing an order to pdf

2015-10-16 17:25:40 +11:00

overrides

Remove obsolete deface

2015-10-21 10:04:29 +11:00

presenters

Admin can set enterprise fee's tax category

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

serializers/api

Variable weights improvements additions

2015-08-04 20:13:28 +01:00

views

Merge branch 'i18n-replace-strings-in-js' into i18n

2015-10-21 14:09:43 +11:00