Will Marshall 74211cbfc7 Merge branch 'master' into fixing_modals ...

Conflicts:
	app/assets/javascripts/darkswarm/all.js.coffee
	app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
	app/assets/javascripts/darkswarm/directives/modal.js.coffee
	app/views/modals/_producer.html.haml
	app/views/modals/_product.html.haml
	app/views/shop/products.rabl

2014-05-29 11:14:16 +10:00

..

authentication

Setting up after_login redirects

2014-05-22 12:40:46 +10:00

checkout

Adding indexing by user id

2014-05-14 11:08:21 +10:00

products

Merge branch 'master' into fixing_modals

2014-05-29 11:14:16 +10:00

authentication_controller.js.coffee

Patching a regression bug with login on checkout

2014-05-06 18:28:20 +10:00

current_hub_controller.js.coffee

Adding handling of 'current hub'

2014-04-25 11:32:02 +10:00

groups_controller.js.coffee

Starting on migrations and admin forms

2014-05-20 12:18:27 +10:00

hub_node_controller.js.coffee

Moving empties cart to a magic directive

2014-05-15 14:47:16 +10:00

hubs_controller.js.coffee

And patching bugs in nav

2014-05-08 17:10:29 +10:00

order_cycle_controller.js.coffee

Do not fetch products JSON on every shopping page

2014-05-29 10:54:08 +10:00

producer_node_controller.js.coffee

And patching bugs in nav

2014-05-08 17:10:29 +10:00

producers_controller.js.coffee

Starting to build out producers Angular page

2014-04-30 12:52:47 +10:00

products_controller.js.coffee

Reworking the JS specs

2014-05-22 12:40:46 +10:00

tabs_controller.js.coffee

Tidying up tabs

2014-03-27 16:36:12 +11:00

tmp_controller.js.coffee

Removing pointless foundation crud, reworking the login

2014-05-06 18:28:20 +10:00