Rohan Mitchell 610a4c03fe Merge branch 'master' into redesign ...

Conflicts:
	app/controllers/home_controller.rb
	app/views/producers/index.html.haml
	app/views/shared/menu/_mobile_menu.html.haml
	app/views/shop/products/_form.html.haml
	config/routes.rb
	spec/controllers/shops_controller_spec.rb

2015-06-10 18:27:50 +10:00

..

admin

Merge branch 'master' into customers

2015-06-03 15:19:40 +08:00

spree

Decorators can't be in same file name as original file, otherwise the original file is ignored

2015-01-30 11:23:49 +11: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

ng_text_field handling options parameter

2014-07-31 15:20:22 +10: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

Add helper to display total tax on an order

2015-04-17 13:39:09 +10:00

enterprise_fees_helper.rb

angular_options_for_select

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

enterprises_helper.rb

Moving shopfront trial progress bar logic into enterprises helper and dealing with expiry

2014-11-26 15:16:53 +11:00

groups_helper.rb

code style and cleanup

2015-02-19 10:48:39 +11: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

Avoid loading enterprise injection data when it's not be needed due to caching

2015-05-27 15:44:01 +10:00

map_helper.rb

Starting on on the map

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

markdown_helper.rb

Content-manage footer fields

2015-05-06 16:36:10 +10:00

order_cycles_helper.rb

Renaming order_cycle_enterprises_for as visible_enterprises

2015-04-11 22:25:23 +10: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

spree_currency_helper.rb

add spree currency helper, fix some typos and specs

2014-09-11 11:47:55 +10:00