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

..

admin

Manager can't bulk update owner

2014-09-19 18:31:50 +10:00

api

Move enterprises api controller out of spree namespace

2014-04-11 19:08:55 +10:00

checkout

Merge branch 'master' into payment_description

2014-09-17 17:07:43 +10:00

enterprise_mailer

Sends confirmation email when Enterprise is created

2014-09-12 13:24:17 +10:00

enterprises

Remove most references to suburbs - previously used by new_landing_page, no longer used.

2014-07-17 14:26:04 +10:00

groups

Lots of small bug fixes, changing image sizes

2014-07-29 11:33:25 +10:00

home

Merge branch 'master' into cleanup

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

json

Applying new icons for map view

2014-08-29 18:04:06 +10:00

layouts

Assigning @spree_api_key for store

2014-09-19 18:31:33 +10:00

map

Adding some map searching capabilities

2014-07-16 11:19:16 +10:00

modals

Kill the outside modal close button styling once and for all

2014-09-12 14:42:58 +10:00

open_food_network

Rename namespaced includes from open_food_web to open_food_network

2013-10-18 17:43:18 +11:00

order_cycles

Adding list view links

2014-02-04 12:01:10 +11:00

producers

Merge branch 'master' into cleanup

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

products

Renaming everything to Shop

2013-12-05 13:40:05 +11:00

registration

Adding limit reached modal to registration

2014-09-25 12:25:32 +10:00

shared

Removing 'show profiles' from producer and shop pages

2014-09-25 17:19:57 +10:00

shop

Removing 'show profiles' from producer and shop pages

2014-09-25 17:19:57 +10:00

shopping_shared

Producer tab on shopfront tweaks - add producer icon and better classes for responsive

2014-07-25 17:29:15 +10:00

spree

Merge branch 'master' into payment_description

2014-09-17 17:07:43 +10:00

user_passwords

Removing nothing special text and patching change password form slightly more

2014-04-08 18:07:55 +10:00