Rob Harrington ab7bfd10c5 Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module" ...

This reverts commit e86e08b72e939fee61eddd41d56081395666a877.

Conflicts:
	lib/open_food_network/order_and_distributor_report.rb
	spec/features/admin/variants_spec.rb
	spec/lib/open_food_network/order_and_distributor_report_spec.rb

2015-10-28 13:08:50 +11:00

..

accounts_and_billing_settings

Adding js infrastructure to dynamically fetch available payment and shipping methods for accounts distributor

2015-09-17 22:38:08 +10:00

controllers

Filter relationships by permission

2015-06-12 17:03:17 +10:00

customers

Fixing customer index feature spec, only checking shop when something has been selected

2015-06-03 16:18:09 +08:00

directives

Merge branch 'master' into customers

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

dropdown

Moving toggle_column directive to index_utils

2015-05-13 12:44:33 +10:00

enterprise_groups

textAngular editor for group description

2015-04-15 17:13:10 +10:00

enterprises

Add error checking to client-side permalink service

2015-07-10 09:42:09 +10:00

filters

Filter relationships by permission

2015-06-12 17:03:17 +10:00

index_utils

More styling tweaks

2015-06-12 16:09:53 +08:00

order_cycles

Only check editable status of variants when actually selecting

2015-04-09 15:24:45 +10:00

payment_methods

Split out payment and shipping methods from admin enterprises controller as services

2015-01-22 12:19:41 +11:00

products

UnitsCtrl can interpret unit_value_with_description without a separating space

2015-04-24 12:15:35 +10:00

services

Fixing display of cloned products

2015-08-27 13:05:09 +10:00

shipping_methods

Split out payment and shipping methods from admin enterprises controller as services

2015-01-22 12:19:41 +11:00

side_menu

Adding ability to show and hide menu items

2014-12-19 14:03:59 +11:00

taxons

Fix broken JS spec

2015-01-15 13:43:38 +11:00

users

Adding manager managment to enterprise edit form

2015-02-12 11:34:58 +11:00

utils

Moving navigation check to controller

2015-01-22 10:19:44 +11:00

admin.js.coffee

BOM uses columns controller from index utils module

2015-05-13 12:44:34 +10:00

all.js

Adding js infrastructure to dynamically fetch available payment and shipping methods for accounts distributor

2015-09-17 22:38:08 +10:00

bulk_order_management.js.coffee

Group Buy panel on BOM takes changes to final_weight_volumes into account

2015-10-28 13:07:32 +11:00

bulk_product_update.js.coffee

Merge branch 'master' into customers

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

enterprise_fees.js

Enterprise fees admin page for a specific enterprise auto-selects that enterprise for new fees and only allows selection of managed enterprises

2013-10-30 17:00:05 +11:00

order_cycle.js.erb.coffee

Only check editable status of variants when actually selecting

2015-04-09 15:24:45 +10:00

util.js.erb

Dedicated new enterprise form

2014-12-19 14:05:24 +11:00

variant_autocomplete_with_distribution_filter.js.coffee

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00