2491 Commits

Author	SHA1	Message	Date
pozorvlak	e8b5850bfe	Merge branch 'dev' into planting-harvests	2017-12-13 10:57:40 +00:00
Brenda Wallace	1f66df0743	Fixed link to associated flickr, twitter, facebook accountss ... fixes #1479	2017-12-13 22:23:22 +13:00
Brenda Wallace	72f52230a1	Fix Growstuff::OauthSignupAction not found error when connecting flickr account	2017-12-13 22:19:41 +13:00
Brenda Wallace	08dc2a0513	Show photos of a planting's harvests	2017-12-09 22:24:51 +13:00
Shiny	96bb345ca9	Merge branch 'dev' into ordering	2017-12-08 20:20:27 +13:00
Brenda Wallace	ac07f18b2d	Show most recent seeds first	2017-12-07 15:00:16 +13:00
Brenda Wallace	4ce3e8968f	crops#show order posts by most recent first	2017-12-07 14:58:57 +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	8d03a3ffa8	Most recent photos is a crop's default photo	2017-12-06 21:47:01 +13:00
Brenda Wallace	24f18f78da	use bare percent literals	2017-12-06 14:33:51 +13:00
Brenda Wallace	182c626226	Prefer if/unless modifier	2017-12-06 14:23:12 +13:00
Brenda Wallace	ea2fcd09dc	Fixed last old style word array	2017-12-06 14:18:51 +13:00
Brenda Wallace	515325c44e	Fixed up % delimiters	2017-12-06 14:14:31 +13:00
Brenda Wallace	2d00206abf	Converted sprintf to format	2017-12-06 14:10:26 +13:00
Brenda Wallace	a6a7f789a3	Rubocop upgrade (and some style fixes)	2017-12-01 21:07:39 +13:00
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