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

Merge remote-tracking branch 'origin/master' into group-pages-merge

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

api

Move enterprises api controller out of spree namespace

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

checkout

Cart page conforms to convention in rest of checkout, adjusting helpers through checkout

2014-11-26 18:53:29 +11:00

enterprise_mailer

Replacing all uses of the old enterprise shop url helper

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

enterprises

Replacing all uses of the old enterprise shop url helper

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

groups

fixing a bunch of tests

2015-02-12 16:36:18 +11:00

home

Localize more strings on home page.

2014-12-03 09:39:36 +11:00

json

Replacing all uses of the old enterprise shop url helper

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

layouts

Don't use svg for email header

2014-11-20 20:14:57 +11: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

Fixing img display of producers if no logo present

2015-02-12 10:31:13 +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

Replacing all uses of the old enterprise shop url helper

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

shop

Merge branch 'shopfront-filters' into shop-url

2015-01-28 10:57:11 +11:00

shopping_shared

TabsCtrl can show tabs that don't toggle

2015-01-06 22:39:15 +11:00

spree

Adding new loading animation to replace ugly and large gif

2015-01-16 17:06:40 +11:00

user_passwords

Removing nothing special text and patching change password form slightly more

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