4518 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Brenda Wallace	97c7277a73	fixed up ambigous regex and use of expect in specs	2017-10-23 10:44:37 +01:00
Brenda Wallace	0e0af44d9f	post show specs, use expect syntax, and more tests for js injection	2017-10-23 10:44:37 +01:00
Brenda Wallace	45af8d5f4f	Converting to expect syntax	2017-10-23 10:44:37 +01:00
deppbot	a1ee822690	Bundle Update on 2017-10-22	2017-10-23 14:55:15 +13:00
Brenda Wallace	b6e61eba7a	Merge branch 'master' into dev-conflict-fix	2017-10-22 11:30:43 +13:00
Brenda Wallace	b356d86931	Allow inline style on the progress bar width	2017-10-21 22:48:37 +01:00
Brenda Wallace	34f91c2189	Wrap garden overview buttons to right of photo on small screens	2017-10-21 22:48:37 +01:00
Brenda Wallace	faf3f60e78	small screen gardens overview	2017-10-21 22:48:37 +01:00
Brenda Wallace	e3113fd53d	Re-work gardens#index to show planting progress	2017-10-21 22:48:37 +01:00
Brenda Wallace	68768c4d6a	Fixed redirection after planting is deleted	2017-10-21 22:48:37 +01:00
pozorvlak	da7fec5e0b	Merge pull request #1405 from Br3nda/fix-1379 ... Display messages even when member is deleted	2017-10-20 16:10:51 +01:00
Brenda Wallace	191c8e4e9d	Display messages even when member is deleted	2017-10-20 23:44:51 +13:00
deppbot	edc763cd8c	Bundle Update on 2017-10-19	2017-10-20 23:23:02 +13:00
Brenda Wallace	fdfb116d92	Ignore one Style/ClassAndModuleChildren release29	2017-10-19 08:22:40 +13:00
Brenda Wallace	888e0669a0	Added hound config	2017-10-19 08:22:40 +13:00
Brenda Wallace	d55e2b5466	Update heroku maintenance script ... maintenance is just an attribute now	2017-10-19 08:22:40 +13:00
Brenda Wallace	c28ae4fe83	Use ! to indicate the method changes class variables	2017-10-19 08:22:40 +13:00
Brenda Wallace	4b4669459e	Fixed duplicated code in growstuff member link markdown	2017-10-19 08:22:40 +13:00
Brenda Wallace	77902ad300	Moved member look up to a method (less duplicate code)	2017-10-19 08:22:40 +13:00
Brenda Wallace	f314fcd919	Fixed members link in growstuff markdown	2017-10-19 08:22:40 +13:00
Brenda Wallace	8171c12a5b	Fixed links to crops in growstuff markdown	2017-10-19 08:22:40 +13:00
Brenda Wallace	08b6b46bfa	Removed some rubocop todos	2017-10-19 08:22:40 +13:00
Brenda Wallace	bf189092ea	More simplification of growstuff markup	2017-10-19 08:22:40 +13:00
Brenda Wallace	a539a47044	Reduced complexity of growstuff_markdown	2017-10-19 08:22:40 +13:00