Rob Harrington 903ed7e507 Merge branch 'master' into variable_weights ...

Conflicts:
	app/assets/javascripts/admin/bulk_order_management.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
	app/views/spree/api/line_items/bulk_show.v1.rabl
	spec/features/admin/bulk_order_management_spec.rb

2015-05-21 17:31:33 +10:00

..

authentication_spec.rb

Allow extended time for all parts of this spec to fix intermittent fails

2015-05-07 14:23:58 +10:00

bulk_order_management_spec.rb

Merge branch 'master' into variable_weights

2015-05-21 17:31:33 +10:00

bulk_product_update_spec.rb

Adding sku to BPE

2015-04-22 21:02:07 +10:00

cms_spec.rb

Fix specs that relied on the old login page which we now redirect to the new page

2015-03-25 12:11:06 +11:00

enterprise_fees_spec.rb

EnterpriseFee admin interface allows selecting no fee

2015-03-16 14:05:04 +11:00

enterprise_groups_spec.rb

Updating feature spec for groups

2015-01-22 16:04:46 +11:00

enterprise_relationships_spec.rb

Admin can grant create_variant_overrides permission

2015-01-30 11:56:05 +11:00

enterprise_roles_spec.rb

Delete specific E2ER in spec

2014-09-11 14:54:51 +10:00

enterprise_user_spec.rb

Merge branch 'master' into migrate_ent_types

2014-10-01 16:11:20 +10:00

enterprises_spec.rb

Admin can set enterprises to charge or not charge sales tax

2015-04-17 13:41:38 +10:00

image_settings_spec.rb

Admin can change the format that Spree::Images are stored/served in

2014-10-16 12:41:11 +11:00

order_cycles_spec.rb

Rearranging elements on the order cycle form a little bit

2015-04-08 14:31:18 +10:00

orders_spec.rb

Fix specs: feature specs requiring payment and shipping methods, race condition, double flash message issue

2014-11-01 12:11:50 +11:00

overview_spec.rb

Adding specs for single ent dash and remove product ability for profiles

2014-10-24 15:27:08 +11:00

payment_method_spec.rb

Can change hub after changing pm type

2014-08-09 11:23:05 +10:00

products_spec.rb

Fixing product spec, using have_select2 instead of have_field

2015-04-02 14:36:19 +11:00

reports_spec.rb

Adding a distributor to order cycle to fix broken feature spec

2015-05-07 12:50:57 +10:00

shipping_methods_spec.rb

Remove shipping category from admin edit shipping methods

2014-06-19 18:31:52 +10:00

variant_overrides_spec.rb

Fix bug: When there are variant overrides not owned by the current user, user is unable to make any changes to VOs

2015-03-13 10:45:38 +11:00

variants_spec.rb

Consistency

2014-10-16 12:08:12 +11:00