779 Commits

Author	SHA1	Message	Date
Brenda Wallace	4c35987cb7	Ignore long method in ability.rb	2017-12-17 17:57:19 +13:00
Brenda Wallace	54e0806f38	don't check role is there's no member	2017-12-17 17:55:14 +13:00
Brenda Wallace	01a7463ae8	Split up ability.rb into methods	2017-12-17 12:47:41 +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	14551b6ec8	Merge remote-tracking branch 'upstream/dev' into feature/photos-1457 ... Conflicts: spec/models/crop_spec.rb	2017-12-09 20:59:20 +13:00
Shiny	96bb345ca9	Merge branch 'dev' into ordering	2017-12-08 20:20:27 +13:00
Brenda Wallace	8d03a3ffa8	Most recent photos is a crop's default photo	2017-12-06 21:47:01 +13:00
Brenda Wallace	a6a7f789a3	Rubocop upgrade (and some style fixes)	2017-12-01 21:07:39 +13:00
Brenda Wallace	14b16b0d8c	Moved photo.items's item lookup to a class method	2017-11-30 11:23:34 +13:00
Brenda Wallace	ff57176d60	Simplified the photos controller a bit	2017-11-29 22:13:03 +13:00
Brenda Wallace	12700d6268	Added polymorphic relationship to photos	2017-11-29 21:41:22 +13:00
Brenda Wallace	9e00023332	Fixed post 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	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	7719d1f896	Remote default ordering scopes, and clean up models	2017-11-29 20:59:37 +13:00
Brenda Wallace	17fd6f61a5	Added polymorphic relationship to photos	2017-11-29 20:14:27 +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	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	d8f5876518	Added predictions to planting api, and added specs	2017-11-13 19:19:18 +13:00
Brenda Wallace	a2ae429f6b	If a harvest has a planting, it must have the same owner	2017-11-13 19:18:14 +13:00
Brenda Wallace	c6824b1262	Planting's owner must be the same as its garden's owner	2017-11-13 19:18:14 +13:00
Brenda Wallace	963a182981	simplified logic in planting's first/last harvest fetcher	2017-11-09 17:36:33 +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	bf6475da57	annual? perennial!=true	2017-11-06 23:15:08 +13:00
Brenda Wallace	2f47eeb7b3	Bug fix. Can only predict if we have harvested_at and planted_at	2017-11-06 23:12:28 +13:00
Brenda Wallace	941dab7c4a	Crop.annual? method	2017-11-06 23:00:16 +13:00
Brenda Wallace	eaa65fda9e	update median_last_harvest too, with specs	2017-11-05 20:28:51 +13:00
Brenda Wallace	e844eade94	Changed model validators message to please Hound	2017-11-05 20:09:21 +13:00
Brenda Wallace	9b1b22afa8	Bugfix and specs for first and last harvest	2017-11-05 17:33:58 +13:00
Brenda Wallace	996706ee78	Tests for planting lifespan predictions when there's no crop data	2017-11-05 17:29:42 +13:00
Brenda Wallace	9d11bcc039	Can't calculate first harvest if there are no harvests	2017-11-05 16:20:51 +13:00
Brenda Wallace	4cc0f77bd0	Predicting first harvest - updating medians	2017-11-05 13:42:30 +13:00
Brenda Wallace	285e6edc61	crop -> sci_names needs dependent:destroy so we don't get orphans	2017-11-04 11:51:19 +13:00
Brenda Wallace	cabc4fd030	%i-literals should be delimited by ( and )	2017-11-04 10:29:31 +13:00
Brenda Wallace	20fe9e4cc5	Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions	2017-11-04 10:09:53 +13:00
Logan Gingerich	81e22d6fb2	fixes #1419 - Allows brackets in garden names	2017-11-03 14:53:20 +13:00
Logan Gingerich	10a8df47a9	Factorygirl to factorybot - fixes #1413 (#1425) ... * FactoryGirl Changed to FactoryBot file fix changes based on comments received Bundle Update on 2017-10-29 style update to align hash literal added package-lock * indentation fixes with rubocop * name added to contributors	2017-11-01 15:03:31 +00:00