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

..

authentication_spec.rb

Allow extended time for all parts of this spec to fix intermittent fails

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

bulk_order_management_spec.rb

Merge branch 'master' into variable_weights

2015-05-21 17:31:33 +10:00

bulk_product_update_spec.rb

Add wait between clicks to fix race condition

2015-06-03 12:51:15 +10:00

cms_spec.rb

Fix specs that relied on the old login page which we now redirect to the new page

2015-03-25 12:11:06 +11:00

content_spec.rb

Do not couple editable content to frequently-changing home page format

2015-05-13 14:18:00 +10:00

customers_spec.rb

Fixing customer index feature spec, only checking shop when something has been selected

2015-06-03 16:18:09 +08:00

enterprise_fees_spec.rb

EnterpriseFee admin interface allows selecting no fee

2015-03-16 14:05:04 +11:00

enterprise_groups_spec.rb

Replace 'array.sort.should == expected.sort' pattern with match_array

2015-05-28 10:46:08 +10:00

enterprise_relationships_spec.rb

Replace 'array.sort.should == expected.sort' pattern with match_array

2015-05-28 10:46:08 +10:00

enterprise_roles_spec.rb

Delete specific E2ER in spec

2014-09-11 14:54:51 +10:00

enterprise_user_spec.rb

Merge branch 'master' into migrate_ent_types

2014-10-01 16:11:20 +10:00

enterprises_spec.rb

Admin can set enterprises to charge or not charge sales tax

2015-04-17 13:41:38 +10:00

image_settings_spec.rb

Admin can change the format that Spree::Images are stored/served in

2014-10-16 12:41:11 +11:00

order_cycles_spec.rb

Merge branch 'master' into require_standard_variant

2015-05-28 15:08:13 +10:00

orders_spec.rb

Fixing broken specs

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

overview_spec.rb

Adding specs for single ent dash and remove product ability for profiles

2014-10-24 15:27:08 +11:00

payment_method_spec.rb

Can change hub after changing pm type

2014-08-09 11:23:05 +10:00

products_spec.rb

Merge branch 'master' into redesign

2015-05-29 15:20:21 +10:00

reports_spec.rb

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

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

shipping_methods_spec.rb

Replace 'array.sort.should == expected.sort' pattern with match_array

2015-05-28 10:46:08 +10:00

variant_overrides_spec.rb

Fix bug: When there are variant overrides not owned by the current user, user is unable to make any changes to VOs

2015-03-13 10:45:38 +11:00

variants_spec.rb

Don't try and delete the only variant, that will never work!

2015-04-17 16:49:14 +10:00