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

Add shipping method injection helper using id name serializer

2014-07-24 10:16:55 +10:00

spree

Admin can remove producer properties

2014-06-18 15:28:41 +10:00

add_to_cart_helper.rb

Add to cart page does not allow the user to add a product from an order cycle that cannot supply the cart's products

2013-06-04 10:26:13 +10:00

angular_form_builder.rb

Change angular_ prefix to ng_

2012-11-26 10:03:20 +11:00

angular_form_helper.rb

Change angular_ prefix to ng_

2012-11-26 10:03:20 +11:00

application_helper.rb

Adding some requirement filters to the Orders controller

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

checkout_helper.rb

Call reset order callback when order completed via paypal

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

enterprise_fees_helper.rb

angular_options_for_select

2012-11-22 11:24:05 +11:00

enterprises_helper.rb

Moving payment methods and shipping methods into their own services

2014-07-17 14:19:39 +10:00

groups_helper.rb

Adding groups to this branch, also tidying up the shop stuff for Laura

2014-05-16 14:00:33 +10:00

html_helper.rb

Show two linebreaks for end of block level tags, strip whitespace from end of string

2014-03-12 13:52:13 +11:00

injection_helper.rb

Starting to restructure data injection

2014-07-18 11:21:51 +10:00

map_helper.rb

Starting on on the map

2014-06-06 14:04:45 +10:00

order_cycles_helper.rb

Merging from master

2013-12-17 14:18:21 +11:00

shared_helper.rb

Moving payment methods and shipping methods into their own services

2014-07-17 14:19:39 +10:00

shop_helper.rb

We can now hit the index page

2013-12-05 15:07:46 +11:00