Rohan Mitchell eac22df200 Merge branch 'master' into redesign ...

Conflicts:
	app/assets/javascripts/templates/product_modal.html.haml

2015-05-13 09:53:20 +10:00

..

admin

Content-manage footer fields

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

api

Move enterprises api controller out of spree namespace

2014-04-11 19:08: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

Replacing all uses of the old enterprise shop url helper

2015-01-22 10:19:43 +11:00

enterprises

Replacing all uses of the old enterprise shop url helper

2015-01-22 10:19:43 +11:00

groups

Merge branch 'master' into redesign

2015-05-13 09:53:20 +10:00

home

Merge branch 'master' into redesign

2015-05-13 09:53:20 +10:00

json

exposing more group attributes to angular

2015-02-18 14:55:42 +11:00

layouts

Registration markup tweak with new icons

2015-05-02 18:24:55 +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-05-13 09:53:20 +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

Tighten up footer lock

2015-05-12 11:49:45 +10:00

shop

Merge branch 'master' into redesign

2015-05-13 09:53:20 +10:00

shopping_shared

Merge branch master into properties

2015-04-17 13:23:33 +10:00

shops

Style shops signup page

2015-05-12 13:51:31 +10:00

spree

Merge branch 'master' into redesign

2015-05-13 09:53:20 +10:00

user_passwords

Removing nothing special text and patching change password form slightly more

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