Rohan Mitchell eac22df200 Merge branch 'master' into redesign ...

Conflicts:
	app/assets/javascripts/templates/product_modal.html.haml

2015-05-13 09:53:20 +10:00

..

partials

bind-once in partials

2015-05-03 14:34:42 +10:00

registration

Require that the user selects whether their enterprise charges sales tax

2015-04-17 13:41:38 +10: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

dry enterprise angular

2014-09-25 13:06:02 +10:00

filter_selector.html.haml

Changed selectors' ng-repeat. Using existing variable instead of method call

2015-05-03 15:24:16 +10:00

flash.html.haml

Compacting down our flash messages

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

forgot.html.haml

Adding reset password stuff

2014-05-09 14:26:07 +10:00

loading.html.haml

Fixing map issues, adding a nice pretty loader

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

login.html.haml

Authentication steps test

2014-05-09 14:13:39 +10: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

Fees are calculated correctly for items with variant overrides

2014-12-18 11:53:17 +11:00

price_percentage.html.haml

Change Cost label to Item Cost for price breakdowns

2014-08-06 13:02:37 +10:00

product_modal.html.haml

Merge branch 'master' into redesign

2015-05-13 09:53:20 +10:00

registration_authentication.html.haml

Getting signup to work and authentication to load in reg specific template

2014-09-11 17:07:07 +10: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

Pulling some structure out of directives

2014-07-11 12:45:08 +10:00

shop_variant.html.haml

Add in logic to style price column differently if nul vs has value

2015-01-15 16:01:00 +11:00

signup.html.haml

Getting signup to work and authentication to load in reg specific template

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

single_line_selectors.html.haml

Resolve conflict for overflow dropdown between multiple single-line-selectors on the one page

2015-04-24 16:05:39 +10:00