Will Marshall 40f116783c Merge branch 'new_shop' ...

Conflicts:
	app/assets/stylesheets/darkswarm/images.css.sass
	app/views/modals/_producer.html.haml

2014-05-23 16:02:20 +10:00

..

admin

Merge branch 'new_shop'

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

api

Move enterprises api controller out of spree namespace

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

checkout

Restricting shipping methods

2014-05-16 10:20:32 +10:00

enterprises

Pretties, fixing the email validation issue with admin authentication steps

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

groups

Adding data to groups page

2014-05-20 12:18:28 +10:00

home

Printing taxon icons on home

2014-05-16 10:23:32 +10:00

json

Setting up after_login redirects

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

layouts

Setting up after_login redirects

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

modals

Merge branch 'new_shop'

2014-05-23 16:02:20 +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

Moving empties cart to a magic directive

2014-05-15 14:47:16 +10:00

products

Renaming everything to Shop

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

shared

Setting up after_login redirects

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

shop

Adding fields to product supplier

2014-05-23 15:59:06 +10:00

shopping_shared

Renaming our partials

2014-05-02 14:47:12 +10:00

spree

Update styling on empty cart

2014-05-20 16:40:23 +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