Rohan Mitchell 0431e0048c Merge branch 'master' into variant-overrides-frontend ...

Conflicts:
	app/controllers/shop_controller.rb
	app/views/shop/products/_form.html.haml
	spec/controllers/shop_controller_spec.rb

2015-01-12 16:48:51 +11:00

..

admin

Add correct markup for tax category required asterisk

2015-01-09 12:45:35 +11:00

api

Add fields for variant display name and display as to bpe

2014-06-06 10:10:41 +10:00

checkout/payment

Remove obsolete spree checkout views

2014-12-11 16:17:15 +11:00

layouts

Adding header to welcome page

2014-10-23 14:50:56 +11:00

order_mailer

Fixing typos and changing delivery address display in order confirmation email

2014-12-12 12:00:15 +11:00

orders

Show overridden price in shopping cart

2014-12-19 16:51:11 +11:00

products

Remove add to cart distribution selection, remove distribution change functionality from OrderPopulator, remove now-redundant tests

2014-01-08 11:39:05 +11:00

shared

Cart page conforms to convention in rest of checkout, adjusting helpers through checkout

2014-11-26 18:53:29 +11:00

user_mailer

Remove obsolete text version of user signup_confirmation

2014-11-26 18:58:26 +11:00

users

Moving User Account to darkswarm

2014-03-28 16:02:32 +11:00

_sidebar.html.haml

WIP Add hub and order cycle display stub with failing tests

2013-03-08 15:18:52 +11:00