Will Marshall 74211cbfc7 Merge branch 'master' into fixing_modals ...

Conflicts:
	app/assets/javascripts/darkswarm/all.js.coffee
	app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
	app/assets/javascripts/darkswarm/directives/modal.js.coffee
	app/views/modals/_producer.html.haml
	app/views/modals/_product.html.haml
	app/views/shop/products.rabl

2014-05-29 11:14:16 +10:00

..

open_food_network/calculator

Rename OpenFoodWeb namespace to OpenFoodNetwork

2013-10-18 17:29:55 +11:00

spree

Merge branch 'new-product-form'

2014-05-24 17:14:32 +10:00

.gitkeep

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

adjustment_metadata.rb

Add AdjustmentMetadata, for holding info about enterprise fee adjustments at time of creation

2013-08-12 10:00:35 +10:00

cart.rb

Fix multicart use of OrderPopulator

2014-01-08 14:13:19 +11:00

enterprise_fee_set.rb

Enterprise fees admin page for a specific enterprise auto-selects that enterprise for new fees and only allows selection of managed enterprises

2013-10-30 17:00:05 +11:00

enterprise_fee.rb

Remove trailing relations on destruction for EnterpriseFee and Variant

2014-04-24 13:20:15 +10:00

enterprise_group.rb

Modding image sizing on groups

2014-05-28 16:03:42 +10:00

enterprise_relationship.rb

Find enterprise relationships involving any of a number of enterprises

2014-05-22 11:25:37 +10:00

enterprise_role.rb

Add EnterpriseRole model and link up to users and enterprises.

2013-08-01 10:32:49 +10:00

enterprise_set.rb

Create new enterprise fee, display errors when present

2012-11-21 09:47:51 +11:00

enterprise.rb

Merge branch 'master' into fixing_modals

2014-05-29 11:14:16 +10:00

exchange_fee.rb

Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants

2012-11-26 11:03:44 +11:00

exchange_variant.rb

Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants

2012-11-26 11:03:44 +11:00

exchange.rb

When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges

2014-05-23 11:28:00 +10:00

landing_page_image.rb

Further compressed the landing page image to make it really light.

2013-08-15 11:34:48 +10:00

model_set.rb

Correctly index calculator fields. Adds ng-bind-html-unsafe-compiled.

2012-11-23 17:02:58 +11:00

order_cycle_set.rb

Admin list order cycles

2012-11-27 10:13:12 +11:00

order_cycle.rb

Merging into master

2014-04-29 10:35:05 +10:00

product_distribution.rb

Lock enterprise fee adjustments on creation to avoid them being recalculated against order by update hooks

2013-08-19 14:38:51 +10:00

suburb.rb

Suburb auto-complete functionality for the new landing page.

2013-08-12 17:34:56 +10:00