2475 Commits

Author	SHA1	Message	Date
Brenda Wallace	a62b668781	Fix up duplicate order item in controller spec, and DRY	2017-11-29 20:59:37 +13:00
Brenda Wallace	d7ec4eacee	Fix sort on plant parts	2017-11-29 20:59:37 +13:00
Brenda Wallace	3a3f4eefbf	Added sort to members controller	2017-11-29 20:59:37 +13:00
Brenda Wallace	9e00023332	Fixed post ordering	2017-11-29 20:59:37 +13:00
Brenda Wallace	e3886ce5b5	Fixed up unescaped model attribute	2017-11-29 20:59:37 +13:00
Brenda Wallace	48f8085e2d	Fix seeds order	2017-11-29 20:59:37 +13:00
Brenda Wallace	594e466fd4	Fixed photos ordering	2017-11-29 20:59:37 +13:00
Brenda Wallace	d0b8ae3411	Delete follows records when a member is deleted	2017-11-29 20:59:37 +13:00
Brenda Wallace	9c993e9f47	Plantings controller ordering and specs	2017-11-29 20:59:37 +13:00
Brenda Wallace	d5fece87d0	Tests for comments#index (and bugfix)	2017-11-29 20:59:37 +13:00
Brenda Wallace	33816d4312	Use faker gem, in account types - and add controller specs	2017-11-29 20:59:37 +13:00
Brenda Wallace	00e6aeed5c	seed.tradable was back to front logic. fixed	2017-11-29 20:59:37 +13:00
Brenda Wallace	0205b345d0	A planting's photo is their most recent photo	2017-11-29 20:59:37 +13:00
Brenda Wallace	9f8a32e9f8	Feature plantings need to be ordered	2017-11-29 20:59:37 +13:00
Brenda Wallace	7357524271	Garden's default photo should be the most recent photo	2017-11-29 20:59:37 +13:00
Brenda Wallace	4bed6da422	Crop validation methods can be private	2017-11-29 20:59:37 +13:00
Brenda Wallace	023c870d49	Fix up crop.recent	2017-11-29 20:59:37 +13:00
Brenda Wallace	9aff65e956	Added ordering to finding first photo	2017-11-29 20:59:37 +13:00
Brenda Wallace	0446c0a405	Add ordering back into controller #index	2017-11-29 20:59:37 +13:00
Brenda Wallace	7719d1f896	Remote default ordering scopes, and clean up models	2017-11-29 20:59:37 +13:00
Brenda Wallace	c154a9b845	Upgraded leaflet maskercluster	2017-11-25 19:34:05 +13:00
Brenda Wallace	229396d9e7	Add id and type back to photos#new	2017-11-22 22:06:41 +13:00
Brenda Wallace	d3df1e8f33	Move planting's add photo button to _actions.haml	2017-11-19 18:02:09 +13:00
Brenda Wallace	bd063be3a9	Fix gardens actions, and add specs ... A bug slipped into all garden display pages - and there were no tests that caught it. This adds feature specs for gardens#index, which would have detected the un-initialised variable in haml	2017-11-19 16:31:17 +13:00
Logan Gingerich	ede5187369	Whitespace fix, spec fix, and spec addition	2017-11-19 11:13:41 +13:00
Logan Gingerich	610a5b7a48	deleted line 70 on plantings view to clean up logic	2017-11-19 11:13:41 +13:00
Logan Gingerich	1fa71c1546	Moved add photo button from garden show view to garden actions	2017-11-19 11:13:41 +13:00
Logan Gingerich	7574eb554e	Adds a more prominent add photo button to garden and planting show views	2017-11-19 11:13:41 +13:00
Brenda Wallace	3e149a5d1d	Feature spec for showing item details on photo adding page	2017-11-18 22:25:58 +13:00
Brenda Wallace	7906d50d13	Shaved some yaks to remove a rescue from a controller	2017-11-18 22:25:58 +13:00
Brenda Wallace	faed8b019e	Removed rescue in a controller	2017-11-18 22:25:58 +13:00
Brenda Wallace	c8974a869f	Use the ||= operator	2017-11-18 22:25:58 +13:00
Brenda Wallace	3969f410f1	Tidy up photos logic, and test of signin/out on photos#new	2017-11-18 22:25:58 +13:00
Logan Gingerich	6304f230a5	Refactored and specs updated	2017-11-18 22:25:58 +13:00
Logan Gingerich	73524b8883	Now displays correctly for planting, harvest or garden	2017-11-18 22:25:58 +13:00
Logan Gingerich	fd9fc38def	fixes #1433 Says what item you're adding a photo to on photos#new	2017-11-18 22:25:58 +13:00
Brenda Wallace	c4a1806a87	Request spec for photos api	2017-11-17 22:01:37 +13:00
Brenda Wallace	13e8d1f5a5	Merge remote-tracking branch 'upstream/dev' into api	2017-11-17 21:51:39 +13:00
Brenda Wallace	c1836cc78e	Removed un-used method, to reduce class size	2017-11-17 21:50:59 +13:00
Brenda Wallace	28fdb6e1ed	Reducing class line count	2017-11-17 21:50:59 +13:00
Brenda Wallace	67dec795a0	Reinstated test of first harvest prediction display	2017-11-17 21:50:59 +13:00
Brenda Wallace	86ea8eab39	Reducing crop class size	2017-11-17 21:50:59 +13:00
Brenda Wallace	8884056ff3	Run existing crop specs with annual crop	2017-11-17 21:50:59 +13:00
Brenda Wallace	d01a5d7976	Don't show lifespan of perennials	2017-11-17 21:50:59 +13:00
Shiny	1795b27152	Merge branch 'dev' into feature/planting-garden-owner-match	2017-11-13 23:09:04 +13:00
Shiny	df7a9448b0	Underscore prefix on our last unused args (#1442)	2017-11-13 09:54:55 +00:00
Brenda Wallace	5fec826c41	Add more attributes to crops	2017-11-13 19:19:18 +13:00
Brenda Wallace	d8f5876518	Added predictions to planting api, and added specs	2017-11-13 19:19:18 +13:00
Brenda Wallace	c9d5c42814	Plantings have many harvests	2017-11-13 19:19:18 +13:00
Brenda Wallace	b60f47f502	Add more relationships to members on the api	2017-11-13 19:19:18 +13:00