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

..

accounts_and_billing_settings

Adding an example bill calculator to business model config edit page

2015-12-16 19:18:58 +11:00

business_model_configuration

Adding an example bill calculator to business model config edit page

2015-12-16 19:18:58 +11:00

controllers

new validation6 02/25/2016

2016-02-25 12:36:21 +00:00

customers

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

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

directives

WIP: Reorganising variant overrides javascript files

2016-01-13 18:49:31 +11:00

dropdown

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

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

enterprise_fees

Adding option to 'Inherit From Product' for enterprise_fee tax categories

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

enterprise_groups

translations in app/assets/javascripts/admin

2015-12-21 10:11:08 +01:00

enterprises

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

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

filters

i18n from berlin hackathon

2016-01-31 12:16:33 +00:00

index_utils

WIP: Splitting Variant overrides into views

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

inventory_items

WIP: Adding infrastructure to show/hide variants + overrides using inventory items

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

line_items

Translate "Price" in Bulk Order Management

2016-03-11 12:48:35 +11:00

order_cycles

Adding global config to allow shop users to only select from inventory variants in OC interface

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

orders

Include order cycle status in new order form

2015-12-11 13:06:58 +11:00

payment_methods

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

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

products

Coffeescript!

2015-11-04 18:35:14 +11:00

services

Renaming 'Override Variant Details' permission to 'Add Products To Inventory'

2016-03-02 12:10:49 +11: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

Sanitize input for ofnTaxonAutocomplete and userSelect directives

2016-02-24 11:26:38 +11:00

users

Sanitize input for ofnTaxonAutocomplete and userSelect directives

2016-02-24 11:26:38 +11:00

utils

WIP: Splitting Variant overrides into views

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

variant_overrides

Automatically selecting a hub on inventory page when it is the only option

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

admin_ofn.js.coffee

Fix karma fail due to file load order change

2016-02-24 11:26:38 +11:00

all.js

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

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

bulk_order_management.js.coffee

Translate "Price" in Bulk Order Management

2016-03-11 12:48:35 +11:00

bulk_product_update.js.coffee

new validation 02/22/2016

2016-02-22 13:00:27 +00: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