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

Conflicts:
	lib/open_food_network/order_cycle_management_report.rb
	lib/open_food_network/packing_report.rb

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

..

admin

Merge branch 'master' into line_item_naming

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

api

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00

checkout/payment

Remove obsolete spree checkout views

2014-12-11 16:17:15 +11:00

layouts

Fixes issue #362 Change admin account link to point to account page instead of edit user.

2015-03-04 16:00:46 +11:00

order_mailer

Updating front end order details, invoices and pdfs to display names of line_items as opposed to variants

2015-10-28 15:42:14 +11:00

orders

Updating front end order details, invoices and pdfs to display names of line_items as opposed to variants

2015-10-28 15:42:14 +11:00

products

Remove add to cart distribution selection, remove distribution change functionality from OrderPopulator, remove now-redundant tests

2014-01-08 11:39:05 +11:00

shared

Updating front end order details, invoices and pdfs to display names of line_items as opposed to variants

2015-10-28 15:42:14 +11:00

user_mailer

text changes to the registration wizard

2015-05-29 15:24:17 +10:00

users

This changes the user menu labels to show Account next to user email.

2015-03-13 16:49:26 +11:00

_sidebar.html.haml

WIP Add hub and order cycle display stub with failing tests

2013-03-08 15:18:52 +11:00