Rob Harrington a96cdd5ee7 Merge branch 'master' into line_item_naming ...

Conflicts:
	app/views/admin/order_cycles/edit.html.haml

2015-11-13 09:54:26 +11:00

..

admin

Merge branch 'master' into line_item_naming

2015-11-13 09:54:26 +11:00

api

Order cycle filter resets date filters on BOM

2015-05-07 12:50:55 +10:00

checkout

Add titles to all darkswarm pages

2015-06-16 15:31:35 +10:00

enterprise_mailer

Change all global links to www

2015-06-16 14:47:40 +10:00

enterprises

Prompt for clear cart when order cycle changes

2015-07-31 16:56:08 +10:00

groups

Content manage group signup page

2015-07-17 16:06:49 +10:00

home

Auto-merge from CI [skip ci]

2015-08-05 12:18:31 +10:00

json

Making sure flash is a hash so that is can be used to initialize OpenStuct

2015-11-05 11:09:21 +11:00

layouts

Perform shops search by proximity instead of plain string match

2015-07-10 17:45:15 +10:00

map

Add titles to all darkswarm pages

2015-06-16 15:31:35 +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

producer_mailer

Display more verbose product and variant name

2015-11-05 09:50:00 +11:00

producers

Restoring all changes of the last combined branch

2015-09-10 15:03:13 +10:00

products

Renaming everything to Shop

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

registration

Add titles to all darkswarm pages

2015-06-16 15:31:35 +10:00

shared

Restoring all changes of the last combined branch

2015-09-10 15:03:13 +10:00

shop

Merge branch 'master' into redesign

2015-06-10 18:27:50 +10:00

shopping_shared

ng-cloak order cycles selector, tabs and shopfront

2015-05-29 16:39:41 +10:00

shops

Content manage hub signup page

2015-07-17 16:06:49 +10:00

spree

Merge branch 'master' into line_item_naming

2015-11-12 14:40:11 +11:00

user_passwords

Removing nothing special text and patching change password form slightly more

2014-04-07 14:52:01 +10:00