Maikel Linke 903bd21577 Merge remote-tracking branch 'origin/master' into group-pages-merge ...

Conflicts:
	README.markdown
	db/schema.rb

2015-02-13 15:42:36 +11:00

..

authentication_spec.rb

Hopefully fixing Poltergeist Timeout error due to long long time for first admin spec

2014-11-27 14:42:02 +11:00

bulk_order_management_spec.rb

Shaving some seconds from BOM spec by using simple order cycles and splitting specs up into more logical contexts

2014-12-12 15:43:05 +11:00

bulk_product_update_spec.rb

Rename div update-status-message to status-message

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

cms_spec.rb

Reworking some broken tests

2014-04-29 15:13:59 +10:00

enterprise_fees_spec.rb

Set increased Capybara.default_wait_time globally

2014-05-02 14:25:32 +10: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

Moving interface for changing owner to new 'Users' tab

2015-02-12 11:34:58 +11: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

Using simple_order_cycle in spec

2014-11-28 14:45:35 +11: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

Spec that shipping category can be set when creating new products

2015-01-09 12:46:36 +11:00

reports_spec.rb

Fix syntax error, spec for removed column

2014-12-19 10:01:46 +11: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

Load correct set of variant override producers, use variant_override_enterprises_per_hub, tighten specs

2015-02-04 11:20:08 +11:00

variants_spec.rb

Consistency

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