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

As an enterprise user, when I create an enterprise, I should have management permission for it

2013-09-30 11:10:20 +10:00

api

Authorise access to OrderCycles API

2014-04-24 13:20:16 +10:00

spree

Merge branch 'master' into laura_and_will

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

base_controller_spec.rb

Minor refactoring from code review with Rohan

2014-06-19 11:41:24 +10:00

cart_controller_spec.rb

Alter on_hand counts for products to fix broken specs

2014-03-06 13:14:06 +11:00

checkout_controller_spec.rb

Adapt cancel redirect for better spree paypal express

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

enterprises_controller_spec.rb

Removing code

2014-05-14 15:16:29 +10:00

groups_controller_spec.rb

Dereferencing groups and adding modals to page

2014-06-24 17:15:31 +10:00

home_controller_spec.rb

Fixing some regressions in tests, switching favicons

2014-06-26 15:04:32 +10:00

map_controller_spec.rb

Minor refactoring from code review with Rohan

2014-06-19 11:41:24 +10:00

producers_controller_spec.rb

Fixing some regressions in tests, switching favicons

2014-06-26 15:04:32 +10:00

shop_controller_spec.rb

Uncaching some parts and adding specs

2014-07-10 14:49:21 +10:00

user_passwords_controller_spec.rb

Switching our recover password form to Darkswarm

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

user_registrations_controller_spec.rb

Adding our own user registrations controller, reworking sidebar a touch

2014-03-21 15:18:27 +11:00