Will Marshall 74211cbfc7 Merge branch 'master' into fixing_modals ...

Conflicts:
	app/assets/javascripts/darkswarm/all.js.coffee
	app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
	app/assets/javascripts/darkswarm/directives/modal.js.coffee
	app/views/modals/_producer.html.haml
	app/views/modals/_product.html.haml
	app/views/shop/products.rabl

2014-05-29 11:14:16 +10:00

..

admin

Merge branch 'new-product-form'

2014-05-24 17:14:32 +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

Hiding group logo if not present

2014-05-28 16:12:13 +10:00

home

Adding in links to homepage buttons for Groups & Producers

2014-05-28 12:21:25 +10:00

json

Only rendering images if they exist

2014-05-28 16:03:42 +10:00

layouts

Setting up after_login redirects

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

modals

Merge branch 'master' into fixing_modals

2014-05-29 11:14:16 +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

Merge branch 'master' into fixing_modals

2014-05-29 11:14:16 +10:00

shopping_shared

Do not fetch products JSON on every shopping page

2014-05-29 10:54:08 +10:00

spree

Move primary taxon field into Rob's new product form

2014-05-29 09:28:08 +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