Maikel Linke 5d5fda3a25 Merge remote-tracking branch 'origin/master' into i18n ...

Conflicts:
	config/locales/en.yml

2015-11-13 10:07:29 +11:00

..

enterprises

Splitting enterprise index feature specs into their own file, reinstating old enterprise index for super admin users

2015-06-12 01:49:39 +08:00

account_spec.rb

Adding basic template for account page

2015-09-17 22:38:10 +10:00

accounts_and_billing_settings_spec.rb

Redesignating all references to user_invoices as account_invoices

2015-09-17 22:38:28 +10:00

adjustments_spec.rb

Move adjustment specs to their own spec file

2015-11-11 11:53:04 +11: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

Make spec more resilient

2015-11-10 15:05:45 +11:00

bulk_product_update_spec.rb

Add wait between clicks to fix race condition

2015-06-03 12:51:15 +10:00

cms_spec.rb

Update tests for new label "Login"

2015-10-07 14:06:34 +11:00

content_spec.rb

Admin can upload logo for ContentConfig

2015-07-17 16:06:49 +10:00

customers_spec.rb

Fixing customer index feature spec, only checking shop when something has been selected

2015-06-03 16:18:09 +08:00

enterprise_fees_spec.rb

Enterprise Fee feature specs work with new enteprise user enterprise index

2015-06-12 03:10:14 +08:00

enterprise_groups_spec.rb

Replace 'array.sort.should == expected.sort' pattern with match_array

2015-05-28 10:46:08 +10:00

enterprise_relationships_spec.rb

Replace 'array.sort.should == expected.sort' pattern with match_array

2015-05-28 10:46:08 +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

Shift legacy redirect further down routes to avoid stomping /enterprises/check_permalink

2015-07-10 09:42:09 +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

Merge branch 'master' into require_standard_variant

2015-05-28 15:08:13 +10:00

orders_spec.rb

Merge branch 'master' into folklabs-producer-emails

2015-11-11 14:20:25 +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

Payment Method feature specs work with new enteprise user enterprise index

2015-06-12 03:10:37 +08:00

products_spec.rb

Restoring all changes of the last combined branch

2015-09-10 15:03:13 +10:00

reports_spec.rb

Display summary rows for admin adjustments

2015-11-01 13:42:59 +11:00

shipping_methods_spec.rb

Shipping Method feature specs work with new enteprise user enterprise index

2015-06-12 03:10:50 +08:00

tax_settings_spec.rb

Adding tax settings for billing enterprise users

2015-09-17 22:38:13 +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

Don't try and delete the only variant, that will never work!

2015-04-17 16:49:14 +10:00