Will Marshall f7c71568df Merge branch 'laura_and_will' ...

Conflicts:
	app/models/spree/variant_decorator.rb
	db/schema.rb
	spec/models/spree/product_spec.rb
	spec/models/spree/variant_spec.rb

2014-06-13 12:42:14 +10:00

..

admin

Do not show deleted products in order cycle admin

2014-06-12 14:59:27 +10:00

api

Move enterprises api controller out of spree namespace

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

checkout

Show shipping method via angular only (don't show spree's adjustment)

2014-06-06 17:05:50 +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

Smooth scrolling, svg support via directive

2014-06-13 11:00:28 +10:00

json

Adding working scrolling to anchors

2014-06-12 16:13:51 +10:00

layouts

Merging in maps

2014-06-10 14:54:12 +10:00

map

Fixing map issues, adding a nice pretty loader

2014-06-12 11:50:28 +10:00

modals

Adding working scrolling to anchors

2014-06-12 16:13: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 working scrolling to anchors

2014-06-12 16:13:51 +10:00

products

Renaming everything to Shop

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

shared

Changing class name to remove ofn- from naming convention which call the icon font styling

2014-06-12 12:12:25 +10:00

shop

Smooth scrolling, svg support via directive

2014-06-13 11:00:28 +10:00

shopping_shared

Changing class name to remove ofn- from naming convention which call the icon font styling

2014-06-12 12:12:25 +10:00

spree

Move dynamic placeholder logic to directive so that it can be used for master variants too

2014-06-12 12:58:40 +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