Will Marshall 20d7484134 Merge branch 'master' into laura_and_will ...

Conflicts:
	app/assets/javascripts/darkswarm/services/order.js.coffee

2014-07-28 13:43:31 +10:00

..

admin

Variants controller #search filters by distribution

2014-07-16 10:31:12 +10:00

api

Add product soft-delete API action

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

checkout_controller_spec.rb

Fix checkout confirmation page blank (access denied) when checking out anonymously - BugHerd #139

2013-11-08 15:27:32 +11:00

orders_controller_spec.rb

Reworking order populator and controller to handle replacement of line items rather than addition

2014-07-16 16:00:28 +10:00

paypal_controller_spec.rb

Adapt cancel redirect for better spree paypal express

2014-07-25 12:44:14 +10:00

store_controller_spec.rb

Adding our own custom unauthorized page

2014-05-30 11:24:37 +10:00