1422 Commits

Author	SHA1	Message	Date
Brenda Wallace	79cf7b452c	removing some cms stuff	2018-01-04 14:31:24 +13:00
Shiny	ba2e4b5dce	Merge branch 'dev' into upgrade/rails-5	2018-01-04 14:03:19 +13:00
Brenda Wallace	65d5b2d61a	Application mailer for rails 5	2018-01-03 17:18:41 +13:00
Brenda Wallace	f4af682d45	Updated code for Rail 5	2018-01-03 17:12:17 +13:00
Brenda Wallace	d86de897c7	Wrap long line	2018-01-03 15:12:09 +13:00
Brenda Wallace	a39c304fac	Fix ordering of crops' parent on form	2018-01-03 15:06:55 +13:00
Shiny	9d47b2b029	Merge branch 'dev' into feature/admin-nicer	2017-12-18 15:10:36 +13:00
Brenda Wallace	99828c7c01	Updated spec for new admin#index	2017-12-17 17:54:13 +13:00
Brenda Wallace	233a30a045	Haml code style fix up	2017-12-17 17:49:05 +13:00
Brenda Wallace	8a446ecbfc	Member admin	2017-12-17 12:45:19 +13:00
Brenda Wallace	efc60e6313	Nicer layout on editing roles	2017-12-17 12:11:55 +13:00
Brenda Wallace	406b2dbf04	Make admin index a bit nicer	2017-12-17 12:06:03 +13:00
Brenda Wallace	2394f4d237	One view for showing photos on an item	2017-12-17 11:40:55 +13:00
Brenda Wallace	6f2b4b13cd	Only show photo pagination if there are photos	2017-12-17 09:55:52 +13:00
Brenda Wallace	970da53873	Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457	2017-12-17 09:15:24 +13:00
Brenda Wallace	3aa2f0bd3b	Paginate photos on seeds#show (inc feature specs)	2017-12-17 08:55:08 +13:00
Shiny	8c1514bc04	Merge branch 'dev' into feature/photos-1457	2017-12-15 17:13:12 +13:00
Brenda Wallace	3d3a3b669e	Order posts by most recent	2017-12-15 13:28:41 +13:00
Brenda Wallace	8697e56323	Order the plantings on the front page	2017-12-15 13:26:48 +13:00
Brenda Wallace	25e9ef892d	Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457	2017-12-14 08:45:40 +13:00
Shiny	82149d4565	Merge branch 'dev' into feature/photos-1457	2017-12-14 08:44:31 +13:00
Brenda Wallace	fcd3e36e36	Removed commented out code	2017-12-14 08:42:51 +13:00
pozorvlak	e8b5850bfe	Merge branch 'dev' into planting-harvests	2017-12-13 10:57:40 +00:00
Brenda Wallace	1c8b75b7cb	add and show photos for seeds ... close #1457	2017-12-13 22:34:16 +13:00
Brenda Wallace	1f66df0743	Fixed link to associated flickr, twitter, facebook accountss ... fixes #1479	2017-12-13 22:23:22 +13:00
Brenda Wallace	08dc2a0513	Show photos of a planting's harvests	2017-12-09 22:24:51 +13:00
Brenda Wallace	ac07f18b2d	Show most recent seeds first	2017-12-07 15:00:16 +13:00
Brenda Wallace	cd35538b83	Order forums by name	2017-12-07 13:42:48 +13:00
Brenda Wallace	35d8461811	Order recent plantings by when they were planted	2017-12-07 13:39:32 +13:00
Brenda Wallace	e3886ce5b5	Fixed up unescaped model attribute	2017-11-29 20:59:37 +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
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	67dec795a0	Reinstated test of first harvest prediction display	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
Brenda Wallace	205247b136	Shorter condition in haml view (progress)	2017-11-09 17:36:37 +13:00
Brenda Wallace	809dd81378	"Changed last_harvest" to "days_to_last_harvest"	2017-11-08 17:17:58 +13:00
Brenda Wallace	62beec23a1	"Changed first_harvest" to "days_to_first_harvest"	2017-11-08 17:17:15 +13:00
Brenda Wallace	a60a5ce591	Added a space, to please hound	2017-11-07 09:46:19 +13:00
Brenda Wallace	c5971cd46b	A little bit of eager loading	2017-11-06 23:13:36 +13:00
Brenda Wallace	928749aaad	Changed a "Pictures" header to "Photos" to be consistent	2017-11-06 23:11:39 +13:00
Brenda Wallace	1d64d4d1d2	Clearer message that predctions are for days after planting	2017-11-06 23:10:55 +13:00
Brenda Wallace	2696d12771	Removed duplicate display of last harvest	2017-11-06 22:59:04 +13:00
Brenda Wallace	ec63d8086f	Moved crop predictions to own haml file	2017-11-06 22:36:47 +13:00