Rafael Schouten e9dd863462 Merge branch 'master' into payment_description ...

Conflicts:
	app/views/spree/order_mailer/confirm_email.text.erb

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

..

admin

Hide 'New Enterprise' link on index page when user has reached limit

2014-09-11 15:19:23 +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

Update placeholder label

2014-09-12 10:49:59 +10:00

json

Applying new icons for map view

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

layouts

Merge branch 'master' into currency

2014-09-16 10:25:22 +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

Short description goes back in producer fat view until we can clean up the HTML formatting

2014-09-12 15:40:12 +10:00

products

Renaming everything to Shop

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

registration

Differentiation of on-boarding process by url

2014-09-12 11:00:34 +10:00

shared

refactor and bugfix for tests

2014-09-17 01:07:34 +10:00

shop

Tweak label for shopping cart CTA button again

2014-08-06 16:59:14 +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