Maikel Linke 0b4a43d77a Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views ...

Conflicts:
	app/views/shared/menu/_cart.html.haml
	app/views/spree/order_mailer/confirm_email_for_shop.html.haml

2015-09-16 16:32:16 +10:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

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

controllers

Merge branch 'variable-weights-improvements' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-variable-weights-improvements

2015-08-07 11:10:07 +10:00

features

Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views

2015-09-16 16:32:16 +10: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

Add jobs for user, order and enterprise emails

2015-04-16 16:54:43 +10:00

lib

Handling tax categories without tax rates

2015-08-21 15:16:00 +10:00

mailers

Adding a ship address to order in spec

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

models

Add permission for hub enterprise users to use xero report #628

2015-08-07 13:37:37 +10: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

Updating spec for new Login label

2015-08-28 18:37:24 +10:00

views/json

Removing stupid unusable spec

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

factories.rb

SELECT DISTINCT results in inconsistent #count value. Work around this with to_a.

2015-08-05 11:05:29 +10:00

spec_helper.rb

Add rspec-retry for intermittently failing spec

2015-08-05 13:35:53 +10:00