735 Commits

Author	SHA1	Message	Date
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
Brenda Wallace	7104781d1b	Rubocop array fix ups	2017-11-01 15:13:32 +13:00
Brenda Wallace	71cb3f8c5f	Rubocop fixes	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	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	70ba8c8421	Updating planting model specs, for predictions	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	0f066ab302	Cleaning up models as adding predictions	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	82a37d69bc	Ensure harvests are same crop, and after the planting was planted	2017-11-01 13:57:49 +13:00
Brenda Wallace	f3d03c00b2	Merge remote-tracking branch 'upstream/dev' into feature/more-crop-photos	2017-10-26 20:31:23 +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	910a9673dc	Unsubscribes newsletter before member destroying	2017-06-09 22:39:07 +12:00
Brenda Wallace	bbc3ca749f	Removed author_exists scope. It is part of default	2017-06-02 22:43:25 +12:00
Brenda Wallace	20b980a162	Helpful comment explains why we use act_as_paranoid	2017-06-02 22:42:03 +12:00
Brenda Wallace	fb012c073e	leaves a record of orders and payments intact when members deleted	2017-06-02 22:34:19 +12:00
Brenda Wallace	c48e24845e	Remove owner_exists scope	2017-06-02 20:28:32 +12:00
Shiny	7621da7041	Merge branch 'dev' into issue-1044-account-deletion	2017-05-30 20:39:44 +12:00
Brenda Wallace	8bcc5104e5	Delegate planting predictions	2017-05-29 22:45:14 +12:00
Brenda Wallace	3c8b80574a	Small DRY of planting models -> predict added	2017-05-29 22:45:14 +12:00
Brenda Wallace	288ad782d2	Planted? = true when planted today	2017-05-29 22:45:14 +12:00
Brenda Wallace	ff1c835cda	Moving the planting predictions to own service	2017-05-29 22:45:14 +12:00
Shiny	fedc7a7fb6	Merge branch 'dev' into issue-1044-account-deletion	2017-05-29 16:17:59 +12:00
Brenda Wallace	c22c92e9f4	Validates min price on product ... the database has this constraint already. Adding so the ruby models match.	2017-05-29 16:17:43 +12:00
Brenda Wallace	adf585852a	Revert "Wikipedia url is always required" ... This reverts commit ba5ad00f5c.	2017-05-29 16:17:43 +12:00
Brenda Wallace	b982793fbf	Wikipedia url is always required ... The form says it's required, so it should be required.	2017-05-29 16:17:43 +12:00
Brenda Wallace	6fef56ebb7	DRY the crops controller	2017-05-29 16:17:43 +12:00
Shiny	8f66009d0d	Merge branch 'dev' into issue-1044-account-deletion	2017-05-29 15:56:17 +12:00
Brenda Wallace	8076e58a97	Owner must exist so we can see photos	2017-05-28 19:32:34 +12:00
Brenda Wallace	eacdab45ba	Removed planting.with_dates	2017-05-28 18:44:26 +12:00
Brenda Wallace	dcb949e7b3	Fixed bug - error when planting has no finished_at	2017-05-28 18:10:53 +12:00
Brenda Wallace	4726b57c47	Inactive plantings show as tiny thumbnails	2017-05-28 17:13:04 +12:00
Brenda Wallace	0b684eb05e	Checks owner exists, in default_scopes of many models	2017-05-26 23:00:06 +12:00
Brenda Wallace	7251f3308b	Merge branch 'fix-1334' into issue-1044-account-deletion	2017-05-21 11:46:30 +12:00
Brenda Wallace	c4938e00e4	Member acts as paranoid	2017-05-21 11:33:12 +12:00
Brenda Wallace	b5b2582335	default scope says members deleted :false	2017-05-21 11:17:42 +12:00
Brenda Wallace	6e7bf11ec8	Seeds delegate name and default_photo to their crop	2017-05-20 17:00:49 +12:00
Brenda Wallace	5f9b0890fb	Move seed.interesting to a scope	2017-05-20 16:58:49 +12:00
Brenda Wallace	4841c52bcd	order crop.plant_parts by plant_parts.name	2017-05-20 15:46:37 +12:00
Brenda Wallace	7baabca827	Unique is un-necesary when declaring relationship to plant_parts	2017-05-20 15:46:37 +12:00
Brenda Wallace	9a19007b85	More railsy order by in models	2017-05-20 15:46:37 +12:00
Brenda Wallace	677f850e21	Removed extra blank line	2017-05-20 15:46:37 +12:00