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

..

archive/features/consumer

Special Instructions in checkout are actually wired up

2014-09-06 12:00:27 +10:00

controllers

Making spec do the right thing

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

features

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

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

helpers

Decouple generic injection spec from EnterpriseSerializer

2015-06-03 12:53:46 +10:00

javascripts

Auto-merge from CI [skip ci]

2015-09-02 14:44:05 +10:00

jobs

BillablePeriods don't get updated when account_invoice has been finalized

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

lib

spec_helper for lib/open_food_network/permissions_spec.rb

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

mailers

Adding a ship address to order in spec

2015-03-01 12:22:06 +11:00

models

Check if an order is an account invoice

2015-10-15 10:05:27 +11:00

performance

Fix currency issues, changed logo path

2015-06-18 15:38:46 +10:00

requests

scoping down large request spec

2015-06-10 13:50:55 +10:00

serializers

Switching enterprise index to its own dedicated serializer, so we can spit out ownership

2015-06-12 01:49:37 +08:00

support

Update tests for new label "Login"

2015-10-07 14:06:34 +11:00

views/json

Removing stupid unusable spec

2015-04-09 17:20:31 +10:00

factories.rb

Refactoring invoice update process to use new AccountInvoice model

2015-09-17 22:38:29 +10:00

spec_helper.rb

Adding paper_trail verisoning RSpec helpers

2015-09-17 22:37:44 +10:00