Rafael Schouten 89ce4ba632 Merge branch 'master' into bugfix ...

Conflicts:
	app/models/enterprise.rb

2014-10-21 08:51:23 +11:00

..

admin

Merge branch 'migrate_ent_types' into bugfix

2014-10-18 07:37:41 +11: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

Only send one enterprise creation confirmation email

2014-10-17 12:29:51 +11: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

use enterprise modal

2014-10-01 18:51:49 +10:00

home

fix visible bug

2014-10-17 03:59:48 +11:00

json

get type > sells migration mostly working

2014-09-27 15:21:27 +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

swap redundant producer modal for general enterprise modal

2014-10-07 10:48:04 +11: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

fix visible bug

2014-10-17 03:59:48 +11: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

return space remover

2014-10-16 16:26:50 +11:00

shop

use enterprise modal

2014-10-01 18:51:49 +10:00

shopping_shared

bugfix tab selection

2014-10-08 01:59:56 +11:00

spree

Only show enterprise partial when no enterprises exist

2014-10-17 17:15:49 +11:00

user_passwords

Removing nothing special text and patching change password form slightly more

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