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

..

admin

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

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

partials

Introduce contact email address for enterprises

2016-02-24 15:14:07 +11:00

registration

Set public enterprise.email_address at registration

2016-03-04 17:50:04 +11:00

active_selector.html.haml

Add tooltip with value for selectors

2015-04-23 14:11:50 +10:00

authentication.html.haml

Changing our composition of producers and hubs

2014-06-17 16:33:43 +10:00

enterprise_modal.html.haml

Add shop-for-products-at to map producer modals

2015-07-10 15:51:57 +10:00

filter_selector.html.haml

Making ul element the root of filter_selectors directive, so resolve issue with using ng-repeat element as root of a replacement directive

2015-06-15 15:43:01 +08:00

flash.html.haml

Compacting down our flash messages

2014-06-04 17:13:19 +10:00

forgot.html.haml

using translate filter instead of root scope function

2015-10-08 18:09:11 +11:00

loading.html.haml

Fixing map issues, adding a nice pretty loader

2014-06-12 11:50:28 +10:00

login.html.haml

using translate filter instead of root scope function

2015-10-08 18:09:11 +11:00

price_breakdown_button.html.haml

Restyling button for price breakdown to make it more clear that users press again to close the pop over

2014-12-19 17:05:13 +11:00

price_breakdown.html.haml

new translate filter and updated specs for js translations

2015-10-07 15:47:51 +11:00

price_percentage.html.haml

using translate filter instead of root scope function

2015-10-08 18:09:11 +11:00

product_modal.html.haml

using translate filter instead of root scope function

2015-10-08 18:09:11 +11:00

registration_authentication.html.haml

using translate filter instead of root scope function

2015-10-08 18:09:11 +11:00

registration.html.haml

Adding the remainder of pages to registration process

2014-09-11 17:07:05 +10:00

shipping_type_selector.html.haml

Refactoring filter selectors

2016-02-04 16:08:19 +11:00

shop_variant.html.haml

using translate filter instead of root scope function

2015-10-08 18:09:11 +11:00

signup.html.haml

using translate filter instead of root scope function

2015-10-08 18:09:11 +11:00

single_line_selectors.html.haml

Refactoring filter selectors

2016-02-04 16:08:19 +11:00