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

Show order notes (special instructions) on report and confirmation email

2014-07-24 15:13:23 +10:00

api

Add product soft-delete API action

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

checkout_controller_decorator.rb

Call reset order callback when order completed via paypal

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

orders_controller_decorator.rb

Renaming Product to Products and starting to figure out cart

2014-07-17 15:04:39 +10:00

paypal_controller_decorator.rb

Call reset order callback when order completed via paypal

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

store_controller_decorator.rb

Adding our own custom unauthorized page

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

user_sessions_controller_decorator.rb

Working login and signup forms for checkout, specs, redirect back to checkout on success

2014-02-07 16:07:18 +11:00

users_controller_decorator.rb

Moving User Account to darkswarm

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