856 Commits

Author	SHA1	Message	Date
Brenda Wallace	8faa712e07	be_success -> be_successfull ... fixes a deprecation warning	2019-06-27 22:26:15 +12:00
Brenda Wallace	a69e4020d7	back to reading gardens from the plantings	2019-06-26 08:09:49 +12:00
Brenda Wallace	103d1ce2eb	rubocop lint	2019-06-25 20:39:50 +12:00
Brenda Wallace	4f04d843a3	Move the subquerys in members#show to private	2019-06-25 16:18:15 +12:00
Brenda Wallace	b1b6de0aae	set @gardens for plantings controller and spec	2019-06-25 15:55:06 +12:00
Brenda Wallace	ef91e26d28	rubocop lint fixes	2019-06-16 10:31:03 +12:00
Brenda Wallace	70bfcabaec	Add seeds to member profile, and update specs	2019-06-15 21:18:10 +12:00
Brenda Wallace	b9e2154edb	rubocop lint	2019-06-14 16:39:25 +12:00
Brenda Wallace	2fc3c33520	rubocop lint	2019-06-14 16:38:49 +12:00
Brenda Wallace	5cedea9da8	removing trailing whitespace	2019-06-14 16:23:31 +12:00
Daniel O'Connor	28f68717f5	Address code climate concerns by extracting query methods	2019-06-14 13:36:20 +09:30
Brenda Wallace	39586cc1ba	Update app/controllers/plantings_controller.rb	2019-06-12 16:23:29 +12:00
Brenda Wallace	4f1eddd631	specs want 30 on a page - so telling the controller	2019-06-12 09:35:51 +12:00
codefactor-io	571f4298bb	[CodeFactor] Apply fixes	2019-06-11 21:22:53 +00:00
Brenda Wallace	3d11dac718	Fixing harvest specs	2019-06-08 18:21:15 +12:00
codefactor-io	2786476faa	[CodeFactor] Apply fixes	2019-06-06 08:37:27 +00:00
Brenda Wallace	cf69c13527	fix up erros on planting form	2019-06-03 22:47:19 +12:00
Brenda Wallace	11afea1c54	fixing plantings form	2019-06-03 22:22:53 +12:00
codefactor-io	7f1bb7913c	[CodeFactor] Apply fixes	2019-05-29 21:48:42 +00:00
Brenda Wallace	20fbec96d4	Tidying up forms	2019-05-24 20:14:24 +12:00
Brenda Wallace	d217282bf3	Add photos to activity	2019-05-21 12:06:22 +12:00
Brenda Wallace	dea6f36b0e	Fix filter posts by member	2019-05-19 15:34:26 +12:00
Brenda Wallace	4a78a30779	Put membet activity on their profile	2019-05-19 15:10:03 +12:00
Brenda Wallace	1eea251f95	Merge branch 'dev' into plantings-show	2019-04-19 10:39:26 +12:00
Brenda Wallace	74e6a7cf2f	Rename @matches to @crops	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	789cffeca1	Eager loading	2019-04-08 21:39:20 +12:00
Brenda Wallace	150d44ad6f	named arguments for search	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	a58ce0f6a2	Tidy up mobile	2019-03-30 18:01:55 +13:00
Brenda Wallace	0c9702e1a4	Move photo query, so we use eager loading	2019-03-27 22:28:06 +13:00
Brenda Wallace	e7b0b6f18e	Remove table display on plantings#show, replace with boxes	2019-03-27 21:04:56 +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	0c868d3edb	Merge branch 'dev' into photos/seeds	2019-02-16 12:37:53 +13:00
Brenda Wallace	d3a542727c	Fixing crop deleting and adding tests	2019-02-15 08:45:18 +13:00
Brenda Wallace	e446c14bd7	Use the new Photo.by_cropscope on photos controller	2019-02-05 12:44:34 +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	f1ad9cc3c7	Rubocop fix up	2019-02-04 20:55:04 +13:00
Brenda Wallace	5822764c1d	Fetch photos in the controller	2019-02-04 20:52:13 +13:00
Brenda Wallace	ab880514c2	Further tidy of photo display	2019-02-04 20:43:52 +13:00
Brenda Wallace	87d2c8b4c8	Fixed bug - look up photos by crop	2019-02-04 19:39:21 +13:00
Brenda Wallace	8c03e3f4ab	Merge branch 'dev' into bb-track-types-of-gardens	2019-01-30 16:45:14 +13:00
Brenda Wallace	b35d13d5e5	Update seeds_controller.rb	2019-01-18 20:05:41 +13:00
Brenda Wallace	d1a3f41462	Throw if can't find the @crop	2019-01-18 20:04:19 +13:00
Brenda Wallace	3212f748b4	Update crops_controller.rb	2019-01-18 20:03:22 +13:00
Brenda Wallace	cb6a06feb6	find by slug	2019-01-18 20:02:15 +13:00
Brandon Baker	a00ed5a176	Merge branch 'dev' into bb-track-types-of-gardens	2019-01-08 12:03:39 -05:00
Brenda Wallace	8cb9361462	only look up member/crop if an slug is passed	2019-01-06 08:45:42 +13:00