Rafael Schouten 55f4415c0d Merge branch 'master' into cleanup ...

Conflicts:
	app/assets/javascripts/darkswarm/services/hubs.js.coffee
	app/views/home/_hubs.html.haml
	app/views/producers/_filters.html.haml
	app/views/producers/index.html.haml

2014-09-25 19:42:20 +10:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

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

controllers

Registration controller checks number of owned enterpises

2014-09-25 12:10:45 +10:00

features

can specify attributes for create_enterpise_user

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

helpers

Bulk Order Management works with navigation helper override

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

javascripts

Merge branch 'master' into cleanup

2014-09-25 19:42:20 +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

Merge branch 'master' into ent_types_frontend

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

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

Explicitly create enterprises in order_cycle factory to fix intermittent fail

2014-09-24 14:00:08 +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