Rob Harrington 439d122e93 Merge branch 'master' into customers ...

Conflicts:
	app/assets/javascripts/admin/bulk_order_management.js.coffee
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
	db/schema.rb
	spec/javascripts/unit/bulk_order_management_spec.js.coffee

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

..

components

Adding trial progress bar

2014-10-24 12:32:05 +11:00

alert.css.sass

Fiddle with alert styling

2014-10-16 11:34:06 +11:00

all.css

Adding ngTagsInput to admin assets

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

change_type_form.css.sass

Make margine appear for small devices only

2014-10-24 14:48:29 +11:00

dashboard_item.css.sass

outline inputs with errors

2014-09-24 16:59:57 +10:00

dashboard-single-ent.css.sass

Dedicated new enterprise form

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

enterprise_console.css.scss

Adding a javascript interface for checking permalinks and user input on enterprise console

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

icons.css.scss

Add refund icon

2015-04-30 15:49:48 +10:00

openfoodnetwork.css.scss

Greying out disabled action button

2015-04-17 11:25:18 +10:00

orders.css.scss

Fixing styling of inputs for with pending/success/error status

2015-05-14 11:39:37 +10:00

products.css.scss

Rename div update-status-message to status-message

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

relationships.css.sass

Style permission list items, order perms consistently by name

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

restore_spree_from_cms.css.scss

Ensure css is precompiled, reformat configs

2013-11-01 16:22:54 +11:00

side_menu.css.sass

Using pure css for styling odd and even menu items

2015-02-19 10:22:37 +11:00

sidebar-item.css.sass

move checks and links in sidebars

2014-09-26 17:58:00 +10:00

variant_overrides.css.sass

Show extended variant name/unit info for admin variant overrides

2015-01-29 15:15:28 +11:00

welcome.css.sass

Remove unnecessary partial import

2014-10-30 11:30:21 +11:00