Brenda Wallace 986bca44f7 Merge remote-tracking branch 'upstream/dev' into routes-tidy-up ...

Conflicts:
	app/views/layouts/_header.html.haml
	spec/features/gardens/actions_spec.rb

2019-01-24 13:48:36 +13:00

..

_actions.html.haml

Always use the helper for add_photo buttons

2019-01-24 12:17:40 +13:00

_card.html.haml

format fixes

2018-04-21 21:55:29 -05:00

_form.html.haml

spec for harvesting from a planting

2017-02-13 17:21:11 +13:00

_image_with_popover.haml

Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550)

2018-03-12 08:39:32 +13:00

_list.html.haml

Expanding layout to use full screen

2018-04-01 12:44:59 +12:00

_planting.haml

Prevent error when @matching_plantings is nil

2018-04-08 10:17:06 -05:00

_popover.html.haml

Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550)

2018-03-12 08:39:32 +13:00

_thumbnail.html.haml

Photos helper

2018-03-14 19:28:18 +13:00

edit.html.haml

Prettified all the harvest views

2013-09-17 17:09:17 +10:00

index.csv.shaper

back to kg for si weight, also now adding si_weight to the csv correctly

2015-01-31 18:35:29 -05:00

index.html.haml

DRY the nav bars and make all the same

2019-01-06 08:45:42 +13:00

index.rss.haml

create rss feed for harvests

2018-06-10 20:38:43 -07:00

new.html.haml

Titles of pages consistent with buttons to pages

2019-01-24 12:17:40 +13:00

show.html.haml

Merge remote-tracking branch 'upstream/dev' into routes-tidy-up

2019-01-24 13:48:36 +13:00