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

..

admin

Merge branch 'master' into products-caching

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

api

Order cycle filter resets date filters on BOM

2015-05-07 12:50:55 +10:00

checkout

i18n typo

2015-11-05 14:39:33 +11:00

enterprise_mailer

Use mail() instead of devise_mail

2015-12-04 10:37:55 +11:00

enterprises

Cleaner opengraph meta tags

2016-01-20 15:42:01 +11:00

groups

fix hub filter style

2016-02-04 16:34:03 +11:00

home

fix hub filter style

2016-02-04 16:34:03 +11:00

json

Not using Paperclip's to avoid HTTP calls to S3

2015-12-04 10:37:55 +11:00

layouts

Try again: using :site_meta_description for translation of global site meta description

2016-02-05 14:57:18 +11:00

map

i18n: Replacing all language strings in app/view/

2015-08-28 16:59:23 +10:00

modals

i18n: Replacing all language strings in app/view/

2015-08-28 16:59:23 +10:00

open_food_network

i18n: Replacing all language strings in app/view/

2015-08-28 16:59:23 +10:00

order_cycles

i18n: Replacing all language strings in app/view/

2015-08-28 16:59:23 +10:00

producer_mailer

Pulling product_and_variant_name down into VariantAndLineItemNaming, renaming to product_and_full_name

2015-12-16 11:55:24 +11:00

producers

Refactoring filter selectors

2016-02-04 16:08:19 +11:00

products

i18n: Replacing all language strings in app/view/

2015-08-28 16:59:23 +10:00

registration

i18n: Replacing all language strings in app/view/

2015-08-28 16:59:23 +10:00

shared

Display footer_email in confirmation emails correctly

2016-02-26 16:09:14 +11:00

shop

Refactoring filter selectors

2016-02-04 16:08:19 +11:00

shopping_shared

Not using Paperclip's to avoid HTTP calls to S3

2015-12-04 10:37:55 +11:00

shops

i18n: Replacing all language strings in app/view/

2015-08-28 16:59:23 +10:00

spree

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

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

user_passwords

Removing nothing special text and patching change password form slightly more

2014-04-08 18:07:55 +10:00