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

..

controllers

Rescoping the accordion as well

2014-06-06 16:53:09 +10:00

directives

Reworking flash messages hooray

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

filters

Addin some URL stripping

2014-05-28 14:45:26 +10:00

mixins

Making the auto-closing more granular on checkout

2014-06-04 17:12:16 +10:00

services

Merge branch 'master' into maps

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

all.js.coffee

Starting on on the map

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

cart.js.coffee

Moving everything to a single Angular application

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

darkswarm.js.coffee

Starting on on the map

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

overrides.js.coffee

Displaying server errors as well

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