928 Commits

Author	SHA1	Message	Date
Brenda Wallace	548bbf5e57	Merge remote-tracking branch 'upstream/dev' into renamed-photographings-associations ... Conflicts: db/schema.rb	2019-07-16 12:12:16 +12:00
Brenda Wallace	efe14d43cb	read photo from a harvest's planting	2019-07-15 11:58:46 +00:00
Brenda Wallace	b654fd483b	counter cache was on the wrong side of the relationship	2019-07-15 11:58:46 +00:00
Brenda Wallace	d8df4338a7	DRY garden model - get default photo from photo_capable concern	2019-07-15 11:58:46 +00:00
Brenda Wallace	e5e54d651b	Remove duplicate and unused photo methods	2019-07-15 11:58:46 +00:00
Brenda Wallace	acf58fc5e2	Choose crop photos by most liked	2019-07-15 11:58:46 +00:00
Brenda Wallace	e0e10c29dc	Renaming photographings to photo associations ... now it matches the name of its controller, and it is clearer to understand	2019-07-13 16:13:37 +12:00
Brenda Wallace	a87248a43e	DRY up detecting if photo/post already liked	2019-07-12 09:42:45 +12:00
Brenda Wallace	6fc9a858a9	Merge branch 'dev' into likeable-photos	2019-07-08 20:03:41 +12:00
Brenda Wallace	cbed8cc259	likes for photos	2019-07-08 20:00:55 +12:00
Brenda Wallace	5cef4d728c	Adding photos directly to a post	2019-07-08 13:20:57 +12:00
Brenda Wallace	73f2fd2323	fix another deprecation warning about rails 6	2019-06-26 09:07:03 +12:00
Brenda Wallace	474732f909	Fix sql warning in logs	2019-06-26 09:05:14 +12:00
Brenda Wallace	ef91e26d28	rubocop lint fixes	2019-06-16 10:31:03 +12:00
Brenda Wallace	92ae1a7bd2	Merge branch 'dev' into upgrade/bootstrap	2019-06-13 20:52:25 +12:00
Daniel O'Connor	949c57bf7d	Line length	2019-06-13 07:58:52 +00:00
Brenda Wallace	eb628635e2	fix logic on planting.active	2019-06-08 15:39:14 +12:00
Brenda Wallace	9e1d531de9	nil for perennial doesn't mean annual	2019-06-07 20:44:30 +12:00
Brenda Wallace	06650a790d	active scopes on plantings and seeds	2019-06-07 20:36:02 +12:00
Brenda Wallace	6c41b52cb1	Fix - planting.active scope to not show finished	2019-06-03 23:01:57 +12:00
Brenda Wallace	4a78a30779	Put membet activity on their profile	2019-05-19 15:10:03 +12:00
codefactor-io	4af8282a44	[CodeFactor] Apply fixes	2019-05-18 19:36:26 +00:00
Brenda Wallace	f019969240	Tidy up posts	2019-05-18 21:41:41 +12:00
Brenda Wallace	e029425785	Lint	2019-05-13 07:58:05 +12:00
Brenda Wallace	f5d48d1b56	Removing bootstrap 3 - only bootstrap 4 ... because both isn't particularly clever	2019-05-13 07:52:38 +12:00
Brenda Wallace	4918d0c950	Tidy up homepage	2019-04-25 23:28:41 +12:00
Brenda Wallace	1eea251f95	Merge branch 'dev' into plantings-show	2019-04-19 10:39:26 +12:00
Brenda Wallace	ccb69c5f7d	Style/lint tidy up models	2019-04-08 21:59:26 +12:00
Brenda Wallace	302e19776f	code style fix up	2019-04-08 21:39:20 +12:00
Brenda Wallace	77d1fc7347	Move crop searching specs from the crop model to the crop search service	2019-04-08 21:39:20 +12:00
Brenda Wallace	ca743e421d	Add matching ES methods for when no elastic search configured	2019-04-08 21:39:20 +12:00
Brenda Wallace	f3ae1a8ec3	Fix dangerous sql warning	2019-04-08 21:39:20 +12:00
Brenda Wallace	370747390a	Add default pagination to crop search service	2019-04-08 21:39:20 +12:00
Brenda Wallace	61e0c2eb1d	Swap elasticssearch for searchkick	2019-04-08 21:39:20 +12:00
Brenda Wallace	e7b0b6f18e	Remove table display on plantings#show, replace with boxes	2019-03-27 21:04:56 +13:00
Brenda Wallace	5d32bc8010	don't allow spaces in slug	2019-03-26 22:07:47 +13:00
Brenda Wallace	55f6636da5	change "required" to "optional"	2019-03-26 22:06:41 +13:00
Brenda Wallace	48022fb541	nullify gardens.garden_type when garden_type is destroyed	2019-03-26 21:18:14 +13:00
Brenda Wallace	cc88f5c6c7	Update subtitler	2019-03-26 21:11:25 +13:00
Brenda Wallace	721a8694a0	Removing plots	2019-03-26 21:09:26 +13:00
Brenda Wallace	5395aefa66	Rename containers to garden types	2019-03-26 20:56:11 +13:00
Brenda Wallace	02e0dd091a	Merge remote-tracking branch 'upstream/dev' into bb-track-types-of-gardens	2019-03-26 19:35:16 +13:00
Brenda Wallace	6167af700d	Rubocop lint tidy	2019-02-05 12:37:09 +13:00
Brenda Wallace	9c4e649c5d	Split up photos on crops#show by model type	2019-02-05 12:31:59 +13:00
Brenda Wallace	b61c2290be	Removed unnecesary helper wrapper	2019-02-04 22:15:18 +13:00
Brenda Wallace	6a1954b1e7	added dependent: destroy	2019-02-04 21:22:19 +13:00
Brenda Wallace	f1ad9cc3c7	Rubocop fix up	2019-02-04 20:55:04 +13:00
Brenda Wallace	ab880514c2	Further tidy of photo display	2019-02-04 20:43:52 +13:00
Brenda Wallace	e8ac207fa7	Save the crop on the photo association	2019-02-04 20:32:11 +13:00
Brenda Wallace	a9ca12c1c5	Method to find planting photos only	2019-02-04 19:39:44 +13:00