Maikel Linke 903bd21577 Merge remote-tracking branch 'origin/master' into group-pages-merge ...

Conflicts:
	README.markdown
	db/schema.rb

2015-02-13 15:42:36 +11:00

..

admin

Fix admin tab to check correct permission

2015-02-11 11:55:48 +11:00

checkout

Update delivery page of checkout, change shipping to delivery

2013-09-19 13:40:49 +10:00

layouts

make groups editable by group owners

2015-02-05 12:05:39 +11:00

products

Adding an override to suppress the products display unless we actually have an order_cycle in play

2013-11-08 16:04:31 +11:00

shared

Replacing all uses of the old enterprise shop url helper

2015-01-22 10:19:43 +11:00