openfoodnetwork

mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00

Files

Rohan Mitchell 7b994adc23 Merge branch 'use-save-bar' of https://github.com/bingxie/openfoodnetwork into use-save-bar

Conflicts:
	app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
	app/assets/javascripts/templates/admin/save_bar.html.haml
	app/views/admin/order_cycles/edit.html.haml
	app/views/admin/variant_overrides/_products.html.haml
	app/views/spree/admin/orders/bulk_management.html.haml

2016-05-13 10:05:39 +10:00

admin

Save bar can support cancel button

2016-05-12 11:04:40 +10:00

darkswarm

Merge branch 'openstreetmap-tiles' of https://github.com/bingxie/openfoodnetwork into openstreetmap-tiles

2016-04-29 14:36:47 +10:00

shared

Removing dialogOptions library, not required anymore

2016-04-01 19:48:25 +11:00

store

return basic css and js for oldskool login that somehow still exists