3809 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brenda Wallace	2c871abd03	don't allow owner in params	2017-02-13 07:41:53 +13:00
pozorvlak	9ae35ca6eb	Merge pull request #1200 from Br3nda/bw/planting_slug ... Simplified logic in planting.planting_slug	2017-02-12 15:46:22 +00:00
pozorvlak	43f9707c11	Merge branch 'dev' into bw/planting_slug	2017-02-12 15:21:41 +00:00
Mackenzie	4fa423bcab	Merge pull request #1205 from Br3nda/dry-notifications ... DRY for the notifications controller	2017-02-12 10:21:31 -05:00
Mackenzie	97d0bb6752	Merge pull request #1207 from Br3nda/DRY-plantparts ... DRY the plant parts controller	2017-02-12 10:20:30 -05:00
Mackenzie	b9edd2f89b	Merge pull request #1203 from Br3nda/access ... Added cancan ability for likes (and DRY-ed)	2017-02-12 10:20:03 -05:00
pozorvlak	4bd50ca433	Merge branch 'dev' into bw/planting_slug	2017-02-12 15:19:55 +00:00
pozorvlak	a2dd675717	Merge pull request #1199 from Br3nda/time-zones ... Use timezone when creating dates	2017-02-12 15:19:38 +00:00
Brenda Wallace	1275aa0102	DRY the plant parts controller	2017-02-12 22:58:17 +13:00
Brenda Wallace	f40ff18949	You can only reply to messages that were sent to you.	2017-02-12 22:15:50 +13:00
Brenda Wallace	f25d4dbf8c	DRY for the notifications controller	2017-02-12 21:52:22 +13:00
Brenda Wallace	4dd99f54db	Removed deprecation notice from controller spec	2017-02-12 20:55:06 +13:00
Brenda Wallace	b8e06a1d1d	Specs for deleting someone else's like	2017-02-12 20:50:50 +13:00
Brenda Wallace	f7b8113af1	Fixed spec, now requests json response	2017-02-12 20:36:24 +13:00
Brenda Wallace	b0394d1028	checks json returned by likes controller	2017-02-12 17:42:24 +13:00
Brenda Wallace	fa0c00aa9c	Named arg (liked_by_member) fixed ... cos i was writing python when this is meant to be ruby	2017-02-12 17:37:32 +13:00
Brenda Wallace	a507eb47bf	Removed trailing white space	2017-02-12 17:26:34 +13:00
Brenda Wallace	865f323f97	controller specs for likes controller	2017-02-12 15:35:15 +13:00
Brenda Wallace	c82f47bdda	Pass the ID from link to likesdestroy	2017-02-12 15:34:28 +13:00
Brenda Wallace	72d0514e75	Further checks in likes controller	2017-02-12 15:33:54 +13:00
Brenda Wallace	dc62365c7d	DRY likes controller further	2017-02-12 15:23:58 +13:00
Brenda Wallace	d8d94d178c	Moved some of likes#destroy out to new methods	2017-02-12 15:23:58 +13:00
Brenda Wallace	6afb12c157	Split up big methods in like controller	2017-02-12 15:23:58 +13:00
Brenda Wallace	a0be52fdaa	likes doesn't have an index	2017-02-12 15:23:58 +13:00
Brenda Wallace	6b8474e01b	Checks for cancan ability before allowing like	2017-02-12 15:23:58 +13:00
Shiny	23ae7fcd8c	Merge branch 'dev' into time-zones	2017-02-12 12:14:01 +13:00
Shiny	179cfbf6bc	Merge branch 'dev' into bw/planting_slug	2017-02-12 12:13:37 +13:00
Mackenzie	b5f82a8fc8	Merge pull request #1202 from Br3nda/code-climate-knows ... Simplified alternate names controller.	2017-02-11 11:06:30 -05:00
Brenda Wallace	54c01cbd82	Removing alternate names from rubocop todo	2017-02-11 19:48:16 +13:00
Brenda Wallace	cf9e5a6652	Adding alternate names to admin menu	2017-02-11 19:45:53 +13:00
Brenda Wallace	01c6a6da9f	improvements to alternate names controller	2017-02-11 19:45:33 +13:00
Shiny	cc1daf8f6b	Join slug with -	2017-02-10 23:54:16 +13:00
Shiny	a0bf815663	Downcase planting slug	2017-02-10 23:52:10 +13:00
Brenda Wallace	ce573c1e55	Simplified logic in planting.planting_slug	2017-02-10 22:41:28 +13:00
Brenda Wallace	be2426c99f	Use timezone when creating dates	2017-02-10 21:53:18 +13:00
Mackenzie	36768cf384	Merge pull request #1194 from Br3nda/bw/grand-haml-cleanup-of-2017 ... More haml clean up	2017-02-08 22:46:34 -05:00
Mackenzie	e35d0455bd	Merge pull request #1196 from Br3nda/spammer-begone ... stripping html from markdown	2017-02-08 22:43:51 -05:00
Brenda Wallace	c8405830c7	Added strip_tags before processing markdown	2017-02-09 03:29:18 +00:00
Shiny	6bc9f775c2	Merge branch 'dev' into bw/grand-haml-cleanup-of-2017	2017-02-09 10:23:01 +13:00
Mackenzie	a43526776b	Merge pull request #1195 from Br3nda/bw/spammer-injection-begone ... Truncate, escape, and DRY og:description fields	2017-02-07 16:00:32 -05:00
Brenda Wallace	6f74566d47	Truncate, escape, and DRY og:description fields	2017-02-08 09:49:19 +13:00
Brenda Wallace	82ce6c8222	Haml clean up for seeds views	2017-02-08 08:52:46 +13:00
Brenda Wallace	f96f459595	Moved title logic into application helper ... For harvests, plantings, and seeds	2017-02-08 07:25:59 +13:00
Brenda Wallace	096146cb84	Fix: @owner -> owner in harvests_title	2017-02-08 07:25:59 +13:00
Brenda Wallace	ba1c40702b	DRY up gardens and plantings helper	2017-02-08 07:25:59 +13:00
Brenda Wallace	e6254da3f1	Haml clean up for Roles views	2017-02-08 07:25:59 +13:00
Brenda Wallace	acbb610e05	Haml clean up for posts views	2017-02-08 07:25:59 +13:00
Brenda Wallace	338265d9e9	Haml cleanup for plantings views	2017-02-08 07:25:59 +13:00
Brenda Wallace	706922cacf	Haml clean up for plantparts views	2017-02-08 07:25:59 +13:00
Brenda Wallace	08f2877f8e	Haml clean up for places views	2017-02-08 07:25:59 +13:00