Maikel Linke 2a3b3b6dd2 Merge remote-tracking branch 'origin/master' into i18n-hackathon ...

Conflicts:
	app/assets/javascripts/admin/enterprise_fees.js
	app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee
	app/views/admin/shared/_columns_dropdown.html.haml
	app/views/admin/variant_overrides/_header.html.haml
	app/views/admin/variant_overrides/_products.html.haml
	spec/features/admin/bulk_order_management_spec.rb
	spec/features/admin/variant_overrides_spec.rb

2016-03-11 15:38:28 +11:00

..

open_food_network/calculator

Rename OpenFoodWeb namespace to OpenFoodNetwork

2013-10-18 17:29:55 +11:00

spree

Merge remote-tracking branch 'origin/master' into i18n-hackathon

2016-03-11 15:38:28 +11:00

.gitkeep

new rails 3.1.4 app

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

account_invoice.rb

Linking billable_periods to the relevant account_invoice upon creation

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

adjustment_metadata.rb

Add AdjustmentMetadata, for holding info about enterprise fee adjustments at time of creation

2013-08-12 10:00:35 +10:00

billable_period.rb

Formatting dates for account invoices in rails time zone

2015-12-17 11:34:06 +11:00

cart.rb

Fix multicart use of OrderPopulator

2014-01-08 14:13:19 +11:00

content_configuration.rb

Make TOS URL configurable

2015-07-31 14:51:17 +10:00

customer.rb

Remove duplicate lines from merging

2016-03-09 18:49:35 +11:00

distributor_shipping_method.rb

Adding tests and full touch behaviour for caching

2014-07-04 14:39:26 +10:00

enterprise_fee_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

enterprise_fee.rb

EnterpriseFees can inherit tax_category from product

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

enterprise_group.rb

PermalinkGenerator for products

2015-09-16 15:45:10 +10:00

enterprise_relationship_permission.rb

Style permission list items, order perms consistently by name

2014-08-25 15:05:49 +10:00

enterprise_relationship.rb

Merge remote-tracking branch 'origin/master' into i18n-hackathon

2016-03-11 15:38:28 +11:00

enterprise_role.rb

Enterprise roles must be unique

2014-08-15 16:09:05 +10:00

enterprise_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

enterprise.rb

Merge remote-tracking branch 'origin/master' into groups

2016-03-02 15:31:35 +11:00

exchange_fee.rb

Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants

2012-11-26 11:03:44 +11:00

exchange_variant.rb

Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants

2012-11-26 11:03:44 +11:00

exchange.rb

Sort exchanges for display when editing an order cycle

2015-12-10 09:17:25 +11:00

inventory_item.rb

Adding data migration to populate inventories of enterprises that are already using variant overrides

2016-03-02 12:10:49 +11:00

model_set.rb

Variant Overrides Index: User can manually reset inheritance

2016-01-15 09:07:51 +11:00

order_cycle_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

order_cycle.rb

Hiding a variant from inventory prevents it being available on the shopfront

2016-03-02 12:10:22 +11:00

producer_property.rb

Admin can reorder producer properties

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

product_distribution.rb

Lock enterprise fee adjustments on creation to avoid them being recalculated against order by update hooks

2013-08-19 14:38:51 +10:00

variant_override_set.rb

Variant Overrides Index: User can manually reset inheritance

2016-01-15 09:07:51 +11:00

variant_override.rb

Applying variant override permissions when they are added or removed

2016-03-02 12:10:49 +11:00