summerscope 15cde6c372 Merge branch 'laura_and_will' into icon_font ...

Conflicts:
	app/views/groups/index.html.haml
	app/views/modals/_producers.html.haml

2014-05-30 12:12:07 +10:00

..

admin

Convert rep template to rabl

2014-05-29 17:21:52 +10:00

api

Move enterprises api controller out of spree namespace

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

checkout

Merge branch 'laura_and_will' into icon_font

2014-05-30 12:12:07 +10:00

enterprises

Pretties, fixing the email validation issue with admin authentication steps

2014-01-07 11:04:40 +11:00

groups

Merge branch 'laura_and_will' into icon_font

2014-05-30 12:12:07 +10:00

home

Add search icon into search input on hubs

2014-05-29 11:59:28 +10:00

json

Preventing rabl from dying if no current hub

2014-05-29 16:50:41 +10:00

layouts

Setting up after_login redirects

2014-05-22 12:40:46 +10:00

modals

Merge branch 'laura_and_will' into icon_font

2014-05-30 12:12:07 +10: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 'laura_and_will' into icon_font

2014-05-30 12:12:07 +10:00

products

Renaming everything to Shop

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

shared

Merge branch 'laura_and_will' into icon_font

2014-05-30 12:12:07 +10:00

shop

Style and template adjustments to shopfront top of page to get content hierarchy looking right. Removed change location link as new menu system supercedes this.

2014-05-29 16:42:05 +10:00

shopping_shared

Merge branch 'master' into laura_and_will

2014-05-30 12:01:33 +10:00

spree

Removing some unnecessary

2014-05-29 15:41:27 +10:00

suburbs

Suburb auto-complete functionality for the new landing page.

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

user_passwords

Removing nothing special text and patching change password form slightly more

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