Maikel Linke 984641e46c Merge remote-tracking branch 'origin/master' into uk/trial-length ...

Conflicts:
	config/locales/en.yml

2016-07-20 11:40:52 +10:00

..

admin

Auto-merge from CI [skip ci]

2016-06-30 01:30:53 +10:00

spree

Allowing Order Management Report to filter by multiple payment / shipping methods at once

2016-04-02 01:04:09 +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

WIP: Using directive for EnterpriseFee index select elements, to properly bind data to the model

2016-03-02 11:56:46 +11:00

angular_form_helper.rb

WIP: Using directive for EnterpriseFee index select elements, to properly bind data to the model

2016-03-02 11:56:46 +11:00

application_helper.rb

Cleaner opengraph meta tags

2016-01-20 15:42:01 +11:00

checkout_helper.rb

Delete fee on payment method if payment invalid

2016-07-15 17:43:26 +10:00

discourse_helper.rb

UI integration of Discourse login

2016-01-07 19:01:09 +11:00

enterprise_fees_helper.rb

WIP: Using directive for EnterpriseFee index select elements, to properly bind data to the model

2016-03-02 11:56:46 +11:00

enterprises_helper.rb

Find current_customer via current_distributor and current_user rather than current_order

2016-05-28 00:31:59 +10: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

Include shop enterprise on shop front

2016-07-06 12:45:12 +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

Allow admins and managers to see restricted shops

2016-03-25 12:04:26 +11:00

spree_currency_helper.rb

add spree currency helper, fix some typos and specs

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