4522 Commits

Author	SHA1	Message	Date
Brenda Wallace	d2c63db59b	Translate planting status	2019-02-04 21:42:54 +13:00
Brenda Wallace	6a1954b1e7	added dependent: destroy	2019-02-04 21:22:19 +13:00
Brenda Wallace	b29c830f65	Merge branch 'dev' into photos/seeds	2019-02-04 21:17:08 +13:00
Brenda Wallace	81c899079e	Removed commented out code	2019-02-04 20:57:35 +13:00
Brenda Wallace	f1ad9cc3c7	Rubocop fix up	2019-02-04 20:55:04 +13:00
Brenda Wallace	5822764c1d	Fetch photos in the controller	2019-02-04 20:52:13 +13:00
Brenda Wallace	42de920352	Removed display of status	2019-02-04 20:44:20 +13:00
Brenda Wallace	ab880514c2	Further tidy of photo display	2019-02-04 20:43:52 +13:00
Brenda Wallace	dbf707d80e	Crops have seeds	2019-02-04 20:32:23 +13:00
Brenda Wallace	e8ac207fa7	Save the crop on the photo association	2019-02-04 20:32:11 +13:00
Brenda Wallace	a9ca12c1c5	Method to find planting photos only	2019-02-04 19:39:44 +13:00
Brenda Wallace	87d2c8b4c8	Fixed bug - look up photos by crop	2019-02-04 19:39:21 +13:00
Brenda Wallace	e3a0de081e	Merge branch 'dev' into photos/seeds	2019-01-30 16:46:42 +13:00
Brenda Wallace	8c03e3f4ab	Merge branch 'dev' into bb-track-types-of-gardens	2019-01-30 16:45:14 +13:00
Brenda Wallace	41082b31a9	Merge branch 'dev' into fix/recent-harvests	2019-01-30 16:44:47 +13:00
Brenda Wallace	3d3d1407cd	Fixed link in global actions	2019-01-27 18:28:42 +13:00
Brenda Wallace	ea35816654	Fix ordering of recent harvests	2019-01-27 18:12:37 +13:00
Brenda Wallace	32b2cbd921	Merge branch 'button-translate' into routes-tidy-up ... Conflicts: app/views/crops/_search_bar.haml app/views/layouts/application.html.haml	2019-01-24 13:49:53 +13:00
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
Brenda Wallace	fc6183eb52	DRY actions more	2019-01-24 13:46:35 +13:00
Brenda Wallace	e17e5c9297	Merge branch 'dev' into bb-track-types-of-gardens	2019-01-24 12:20:26 +13:00
Brenda Wallace	f6deaffb94	Fixed nested row on layout, that was breaking photo add page	2019-01-24 12:17:40 +13:00
Brenda Wallace	d73f8716c0	Include font awesome (so specs pass)	2019-01-24 12:17:40 +13:00
Brenda Wallace	e202c73584	Update buttons_helper.rb	2019-01-24 12:17:40 +13:00
Brenda Wallace	8bfe3278cc	Include icon helper from button helper	2019-01-24 12:17:40 +13:00
Brenda Wallace	a54db7d5ff	Tidied up the planting actions on gardens#index	2019-01-24 12:17:40 +13:00
Brenda Wallace	80e0d964e1	indentation clean up	2019-01-24 12:17:40 +13:00
Brenda Wallace	5218685bd9	Tidy up member edit buttons	2019-01-24 12:17:40 +13:00
Brenda Wallace	94a5411a79	Wider action bar	2019-01-24 12:17:40 +13:00
Brenda Wallace	88a277c6ed	Move consistent icons	2019-01-24 12:17:40 +13:00
Brenda Wallace	e912211cee	DRY the icons	2019-01-24 12:17:40 +13:00
Brenda Wallace	2380d62258	Use new finish button on planting badges	2019-01-24 12:17:40 +13:00
Brenda Wallace	81ee8ec56e	Add crop name to actions	2019-01-24 12:17:40 +13:00
Brenda Wallace	2a98cefedb	Copy finish planting from view to helper	2019-01-24 12:17:40 +13:00
Brenda Wallace	33ad133665	Revert modifications to menu	2019-01-24 12:17:40 +13:00
Brenda Wallace	ca75b1c852	Use button helper for crop wrangling	2019-01-24 12:17:40 +13:00
Brenda Wallace	97675868bd	Fixed button link, using translation that exists	2019-01-24 12:17:40 +13:00
Brenda Wallace	424866b733	Add "something" to global action labels	2019-01-24 12:17:40 +13:00
Brenda Wallace	761a0b4142	Always use the helper for add_photo buttons	2019-01-24 12:17:40 +13:00
Brenda Wallace	9130b44fb9	Rubocop fixup	2019-01-24 12:17:40 +13:00
Brenda Wallace	a95c3a988c	DRY the add photo buttons	2019-01-24 12:17:40 +13:00
Brenda Wallace	22e50aa618	DRY the edit buttons	2019-01-24 12:17:40 +13:00
Brenda Wallace	ad001767e2	Move seed buttongs to buttons helper	2019-01-24 12:17:40 +13:00
Brenda Wallace	b58e0cf3ce	Moved garden actions code to top of view	2019-01-24 12:17:40 +13:00
Brenda Wallace	8ae062fe9b	Added missing harvest actions	2019-01-24 12:17:40 +13:00
Brenda Wallace	c811ab1f51	Moved harvest buttons to match other #show pages	2019-01-24 12:17:40 +13:00
Brenda Wallace	8270611f0c	Removed un-used viewss	2019-01-24 12:17:40 +13:00
Brenda Wallace	02d4d12582	suffix _button to button helpers	2019-01-24 12:17:40 +13:00
Brenda Wallace	dfd7765c47	Rubocop fix ups	2019-01-24 12:17:40 +13:00
Brenda Wallace	e2a0278e40	Use same t() for the button for writing blog posts	2019-01-24 12:17:40 +13:00