Rohan Mitchell 610a4c03fe Merge branch 'master' into redesign ...

Conflicts:
	app/controllers/home_controller.rb
	app/views/producers/index.html.haml
	app/views/shared/menu/_mobile_menu.html.haml
	app/views/shop/products/_form.html.haml
	config/routes.rb
	spec/controllers/shops_controller_spec.rb

2015-06-10 18:27:50 +10:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

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

controllers

Merge branch 'master' into redesign

2015-06-10 18:27:50 +10:00

features

Merge branch 'master' into redesign

2015-06-10 18:27:50 +10:00

helpers

Decouple generic injection spec from EnterpriseSerializer

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

javascripts

Merge branch 'master' into redesign

2015-06-10 18:27:50 +10:00

jobs

Add jobs for user, order and enterprise emails

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

lib

Merge branch 'handle-invalid-referer-urls' into combined/xero-report_analytics-bugfixes

2015-06-05 14:23:58 +10:00

mailers

Adding a ship address to order in spec

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

models

Merge branch 'master' into redesign

2015-06-10 18:27:50 +10:00

performance

Do not run performance specs in CI

2015-06-03 13:00:07 +10:00

requests

Fixing broken specs

2015-04-17 13:00:20 +10:00

serializers

Serialize taxons and relatives in expected format

2015-05-29 14:03:44 +10:00

support

Merge remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor

2015-06-05 13:48:24 +10:00

views/json

Removing stupid unusable spec

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

factories.rb

Merge branch 'master' into redesign

2015-06-10 18:27:50 +10:00

spec_helper.rb

Allow more phantomjs timeout to avoid the first-spec-timeout issue

2015-05-13 15:34:27 +10:00