874 Commits

Author	SHA1	Message	Date
Brenda Wallace	312cd0d770	Read posts from member.posts	2019-07-16 23:10:01 +12:00
Brenda Wallace	91897273be	Merge branch 'dev' into ban-hammer	2019-07-16 20:56:59 +12:00
Brenda Wallace	fb77beeb7d	rubocop lint	2019-07-16 20:56:33 +12:00
Brenda Wallace	c8e47e800e	Moved admin ban code to admin controler	2019-07-16 20:54:32 +12:00
Brenda Wallace	b2537638ed	Move member banning to admin/members controller	2019-07-16 18:56:49 +12:00
Brenda Wallace	8827fb1291	go to admin_members_path after banning a member	2019-07-16 18:31:43 +12:00
Brenda Wallace	0622823816	Remove unused db lookup	2019-07-16 18:17:37 +12:00
Brenda Wallace	075b9b3327	Add a ban button to members	2019-07-16 18:15:54 +12: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	af0d84d9f1	Updating likes js code	2019-07-12 09:28:45 +12:00
Brenda Wallace	80429f935a	Merge branch 'dev' into likeable-photos	2019-07-11 22:42:22 +12:00
Brenda Wallace	2a390f9c24	Fix sorting	2019-07-11 10:18:54 +00:00
Brenda Wallace	347417b7ed	Put newest messages at the top of the page	2019-07-11 10:18:54 +00:00
Brenda Wallace	04b4354bda	Merge branch 'dev' into likeable-photos	2019-07-09 14:23:50 +12:00
Brenda Wallace	7b87f8e4db	Add flash messages to controllers	2019-07-09 09:19:27 +12:00
Brenda Wallace	f638d0c2d3	rubocop lint	2019-07-08 20:03:27 +12:00
Brenda Wallace	cbed8cc259	likes for photos	2019-07-08 20:00:55 +12:00
Brenda Wallace	050dfda77e	Timeline	2019-07-07 22:03:15 +12:00
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