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

..

controllers

dry enterprise angular

2014-09-25 13:06:02 +10:00

directives

Merge branch 'master' into cleanup

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

filters

Merge branch 'master' into cleanup

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

mixins

Don't add payment forms to checkout DOM unless required

2014-08-27 15:09:41 +10:00

services

dry enterprise angular

2014-09-25 13:06:02 +10:00

all.js.coffee

Adding images to registration process

2014-09-19 12:41:24 +10:00

cart.js.coffee

Moving everything to a single Angular application

2014-03-20 16:58:57 +11:00

darkswarm.js.coffee

Adding images to registration process

2014-09-19 12:41:24 +10:00

overrides.js.coffee

Displaying server errors as well

2014-04-10 17:21:34 +10:00