Will Marshall a87361d82e Merge branch 'master' into maps ...

Conflicts:
	app/assets/javascripts/darkswarm/services/map.js.coffee
	app/assets/javascripts/templates/map_modal.html.haml
	app/views/layouts/darkswarm.html.haml
	app/views/map/index.html.haml
	app/views/shared/menu/_large_menu.html.haml
	config/routes.rb

2014-06-06 17:21:27 +10:00

..

authentication_service.js.coffee

Setting up after_login redirects

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

current_order.js.coffee

Defaulting cart count to zero if undefined

2014-06-06 14:47:12 +10:00

current_user.js.coffee

Splitting out the accordion stuff for checkout

2014-05-08 16:07:56 +10:00

groups.js.coffee

Starting on migrations and admin forms

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

hash_navigation.js.coffee

Removing pointless foundation crud, reworking the login

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

hub.js.coffee

Adding a current user service, refactoring various consequences of this change:

2014-04-25 16:59:46 +10:00

hubs.js.coffee

Adding handling of 'current hub'

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

map_configuration.js.coffee

Starting on on the map

2014-06-06 14:04:45 +10:00

map_modal.js.coffee

Adding modals for the map

2014-06-06 14:04:46 +10:00

map.js.coffee

Merge branch 'master' into maps

2014-06-06 17:21:27 +10:00

matcher.js.coffee

Adding producers filtering and more Angular magic

2014-05-05 15:43:11 +10:00

navigation.js.coffee

Patching a regression bug with login on checkout

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

order_cycle.js.coffee

Do not fetch products JSON on every shopping page

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

order.js.coffee

Reworking flash messages hooray

2014-06-06 16:41:28 +10:00

producers.js.coffee

Starting to build out producers Angular page

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

product.js.coffee

Do not fetch products JSON on every shopping page

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

rails_flash_loader.js.coffee

Reworking flash messages hooray

2014-06-06 16:41:28 +10:00

redirections.js.coffee

Setting up after_login redirects

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

sidebar.js.coffee

Moving our sidebar to a service for maximum awesomesauce

2014-04-25 13:49:44 +10:00

spree_user.js.coffee

Adding a current user service, refactoring various consequences of this change:

2014-04-25 16:59:46 +10:00