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

Conflicts:
	app/models/enterprise.rb

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

..

archive/features/consumer

Special Instructions in checkout are actually wired up

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

controllers

Explicitly set confirmed_at for unconfirmed enterprise

2014-10-17 18:31:35 +11:00

features

Merge branch 'master' into bugfix

2014-10-21 08:51:23 +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

Only send one enterprise creation confirmation email

2014-10-17 12:29:51 +11:00

models

Merge branch 'master' into bugfix

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

requests

Adding our first request spec

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

serializers

Visibility in the front end is contingent upon enterprise being confirmed

2014-10-15 12:27:55 +11: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

Adding confirmed_at to enterprise factory

2014-10-17 17:32:27 +11:00

spec_helper.rb

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

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