Rohan Mitchell 1531c476e3 Merge branch 'master' into require_standard_variant ...

Conflicts:
	spec/controllers/spree/admin/variants_controller_spec.rb

2015-05-08 13:45:31 +10:00

..

admin

Merge branch 'properties'

2015-04-17 15:25:51 +10:00

api

Move enterprises api controller out of spree namespace

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

checkout

Do not show tax in checkout

2015-04-17 13:39:09 +10:00

enterprise_mailer

Replacing all uses of the old enterprise shop url helper

2015-01-22 10:19:43 +11:00

enterprises

Replacing all uses of the old enterprise shop url helper

2015-01-22 10:19:43 +11:00

groups

bind-once in groups home page

2015-05-03 14:41:34 +10:00

home

bind-once on hubs

2015-05-03 14:11:09 +10:00

json

exposing more group attributes to angular

2015-02-18 14:55:42 +11:00

layouts

Merge branch master into properties

2015-04-17 13:23:33 +10:00

map

Adding some map searching capabilities

2014-07-16 11:19:16 +10:00

modals

swap redundant producer modal for general enterprise modal

2014-10-07 10:48:04 +11: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

Added bindonce and ng-if improvements to Producers templates

2015-05-03 12:51:59 +10:00

products

Renaming everything to Shop

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

registration

Spacing

2015-03-27 13:09:25 +11:00

shared

Merge branch master into properties

2015-04-17 13:23:33 +10:00

shop

bind-once in products

2015-05-03 14:02:33 +10:00

shopping_shared

Merging master into require_standard_variant

2015-04-17 21:18:24 +10:00

spree

Merge branch 'master' into require_standard_variant

2015-05-08 13:45:31 +10:00

user_passwords

Removing nothing special text and patching change password form slightly more

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