Rohan Mitchell 0431e0048c Merge branch 'master' into variant-overrides-frontend ...

Conflicts:
	app/controllers/shop_controller.rb
	app/views/shop/products/_form.html.haml
	spec/controllers/shop_controller_spec.rb

2015-01-12 16:48:51 +11:00

..

admin

Remove old sidebar

2015-01-09 13:10:17 +11:00

api

Move enterprises api controller out of spree namespace

2014-04-11 19:08:55 +10:00

checkout

Cart page conforms to convention in rest of checkout, adjusting helpers through checkout

2014-11-26 18:53:29 +11:00

enterprise_mailer

Hiding enterprise shop url in ent welcome email, as that may bot actually make sense

2014-11-26 14:50:19 +11:00

enterprises

Remove most references to suburbs - previously used by new_landing_page, no longer used.

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

groups

use enterprise modal

2014-10-01 18:51:49 +10:00

home

Localize more strings on home page.

2014-12-03 09:39:36 +11:00

json

get type > sells migration mostly working

2014-09-27 15:21:27 +10:00

layouts

Don't use svg for email header

2014-11-20 20:14:57 +11: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

Add clear filters feature to Producers page

2014-12-19 13:02:07 +11:00

products

Renaming everything to Shop

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

registration

Adding limit reached modal to registration

2014-09-25 12:25:32 +10:00

shared

Merge branch 'master' into variant-overrides-frontend

2015-01-12 16:48:51 +11:00

shop

Merge branch 'master' into variant-overrides-frontend

2015-01-12 16:48:51 +11:00

shopping_shared

Fix markup for better layout and getting column padding sitting where it should

2014-10-30 17:03:09 +11:00

spree

Merge branch 'master' into variant-overrides-frontend

2015-01-12 16:48:51 +11:00

user_passwords

Removing nothing special text and patching change password form slightly more

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