raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
1d5cc5dcedc39efe0fe13fea67ca90b30f61e5aa
openfoodnetwork/app/views/modals
History
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
..
_food_hub.html.haml
Fixing my modal and the tests
2014-05-20 12:18:28 +10:00
_groups.html.haml
Styling for groups page
2014-05-27 17:11:42 +10:00
_learn_more.html.haml
Fixing my modal and the tests
2014-05-20 12:18:28 +10:00
_producer.html.haml
Patching a couple of minor regressions
2014-05-28 16:10:28 +10:00
_producers.html.haml
Revert "Styling for shop page product modal"
2014-05-24 09:12:24 +10:00
_product.html.haml
Merge branch 'master' into fixing_modals
2014-05-29 11:14:16 +10:00