3778 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Shiny	7ca314c2f2	Merge pull request #1191 from Growstuff/dev ... Release 19 release19	2017-02-10 09:24:00 +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
Brenda Wallace	8275f5be96	Add photos to travis haml check	2017-02-08 07:25:59 +13:00
Brenda Wallace	2c3d1848d5	Haml clean up for photos	2017-02-08 07:25:59 +13:00
Brenda Wallace	17e88778c8	Haml clean up for orders	2017-02-08 07:25:59 +13:00
Brenda Wallace	bafb0123da	Haml cleanup for notifier	2017-02-08 07:25:59 +13:00
Brenda Wallace	e1e9c32652	Moved havests#index title to a helper	2017-02-08 07:25:59 +13:00
Brenda Wallace	48c3cbb3d1	Change to hash attributes syntax in harvests#show	2017-02-08 07:25:59 +13:00
Brenda Wallace	740b8587f2	Moved complex parts of garden/nav into helper	2017-02-08 07:25:59 +13:00
Brenda Wallace	b113146aaa	Add harvest and gardens to travis for haml-lint	2017-02-08 07:25:59 +13:00
Brenda Wallace	900de8a615	Fixed Read more link in harvests	2017-02-08 07:25:59 +13:00
Brenda Wallace	d73aa98309	Cleaned up most of Home's haml	2017-02-08 07:25:59 +13:00
Brenda Wallace	ac7d44cb72	Cleaned up most of harvest's haml	2017-02-08 07:25:59 +13:00
Daniel O'Connor	bba057ec76	Merge pull request #1192 from Br3nda/bw/three-pending-specs ... Filled in the 3 pending planting specs	2017-02-07 16:36:59 +10:30
Brenda Wallace	1dc44c9edc	Filled in the 3 pending planting specs	2017-02-07 18:29:10 +13:00
Daniel O'Connor	92c1515381	Merge pull request #1186 from CloCkWeRX/fix_date_expectation ... Fix #1182 and improve test coverage	2017-02-07 14:02:31 +10:30
Shiny	43f905ea25	Merge branch 'dev' into fix_date_expectation	2017-02-07 16:03:39 +13:00
Brenda Wallace	1db30d98ce	Haml clean up for members	2017-02-07 15:35:34 +13:00
Shiny	2b92f013fc	Merge branch 'dev' into fix_date_expectation	2017-02-07 14:34:41 +13:00
Brenda Wallace	23f8c24ef4	Haml clean up for notifications	2017-02-07 14:33:20 +13:00
Daniel O'Connor	fba2306a4d	Merge pull request #1190 from Br3nda/bw/haml-shop ... Haml clean for shop	2017-02-07 11:15:26 +10:30
Brenda Wallace	c8fa54591a	Haml clean for shop	2017-02-07 07:53:34 +13:00
Daniel O'Connor	67b496fe44	Merge pull request #1185 from Br3nda/bw/grand-haml-cleanup-of-2017 ... Forums and Gardens haml clean up	2017-02-06 14:13:27 +10:30
Daniel O'Connor	b24514fa82	Look at right attribute	2017-02-06 14:11:44 +10:30
Daniel O'Connor	f0a81d4100	Fix #1182 and improve test coverage	2017-02-06 14:10:40 +10:30
Brenda Wallace	64f11793c9	Fixed typo in link	2017-02-06 16:31:57 +13:00
Brenda Wallace	05a9d498a7	More forums haml clean up	2017-02-06 14:50:49 +13:00
Brenda Wallace	16145599ce	Haml clean up for (most) garden views	2017-02-06 14:46:19 +13:00
Brenda Wallace	af8527aa5b	Haml clean up of forum views	2017-02-06 14:46:19 +13:00
Daniel O'Connor	f9eb70e2eb	Merge pull request #1184 from Br3nda/bw/grand-haml-cleanup-of-2017 ... Haml clean up -- crops views	2017-02-06 11:47:47 +10:30
Brenda Wallace	8408fdc845	Moved popular plant plarts calculation into sql	2017-02-06 13:22:18 +13:00
Brenda Wallace	f37c9152af	Simplified the "grown for" view	2017-02-06 11:21:33 +13:00
Brenda Wallace	4ee789ca06	Popular plant parts are now sorted by popularity	2017-02-06 10:59:40 +13:00
Brenda Wallace	43e4ed43cd	Travis starts checking the haml that's cleaned up ... To stop regressions to bad haml again	2017-02-06 10:46:49 +13:00
Brenda Wallace	80371c835c	Moved long line (ebay url) to helper	2017-02-06 10:40:58 +13:00
Brenda Wallace	6478d9cb1b	Haml clean up for crops views	2017-02-06 10:31:45 +13:00