Maikel Linke 984641e46c Merge remote-tracking branch 'origin/master' into uk/trial-length ...

Conflicts:
	config/locales/en.yml

2016-07-20 11:40:52 +10:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

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

controllers

Ensure CustomersController#update.json gives an appropriate response

2016-06-16 22:42:53 +10:00

features

Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load

2016-07-13 10:01:16 +10:00

helpers

Auto-merge from CI [skip ci]

2016-06-30 01:30:53 +10:00

javascripts

Merge remote-tracking branch 'origin/master' into pr/1033

2016-06-16 15:12:30 +10:00

jobs

More intuitive logic for minimum billable turnover

2016-04-29 18:03:32 +10:00

lib

Fix incorrectly aligned columns

2016-06-30 21:38:10 +10:00

mailers

Change to explicitly check complete state (default Spree::Order.complete scope checks only for presence of 'completed_at' timestamp)

2016-06-08 11:15:02 +10:00

models

Extract property merging to lib class

2016-06-24 07:57:06 +10:00

performance

Make benchmark more realistic

2015-11-13 14:03:07 +11:00

requests

Using date and time of current timezone

2015-12-10 11:38:41 +11:00

serializers

Making TagRule autocomplete available to models other than Customer

2016-05-25 08:10:20 +10:00

support

Refactoring with feedback on pr #1073

2016-06-29 15:46:51 +10:00

views/json

Removing stupid unusable spec

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

factories.rb

Extract property merging to lib class

2016-06-24 07:57:06 +10:00

spec_helper.rb

Longer default page size for feature specs

2016-06-01 16:28:43 +10:00