Will Marshall fc02e7857a Merge branch 'master' into laura_and_will ...

Conflicts:
	app/views/shopping_shared/_contact.html.haml

2014-06-04 17:24:30 +10:00

..

admin

Revert "Do not show deleted products in order cycle admin"

2014-06-03 12:18:27 +10:00

api

Move enterprises api controller out of spree namespace

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

checkout

Merge branch 'master' into laura_and_will

2014-06-04 17:24:30 +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

Styling label on taxons on fat view of active table for hubs (add a little padding to right)

2014-06-04 17:16:47 +10:00

json

Adding social media data to producers biatch

2014-06-04 17:13:18 +10:00

layouts

Returning to the basic flash for now

2014-06-04 17:13:19 +10:00

modals

Adding new icons into producer modal. Making it pretty

2014-06-04 16:50:51 +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

Adding in new icon into producer partial

2014-05-30 13:08:18 +10:00

products

Renaming everything to Shop

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

shared

Changing shop link to correct /shop

2014-06-04 16:57:21 +10:00

shop

Merge branch 'master' into laura_and_will

2014-06-04 17:24:30 +10:00

shopping_shared

Merge branch 'master' into laura_and_will

2014-06-04 17:24:30 +10:00

spree

Merge branch 'master' into laura_and_will

2014-06-04 17:24:30 +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