4542 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brenda Wallace	cd99769311	Wrapped a long line	2017-11-01 14:02:56 +13:00
Brenda Wallace	71cb3f8c5f	Rubocop fixes	2017-11-01 13:57:49 +13:00
Brenda Wallace	d540342acb	removed the days_before_maturity specs because function no longer exists	2017-11-01 13:57:49 +13:00
Brenda Wallace	f66b0768e2	Changed how db schema is loaded in travis	2017-11-01 13:57:49 +13:00
Brenda Wallace	251f44b0c7	Updated tests of progress bar	2017-11-01 13:57:49 +13:00
Brenda Wallace	adf07ce5ef	Planting feature specs passing	2017-11-01 13:57:49 +13:00
Brenda Wallace	54b204c636	fixed typo	2017-11-01 13:57:49 +13:00
Brenda Wallace	ff446c2139	Updated spec, new message when not enough data to predict progress	2017-11-01 13:57:49 +13:00
Brenda Wallace	62d84d7af4	planting progress is 100% if finished	2017-11-01 13:57:49 +13:00
Brenda Wallace	92fa09a1d3	Mark harvest predictions as pending	2017-11-01 13:57:49 +13:00
Brenda Wallace	b09c4aa7a1	Update display, to show predicted finish date	2017-11-01 13:57:49 +13:00
Brenda Wallace	692ab59285	Display expected finished date	2017-11-01 13:57:49 +13:00
Brenda Wallace	302bdba150	fixes search	2017-11-01 13:57:49 +13:00
Brenda Wallace	aa3057056f	rubocop fix up	2017-11-01 13:57:49 +13:00
Brenda Wallace	9ef40532ad	removed old percentage grow specs	2017-11-01 13:57:49 +13:00
Brenda Wallace	70ba8c8421	Updating planting model specs, for predictions	2017-11-01 13:57:49 +13:00
Brenda Wallace	3b81affbe5	include child records when reading plantings from db	2017-11-01 13:57:49 +13:00
Brenda Wallace	9703d4e983	Remove harvest preductions for now	2017-11-01 13:57:49 +13:00
Brenda Wallace	22e1718ce6	Rubocop fix ups	2017-11-01 13:57:49 +13:00
Brenda Wallace	b90b4e42fb	Updated progress bar to use new predictions	2017-11-01 13:57:49 +13:00
Brenda Wallace	202f557e32	Delete the old predictions code	2017-11-01 13:57:49 +13:00
Brenda Wallace	8364c8c688	updated schema	2017-11-01 13:57:49 +13:00
Brenda Wallace	3a286cd240	Show median lifespan of a crop	2017-11-01 13:57:49 +13:00
Brenda Wallace	41dbf6fb1b	Moved crop search out of crop model file	2017-11-01 13:57:49 +13:00
Brenda Wallace	47ecbe3f94	Call the predictions update on planting modifications from controller	2017-11-01 13:57:49 +13:00
Brenda Wallace	0f066ab302	Cleaning up models as adding predictions	2017-11-01 13:57:49 +13:00
Brenda Wallace	8e94ddb4bf	Moved planting predictions to crop	2017-11-01 13:57:49 +13:00
Brenda Wallace	a9cedc6a8a	Add active median gem	2017-11-01 13:57:49 +13:00
Brenda Wallace	7d6c49d8c3	Set harvest preductions on plantings	2017-11-01 13:57:49 +13:00
Brenda Wallace	0d8ca89b14	harvested_at and harvest_predicted_at added to plantings	2017-11-01 13:57:49 +13:00
Brenda Wallace	82a37d69bc	Ensure harvests are same crop, and after the planting was planted	2017-11-01 13:57:49 +13:00
deppbot	4b445907d5	Bundle Update on 2017-11-01	2017-11-01 13:27:10 +13:00
deppbot	2946dca5fc	Bundle Update on 2017-10-29	2017-10-30 20:20:50 +13:00
Shiny	9eb6d84e5a	Merge branch 'master' into dev	2017-10-28 10:43:34 +13:00
Brenda Wallace	96b4742e78	Dev is almost always on port 3000	2017-10-28 10:38:51 +13:00
pozorvlak	68c14a695e	Merge pull request #1416 from Br3nda/feature/more-crop-photos ... All crop photos	2017-10-27 12:57:43 +01:00
Brenda Wallace	e42ec4f8ae	Test crop photo display when not signed in	2017-10-27 23:43:23 +13:00
Brenda Wallace	f7b75157e7	Feature spec for harvest photos	2017-10-27 23:34:37 +13:00
Brenda Wallace	7e27b6deef	Merge branch 'feature/more-crop-photos' of github.com:Br3nda/growstuff into feature/more-crop-photos	2017-10-27 23:33:01 +13:00
Shiny	cd69ea1487	Merge branch 'dev' into feature/more-crop-photos	2017-10-27 23:32:46 +13:00
Brenda Wallace	4cdcbdac19	Merge remote-tracking branch 'origin/feature/more-crop-photos' into feature/more-crop-photos	2017-10-26 20:32:55 +13:00
Brenda Wallace	f3d03c00b2	Merge remote-tracking branch 'upstream/dev' into feature/more-crop-photos	2017-10-26 20:31:23 +13:00
deppbot	d9aa9df7fe	Bundle Update on 2017-10-26	2017-10-26 10:42:31 +13:00
pozorvlak	494dd1d658	Merge pull request #1411 from Growstuff/dev ... Release 30 release30	2017-10-25 08:16:42 +01:00
Shiny	af60489459	Merge branch 'dev' into feature/more-crop-photos	2017-10-24 10:32:57 +13:00
Brenda Wallace	a3a88c48de	Randomise the crops on the homepage	2017-10-23 22:09:34 +01:00
Brenda Wallace	f3e88f5aae	Include harvest photos on crop page	2017-10-24 09:34:10 +13:00
Brenda Wallace	1e81dac699	All crop photos; crops-> photos route	2017-10-24 09:34:03 +13:00
Brenda Wallace	705240014a	Link harvest thumbnails to harvests ... to be consistent with the rest of the site	2017-10-23 11:07:27 +01:00
Brenda Wallace	78aa049502	Fixed comment model spec	2017-10-23 10:44:37 +01:00