Rafael Schouten 08cd273be3 Merge branch 'migrate_ent_types' into bugfix ...

Conflicts:
	app/models/spree/ability_decorator.rb

2014-10-18 07:37:41 +11:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

2014-09-06 12:00:27 +10:00

controllers

Merge branch 'master' into migrate_ent_types

2014-10-07 10:52:26 +11:00

features

Merge branch 'migrate_ent_types' into bugfix

2014-10-18 07:37:41 +11:00

helpers

Bulk Order Management works with navigation helper override

2014-09-06 00:34:27 +10:00

javascripts

change enterprise category name ans use symbols instead of strings

2014-10-16 16:26:49 +11:00

lib

Fix intermittent failing spec

2014-09-08 11:11:07 +10:00

mailers

Sends confirmation email when Enterprise is created

2014-09-12 13:24:17 +10:00

models

Merge branch 'migrate_ent_types' into bugfix

2014-10-18 07:37:41 +11:00

requests

Adding our first request spec

2014-05-05 12:10:14 +10:00

serializers

Applying new icons for map view

2014-08-29 18:04:06 +10:00

support

can specify attributes for create_enterpise_user

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

views

Rename spec to match view name change

2014-09-05 15:10:14 +10:00

factories.rb

Bugfix for specs

2014-10-02 16:49:32 +10:00

spec_helper.rb

Add spec helper method for logging in as admin in controller specs

2014-07-16 10:15:27 +10:00