Rafael Schouten 89ce4ba632 Merge branch 'master' into bugfix ...

Conflicts:
	app/models/enterprise.rb

2014-10-21 08:51:23 +11:00

..

authentication_spec.rb

Fixing a scope issue

2014-05-30 13:01:16 +10:00

bulk_order_management_spec.rb

Revert "Pending bulk order mgmt specs"

2014-09-20 18:06:42 +10:00

bulk_product_update_spec.rb

Make dates consistent

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

Adding attr_accessors and paperclip file uploads

2014-05-20 12:18:28 +10:00

enterprise_relationships_spec.rb

can specify attributes for create_enterpise_user

2014-09-25 11:56:18 +10: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

Merge branch 'master' into migrate_ent_types

2014-10-07 10:52:26 +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

show all permitted enterprises in order cycle summery

2014-10-18 03:26:57 +11:00

orders_spec.rb

Make sure d1 != d2

2014-09-24 20:48:52 +10:00

overview_spec.rb

Trailing spaces crusader: one man, a million trailing spaces

2014-09-11 15:19:23 +10:00

payment_method_spec.rb

Can change hub after changing pm type

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

products_spec.rb

Edit product form shows permitted suppliers

2014-09-12 11:33:47 +10:00

reports_spec.rb

can specify attributes for create_enterpise_user

2014-09-25 11:56:18 +10:00

shipping_methods_spec.rb

Remove shipping category from admin edit shipping methods

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

variants_spec.rb

Consistency

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