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

..

admin

Further removal of references to 'Admin' from global namespace

2014-05-24 17:15:20 +10:00

darkswarm

Merge branch 'master' into fixing_modals

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

search

Upgrading Foundation, starting to work through regression issues

2014-03-27 13:01:01 +11:00

shared

Removing position fixed

2014-05-22 12:39:52 +10:00

shop

Adding ze boilerplate

2014-02-07 13:55:25 +11:00

store

Fixing a couple of spec bugs

2014-04-08 18:09:02 +10:00

templates

Adding reset password stuff

2014-05-09 14:26:07 +10:00

application.js

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

distributors.js.coffee

Adding the distributors controller

2013-12-04 15:58:25 +11:00

jquery-migrate-1.0.0.js

Removing JMigrate warnings

2014-02-27 16:15:06 +11:00