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

..

admin

Merge branch 'master' into redesign

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

api

Order cycle filter resets date filters on BOM

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

checkout

Adding padding class and apply to templates to have required padding for new footer.

2015-05-02 20:12:33 +10:00

enterprise_mailer

Delete obsolete paragraph in registration #595

2015-06-05 11:01:40 +10:00

enterprises

ng-cloak order cycles selector, tabs and shopfront

2015-05-29 16:39:41 +10:00

groups

Merge branch 'master' into redesign

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

home

Small edits

2015-05-29 09:55:40 +10:00

json

Merge branch 'master' into optimise-shopfront

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

layouts

Merge branch 'master' into redesign

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

map

Adding some map searching capabilities

2014-07-16 11:19:16 +10:00

modals

swap redundant producer modal for general enterprise modal

2014-10-07 10:48:04 +11:00

open_food_network

Rename namespaced includes from open_food_web to open_food_network

2013-10-18 17:43:18 +11:00

order_cycles

Adding list view links

2014-02-04 12:01:10 +11:00

producers

Merge branch 'master' into redesign

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

products

Renaming everything to Shop

2013-12-05 13:40:05 +11:00

registration

Spacing

2015-03-27 13:09:25 +11:00

shared

Merge branch 'master' into redesign

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

shop

Merge branch 'master' into redesign

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

shopping_shared

ng-cloak order cycles selector, tabs and shopfront

2015-05-29 16:39:41 +10:00

shops

Fix column/row mixup

2015-05-29 15:19:35 +10:00

spree

Merge branch 'master' into redesign

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

user_passwords

Removing nothing special text and patching change password form slightly more

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