Rohan Mitchell 213242627e Merge branch 'master' into redesign-phase-2 ...

Conflicts:
	app/views/home/_hubs.html.haml

2015-07-01 15:44:36 +10:00

..

admin

Merge branch 'master' into redesign

2015-06-16 16:57:09 +10: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

Add titles to all darkswarm pages

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

groups

Make subject more friendly for groups enquiry email

2015-06-26 15:54:26 +10:00

home

Merge branch 'master' into redesign-phase-2

2015-07-01 15:44:36 +10:00

json

Merge branch 'master' into optimise-shopfront

2015-06-03 10:07:42 +10:00

layouts

Display HTML special chars correctly in title

2015-06-26 15:54:25 +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

producers

Scroll past header on shops page if user is logged in

2015-06-26 15:54:25 +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

Fix alert overflow on mobile

2015-06-26 15:54:26 +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

Add titles to all darkswarm pages

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

spree

Add titles to all darkswarm pages

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

user_passwords

Removing nothing special text and patching change password form slightly more

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