Rohan Mitchell 6b1c125b03 Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails ...

Conflicts:
	Gemfile.lock
	app/controllers/admin/order_cycles_controller.rb
	app/views/admin/order_cycles/edit.html.haml
	app/views/admin/order_cycles/show.rep
	db/schema.rb
	spec/controllers/admin/order_cycles_controller_spec.rb

2015-04-29 14:42:17 +10:00

..

admin

Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails

2015-04-29 14:42:17 +10:00

api

Move enterprises api controller out of spree namespace

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

checkout

Do not show tax in checkout

2015-04-17 13:39:09 +10: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

textAngular editor for group description

2015-04-15 17:13:10 +10:00

home

Hiding filters on list views because styling is broken

2015-04-24 19:35:18 +10:00

json

exposing more group attributes to angular

2015-02-18 14:55:42 +11:00

layouts

Merge branch master into properties

2015-04-17 13:23: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

producer_mailer

Change controller action to 'notify_producers'.

2015-04-11 13:19:48 +01:00

producers

Hiding filters on list views because styling is broken

2015-04-24 19:35:18 +10:00

products

Renaming everything to Shop

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

registration

Spacing

2015-03-27 13:09:25 +11:00

shared

Merge branch master into properties

2015-04-17 13:23:33 +10:00

shop

Tweaking logic for alert bar to make messages more human readable for all use cases.

2015-03-20 14:24:59 +11:00

shopping_shared

Merge branch master into properties

2015-04-17 13:23:33 +10:00

spree

Adding sku to BPE

2015-04-22 21:02:07 +10:00

user_passwords

Removing nothing special text and patching change password form slightly more

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