Rafael Schouten 1aa80e53b1 Merge branch 'master' into currency ...

Conflicts:
	app/helpers/injection_helper.rb
	db/suburb_seeds.rb

2014-09-16 10:25:22 +10:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

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

controllers

Differentiation of on-boarding process by url

2014-09-12 11:00:34 +10:00

features

Try newer syntax to fix spec failing on CI

2014-09-12 23:41:26 +10:00

helpers

Bulk Order Management works with navigation helper override

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

javascripts

Merge branch 'master' into currency

2014-09-16 10:25:22 +10: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

Enterprise validates owner enterprise_limit

2014-09-11 14:54:51 +10: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

Enterprise validates owner enterprise_limit

2014-09-11 14:54:51 +10:00

views

Rename spec to match view name change

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

factories.rb

Adding owner to enterprise

2014-09-11 14:36:09 +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