Rohan Mitchell 952353da8c Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit ...

Conflicts:
	spec/features/admin/bulk_product_update_spec.rb

2015-05-29 15:08:30 +10:00

..

orders

Merge branch 'master' into variable_weights

2015-05-21 17:31:33 +10:00

overview

Dedicated new enterprise form

2014-12-19 14:05:24 +11:00

payment_methods

WIP: angularised provider settings for payment method works on create (for admin only at this stage)

2014-08-08 17:47:50 +10:00

products

Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit

2015-05-29 15:08:30 +10:00

reports

Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2

2015-05-15 10:37:34 +10:00

shared

Rename div update-status-message to status-message

2014-12-12 13:33:13 +11:00

taxons

Adding taxon preview (big) to the admin UI

2014-06-19 14:18:52 +10:00

variants

Edit Orders: more variant info in variant search

2015-04-23 10:17:01 +10:00