Rohan Mitchell 422061f137 Merge branch 'master' into products-caching ...

Conflicts:
	app/controllers/shop_controller.rb
	app/models/enterprise_fee.rb
	app/models/order_cycle.rb
	app/models/variant_override.rb
	db/schema.rb
	lib/open_food_network/products_renderer.rb
	spec/lib/open_food_network/products_renderer_spec.rb

2016-03-03 09:42:52 +11:00

..

enterprises

Splitting enterprise index feature specs into their own file, reinstating old enterprise index for super admin users

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

account_spec.rb

Adding basic template for account page

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

accounts_and_billing_settings_spec.rb

Redesignating all references to user_invoices as account_invoices

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

adjustments_spec.rb

Move adjustment specs to their own spec file

2015-11-11 11:53:04 +11: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

WIP: Adding infrastructure to show/hide variants + overrides using inventory items

2016-03-02 12:10:22 +11:00

bulk_product_update_spec.rb

Adding variant SKU field to BPE

2016-01-13 18:49:34 +11:00

business_model_configuration_spec.rb

Fixing broken BMC specs

2015-12-16 19:18:58 +11:00

caching_spec.rb

Display products cache integrity checker results on cache settings admin page

2016-03-02 11:05:03 +11:00

cms_spec.rb

Update tests for new label "Login"

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

content_spec.rb

Admin can upload logo for ContentConfig

2015-07-17 16:06:49 +10:00

customers_spec.rb

Pulling columns dropdown out into a shared partial

2016-01-13 18:49:32 +11:00

enterprise_fees_spec.rb

Adding option to 'Inherit From Product' for enterprise_fee tax categories

2016-03-02 11:56:46 +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

Renaming 'Override Variant Details' permission to 'Add Products To Inventory'

2016-03-02 12:10:49 +11: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

Adding preferences to enterprises for sorting of order cycles in shopfront list

2015-12-16 11:55:23 +11: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

Display receival instructions when editing order cycle

2016-01-29 12:17:20 +11:00

orders_spec.rb

Pulling columns dropdown out into a shared partial

2016-01-13 18:49:32 +11: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

Payment Method feature specs work with new enteprise user enterprise index

2015-06-12 03:10:37 +08:00

products_spec.rb

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00

reports_spec.rb

Merge remote-tracking branch 'Em-AK/682-xero-report-defaults' into customer-name-security

2015-12-17 14:22:16 +11:00

shipping_methods_spec.rb

Shipping Method feature specs work with new enteprise user enterprise index

2015-06-12 03:10:50 +08:00

tax_settings_spec.rb

Reorganising busines model config settings, moving account invoice tax rate in busines model config settings

2015-12-16 19:18:57 +11:00

variant_overrides_spec.rb

Revoke ability to overide variants based on shared management/ownership (ie. only explicit permissions)

2016-03-02 12:10:49 +11:00

variants_spec.rb

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00