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

..

open_food_network/calculator

Rename OpenFoodWeb namespace to OpenFoodNetwork

2013-10-18 17:29:55 +11:00

spree

Merge branch 'remove-old-bugsnag-notification' into combined/xero-report_analytics-bugfixes

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

.gitkeep

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

adjustment_metadata.rb

Add AdjustmentMetadata, for holding info about enterprise fee adjustments at time of creation

2013-08-12 10:00:35 +10:00

cart.rb

Fix multicart use of OrderPopulator

2014-01-08 14:13:19 +11:00

content_configuration.rb

Content-manage footer fields

2015-05-06 16:36:10 +10:00

customer.rb

Completed orders require a customer, add association logic

2015-05-13 12:44:38 +10:00

distributor_shipping_method.rb

Adding tests and full touch behaviour for caching

2014-07-04 14:39:26 +10:00

enterprise_fee_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

enterprise_fee.rb

Adding for_enterprises scope on enterprise fee

2015-04-06 10:24:40 +10:00

enterprise_group.rb

Using permalink in URLs pointing to groups

2015-05-28 11:27:40 +10:00

enterprise_relationship_permission.rb

Style permission list items, order perms consistently by name

2014-08-25 15:05:49 +10:00

enterprise_relationship.rb

EnterpriseRelationship.relatives does not show duplicates

2015-05-29 12:19:38 +10:00

enterprise_role.rb

Enterprise roles must be unique

2014-08-15 16:09:05 +10:00

enterprise_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

enterprise.rb

Producers and distributors lists include self where appropriate

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

exchange_fee.rb

Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants

2012-11-26 11:03:44 +11:00

exchange_variant.rb

Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants

2012-11-26 11:03:44 +11:00

exchange.rb

Adding an 'involved' scope to exchanges

2015-03-27 15:56:07 +11:00

model_set.rb

Setting both values to blank deletes override

2014-12-12 13:33:14 +11:00

order_cycle_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

order_cycle.rb

Find the earliest closing times for each distributor in an active order cycle

2015-05-27 15:44:01 +10:00

producer_property.rb

Admin can reorder producer properties

2014-06-18 15:28:41 +10:00

product_distribution.rb

Lock enterprise fee adjustments on creation to avoid them being recalculated against order by update hooks

2013-08-19 14:38:51 +10:00

suburb.rb

Suburb auto-complete functionality for the new landing page.

2013-08-12 17:34:56 +10:00

variant_override_set.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

variant_override.rb

Add VariantOverride.decrement_stock

2015-01-12 10:39:23 +11:00